summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorLeigh Arber <builder@Adelie-A7EEA3.vpn.adelielinux.org>2024-07-23 19:15:29 +0000
committerZach van Rijn <me@zv.io>2024-10-24 15:24:10 +0000
commit475f50002e55c952e23b91d9abbaac396d476ad8 (patch)
treec09cba40bb736aa0dfe84b61b864fb8736d8f30f /user
parent471ce261a5b6230cacbd359760112033b0437c9d (diff)
downloadpackages-475f50002e55c952e23b91d9abbaac396d476ad8.tar.gz
packages-475f50002e55c952e23b91d9abbaac396d476ad8.tar.bz2
packages-475f50002e55c952e23b91d9abbaac396d476ad8.tar.xz
packages-475f50002e55c952e23b91d9abbaac396d476ad8.zip
user/x11vnc: patch for CVE-2020-29074
Closes: #389
Diffstat (limited to 'user')
-rw-r--r--user/x11vnc/APKBUILD6
-rw-r--r--user/x11vnc/CVE-2020-29074.patch11
2 files changed, 15 insertions, 2 deletions
diff --git a/user/x11vnc/APKBUILD b/user/x11vnc/APKBUILD
index 722f249ba..497c6f127 100644
--- a/user/x11vnc/APKBUILD
+++ b/user/x11vnc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=x11vnc
pkgver=0.9.16
-pkgrel=1
+pkgrel=2
pkgdesc="VNC server for X11 sessions"
url=" "
arch="all"
@@ -15,6 +15,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/LibVNC/x11vnc/archive/$pkgve
time64.patch
utmps.patch
gcc10.patch
+ CVE-2020-29074.patch
"
prepare() {
@@ -45,4 +46,5 @@ package() {
sha512sums="69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec x11vnc-0.9.16.tar.gz
764dc0d22f4b167b7683b1551a6d8cc8ea6745fdd9791422404ef604186930615b52ef1bf66fd03dd9c6eed18845ff4a1e5a235eee80810177e082359a8c4766 time64.patch
8aaa6d1fd9e795a60cad162f2b21fe96cd3a7076a0c4fae6e6b0021881bd019312a678fa3ed69b694da36ee64cc0601812da5df96c6461baf68b7e70adf6cd4e utmps.patch
-b7b774c155f326bca1fee4bed22609f1e0236dae5cb2fea96bab18301bc6ae8f9c7fb11ba1950eb9488683bd2d3158b7b16a71948f2c8d483594e36625b3d470 gcc10.patch"
+b7b774c155f326bca1fee4bed22609f1e0236dae5cb2fea96bab18301bc6ae8f9c7fb11ba1950eb9488683bd2d3158b7b16a71948f2c8d483594e36625b3d470 gcc10.patch
+7e038a13c18933532725e73769ec44a325064165e7d041e697cb28e8b19c4471ea19e598cb3f59a55375ac0ebebd11c618ecc085a0112f733fdaa3f702ffa444 CVE-2020-29074.patch"
diff --git a/user/x11vnc/CVE-2020-29074.patch b/user/x11vnc/CVE-2020-29074.patch
new file mode 100644
index 000000000..2982c59b1
--- /dev/null
+++ b/user/x11vnc/CVE-2020-29074.patch
@@ -0,0 +1,11 @@
+--- x11vnc-0.9.16/src/scan.c 2024-07-23 04:47:17.680000000 +0000
++++ x11vnc-0.9.16/src/scan.c 2024-07-23 04:48:25.080000000 +0000
+@@ -320,7 +320,7 @@
+
+ #if HAVE_XSHM
+ shm->shmid = shmget(IPC_PRIVATE,
+- xim->bytes_per_line * xim->height, IPC_CREAT | 0777);
++ xim->bytes_per_line * xim->height, IPC_CREAT | 0600);
+
+ if (shm->shmid == -1) {
+ rfbErr("shmget(%s) failed.\n", name);