summaryrefslogtreecommitdiff
path: root/user/xterm
diff options
context:
space:
mode:
Diffstat (limited to 'user/xterm')
-rw-r--r--user/xterm/APKBUILD23
-rw-r--r--user/xterm/posix-ptmx.patch4
2 files changed, 18 insertions, 9 deletions
diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD
index d1d870a8a..ec6384a96 100644
--- a/user/xterm/APKBUILD
+++ b/user/xterm/APKBUILD
@@ -1,13 +1,14 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
+# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
pkgname=xterm
-pkgver=348
-pkgrel=3
+pkgver=390
+pkgrel=0
pkgdesc="An X-based terminal emulator"
url="https://invisible-island.net/xterm/"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="X11"
+depends=""
makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev
libxext-dev libxrender-dev libxft-dev freetype-dev ncurses-dev
pcre-dev"
@@ -16,6 +17,14 @@ source="https://invisible-mirror.net/archives/xterm/xterm-$pkgver.tgz
posix-ptmx.patch
"
+# secfixes:
+# 390-r0:
+# - CVE-2022-24130
+# - CVE-2022-45063
+# - CVE-2023-40359
+# 368-r0:
+# - CVE-2021-27135
+
build() {
LIBS="-ltinfow" ./configure \
--build=$CBUILD \
@@ -44,5 +53,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="852896c0aba885bafc80baad899fc56910dce66bf5df6b3fef3f998efc33af9d30b68cfb0c92c7028365ac4944af3d3c198bc0e408ca09e949b993a79c1e6dd9 xterm-348.tgz
-e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch"
+sha512sums="865ae292a56635ec2811a950763da22cbbb4de463bee75b4595b7387a09227f612c5620986e431631c3d73fe783d862fd9a6694c54c33898327339467b7085b7 xterm-390.tgz
+6811cd67ffe21dc23c9ad6a439291bb0b3c3d347f4d5e2cd65de9f790fde2bf7323fe9f1b309d95ac98a3ffaae5989bc73a2c5fe08aa9f6a2c6cbc3b9adcf8d9 posix-ptmx.patch"
diff --git a/user/xterm/posix-ptmx.patch b/user/xterm/posix-ptmx.patch
index 351aba9ab..6d1a859cd 100644
--- a/user/xterm/posix-ptmx.patch
+++ b/user/xterm/posix-ptmx.patch
@@ -1,6 +1,6 @@
--- xterm/main.c.old
+++ xterm/main.c
-@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED)
+@@ -2892,7 +2892,7 @@ get_pty(int *pty, char *from GCC_UNUSED)
close(opened_tty);
opened_tty = -1;
}
@@ -9,7 +9,7 @@
if ((*pty = posix_openpt(O_RDWR)) >= 0) {
char *name = ptsname(*pty);
if (name != 0) {
-@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw)
+@@ -4040,7 +4040,7 @@ spawnXTerm(XtermWidget xw)
/*
* now in child process
*/