commit: 5aad9822436c79d8a604c6b5339ebf079b9437d7 Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> AuthorDate: Sun Jul 13 10:46:28 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jul 23 02:35:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aad9822
x11-misc/x11vnc: remove 0.9.16-r8 Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> Part-of: https://github.com/gentoo/gentoo/pull/42989 Closes: https://github.com/gentoo/gentoo/pull/42989 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-misc/x11vnc/Manifest | 1 - .../files/x11vnc-0.9.16-CVE-2020-29074.patch | 25 ----- .../x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch | 26 ----- x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch | 23 ----- .../files/x11vnc-0.9.16-fix-build-on-32bit.patch | 105 --------------------- .../x11vnc/files/x11vnc-0.9.16-fno-common.patch | 45 --------- ...1vnc-0.9.16-implicit-function-declaration.patch | 26 ----- x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch | 45 --------- x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild | 81 ---------------- 9 files changed, 377 deletions(-) diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest index cfad26a89b74..6b118ccd04c1 100644 --- a/x11-misc/x11vnc/Manifest +++ b/x11-misc/x11vnc/Manifest @@ -1,2 +1 @@ -DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec DIST x11vnc-0.9.17.tar.gz 1691520 BLAKE2B c8b61b2d48517e68a579faa077bef5d2de371fb5567294908ef824d2521cf439cdf7f4efa076e659a20bf4c726d19fc88e4481b4e3c2f745b1a8aa3e39880376 SHA512 687c41e03cca43dbca6ffdeb40960dddfba54ba00cf890f89f63fd66b9559a4c09602f84c1d4b7ffd7ac58818b90893013925d94a45a6feb83ab8cf7a02c1fe8 diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch deleted file mode 100644 index 12f65b94fb62..000000000000 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= <[email protected]> -Date: Wed, 18 Nov 2020 08:40:45 +0100 -Subject: [PATCH] scan: limit access to shared memory segments to current user - ---- - src/scan.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/scan.c b/src/scan.c -index 43e00d2..12994d5 100644 ---- a/src/scan.c -+++ b/src/scan.c -@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h, - - #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); --- -2.26.2 - diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch deleted file mode 100644 index 3dafb9aa6b0c..000000000000 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b9cf79fd3d61a7586fe6b24b3141e406cdf334eb Mon Sep 17 00:00:00 2001 -From: Jim Broadus <[email protected]> -Date: Wed, 2 Jan 2019 17:37:40 -0800 -Subject: [PATCH] Fix anonymous SSL. In version 1.1.0, openssl introduced a - security level concept. Only level 0 allows the use of unauthenticated cipher - suites such as ADH. - ---- - src/sslhelper.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/sslhelper.c b/src/sslhelper.c -index 1a3e7474..04c2e273 100644 ---- a/src/sslhelper.c -+++ b/src/sslhelper.c -@@ -1596,6 +1596,10 @@ static int switch_to_anon_dh(void) { - if (ssl_client_mode) { - return 1; - } -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ /* Security level must be set to 0 for unauthenticated suites. */ -+ SSL_CTX_set_security_level(ctx, 0); -+#endif - if (!SSL_CTX_set_cipher_list(ctx, "ADH:@STRENGTH")) { - return 0; - } diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch deleted file mode 100644 index 21872e73cb7c..000000000000 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3024af3685be9eb618352bd17ba37953d8076946 Mon Sep 17 00:00:00 2001 -From: Christian Beier <[email protected]> -Date: Thu, 17 Jan 2019 14:05:53 +0100 -Subject: [PATCH] unixpw: don't try to use crypt() when it isn't available - -Closes #86 ---- - src/unixpw.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/unixpw.c b/src/unixpw.c -index 9a43cec..e2cb016 100644 ---- a/src/unixpw.c -+++ b/src/unixpw.c -@@ -757,7 +757,7 @@ int unixpw_list_match(char *user) { - } - - int crypt_verify(char *user, char *pass) { --#ifndef UNIXPW_CRYPT -+#if !defined UNIXPW_CRYPT || !defined HAVE_LIBCRYPT - return 0; - #else - struct passwd *pwd; diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-fix-build-on-32bit.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-fix-build-on-32bit.patch deleted file mode 100644 index 6239e0877923..000000000000 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-fix-build-on-32bit.patch +++ /dev/null @@ -1,105 +0,0 @@ -From daecf59cc8b294265666482a4766aaa3148c308b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 30 Nov 2019 11:43:32 -0800 -Subject: [PATCH] Fix build on 32bit arches with 64bit time_t - -time element is deprecated on new input_event structure in kernel's -input.h [1] - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f ---- - src/uinput.c | 25 +++++++++++++++++++++---- - 1 file changed, 21 insertions(+), 4 deletions(-) - -diff --git a/src/uinput.c b/src/uinput.c -index 28fbad39..d71bcde7 100644 ---- a/src/uinput.c -+++ b/src/uinput.c -@@ -54,6 +54,11 @@ so, delete this exception statement from your version. - #include <linux/input.h> - #include <linux/uinput.h> - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - #if !defined(EV_SYN) || !defined(SYN_REPORT) - #undef UINPUT_OK - #endif -@@ -710,6 +715,7 @@ void parse_uinput_str(char *in) { - static void ptr_move(int dx, int dy) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tval; - int d = direct_rel_fd < 0 ? fd : direct_rel_fd; - - if (injectable && strchr(injectable, 'M') == NULL) { -@@ -720,7 +726,9 @@ static void ptr_move(int dx, int dy) { - - if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d); - -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tval, NULL); -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; - ev.type = EV_REL; - ev.code = REL_Y; - ev.value = dy; -@@ -755,6 +763,7 @@ static void apply_tslib(int *x, int *y) { - static void ptr_abs(int x, int y, int p) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tval; - int x0, y0; - int d = direct_abs_fd < 0 ? fd : direct_abs_fd; - -@@ -773,7 +782,9 @@ static void ptr_abs(int x, int y, int p) { - - if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d); - -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tval, NULL); -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; - ev.type = EV_ABS; - ev.code = ABS_Y; - ev.value = y; -@@ -950,6 +961,7 @@ if (0) {usleep(100*1000) ;} - static void button_click(int down, int btn) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tval; - int d = direct_btn_fd < 0 ? fd : direct_btn_fd; - - if (injectable && strchr(injectable, 'B') == NULL) { -@@ -959,7 +971,9 @@ static void button_click(int down, int btn) { - if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d); - - memset(&ev, 0, sizeof(ev)); -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tval, NULL); -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; - ev.type = EV_KEY; - ev.value = down; - -@@ -1230,6 +1244,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) { - void uinput_key_command(int down, int keysym, rfbClientPtr client) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tval; - int scancode; - allowed_input_t input; - int d = direct_key_fd < 0 ? fd : direct_key_fd; -@@ -1253,7 +1268,9 @@ void uinput_key_command(int down, int keysym, rfbClientPtr client) { - if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d); - - memset(&ev, 0, sizeof(ev)); -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tval, NULL); -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; - ev.type = EV_KEY; - ev.code = (unsigned char) scancode; - ev.value = down; diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch deleted file mode 100644 index 504159efe92f..000000000000 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <[email protected]> -Date: Tue, 28 Jan 2020 22:21:01 +0300 -Subject: [PATCH] Fix build with -fno-common - -GCC 10 defaults to -fno-common ---- - src/util.c | 3 +++ - src/util.h | 6 +++--- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/util.c b/src/util.c -index a82a1a4..6a52ebf 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -47,6 +47,9 @@ int hxl = 0; - #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD - MUTEX(x11Mutex); - MUTEX(scrollMutex); -+MUTEX(clientMutex); -+MUTEX(inputMutex); -+MUTEX(pointerMutex); - #endif - - int nfix(int i, int n); -diff --git a/src/util.h b/src/util.h -index 35c1afd..99b5dd1 100644 ---- a/src/util.h -+++ b/src/util.h -@@ -102,9 +102,9 @@ extern struct timeval _mysleep; - #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD - extern MUTEX(x11Mutex); - extern MUTEX(scrollMutex); --MUTEX(clientMutex); --MUTEX(inputMutex); --MUTEX(pointerMutex); -+extern MUTEX(clientMutex); -+extern MUTEX(inputMutex); -+extern MUTEX(pointerMutex); - #endif - - #define X_INIT INIT_MUTEX(x11Mutex) --- -2.24.1 - diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-implicit-function-declaration.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-implicit-function-declaration.patch deleted file mode 100644 index c6d1c494bd23..000000000000 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-implicit-function-declaration.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 351d27d4a846e3d0e5c724e067f44b52e04402f1 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <[email protected]> -Date: Mon, 6 Mar 2023 00:57:20 +0300 -Subject: [PATCH] Drop AC_FUNC_STAT macro - -This macro is obsolescent and doesn't work with --Werror=implicit-function-declaration compiler flag ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6b62ac5..5a386db 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -474,7 +474,6 @@ if test $inaddrt = no ; then - fi - # Checks for library functions. - AC_FUNC_MEMCMP --AC_FUNC_STAT - AC_FUNC_STRFTIME - AC_FUNC_VPRINTF - AC_FUNC_FORK --- -2.39.2 - diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch deleted file mode 100644 index 3a21f30d7f14..000000000000 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.gentoo.org/903001 -https://github.com/LibVNC/x11vnc/pull/202 -https://github.com/LibVNC/x11vnc/commit/af63109a17f1b1ec8b1e332d215501f11c4a33a0 -https://github.com/LibVNC/x11vnc/pull/224 -https://github.com/LibVNC/x11vnc/commit/354602cffa8edcbe813da6dfd051b96d94b3efbc - -From af63109a17f1b1ec8b1e332d215501f11c4a33a0 Mon Sep 17 00:00:00 2001 -From: orbea <[email protected]> -Date: Tue, 5 Jul 2022 13:12:30 -0700 -Subject: [PATCH] Fix building w/ libreSSL - -When building x11vnc with LibreSSL the build fails with undefined -references for SSL_CTX_set_security_level which is currently only -available with OpenSSL. This can be fixed by disabling the code as -is already done for OpenSSL versions older than 1.1.0. - -This builds with LibreSSL 3.5.x. ---- - src/sslhelper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -From 354602cffa8edcbe813da6dfd051b96d94b3efbc Mon Sep 17 00:00:00 2001 -From: orbea <[email protected]> -Date: Tue, 2 May 2023 12:16:21 -0700 -Subject: [PATCH] sslhelper: Update for LibreSSL >= 3.6.0 (#224) - -Since LibreSSL 3.6.0 SSL_CTX_set_security_level() has been available. ---- - src/sslhelper.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/sslhelper.c b/src/sslhelper.c -index 04c2e27..ae82cd9 100644 ---- a/src/sslhelper.c -+++ b/src/sslhelper.c -@@ -1596,7 +1596,8 @@ static int switch_to_anon_dh(void) { - if (ssl_client_mode) { - return 1; - } --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x3060000fL) - /* Security level must be set to 0 for unauthenticated suites. */ - SSL_CTX_set_security_level(ctx, 0); - #endif diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild deleted file mode 100644 index 33be9601afc3..000000000000 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="VNC server for real X displays" -HOMEPAGE="https://libvnc.github.io/"; -SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" - -COMMON_DEPEND=" - >=net-libs/libvncserver-0.9.8[ssl=] - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - >=x11-libs/libXtst-1.1.0 - virtual/libcrypt:= - ssl? ( dev-libs/openssl:0= ) - xcomposite? ( x11-libs/libXcomposite ) - xdamage? ( x11-libs/libXdamage ) - xfixes? ( x11-libs/libXfixes ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr ) - zeroconf? ( >=net-dns/avahi-0.6.4 ) -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto - x11-libs/libXt -" -# https://bugzilla.redhat.com/show_bug.cgi?id=920554 -RDEPEND="${COMMON_DEPEND} - dev-lang/tk:0 -" - -PATCHES=( - "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86 - "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85 - "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-CVE-2020-29074.patch - "${FILESDIR}"/${P}-implicit-function-declaration.patch - "${FILESDIR}"/${P}-libressl.patch # 903001 - "${FILESDIR}"/${P}-fix-build-on-32bit.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # --without-v4l because of missing video4linux 2.x support wrt #389079 - local myconf=( - --without-v4l - --without-xkeyboard - --without-fbpm - --without-dpms - $(use_with crypt) - $(use_with fbcon fbdev) - $(use_with ssl) - $(use_with ssl crypto) - $(use_with xcomposite) - $(use_with xdamage) - $(use_with xfixes) - $(use_with xinerama) - $(use_with xrandr) - $(use_with zeroconf avahi) - ) - econf "${myconf[@]}" -} - -src_install() { - default - newinitd "${FILESDIR}/x11vnc.init.d-r1" x11vnc - newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc -}
