* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2015-09-26 15:21 Ian Delaney
0 siblings, 0 replies; 12+ messages in thread
From: Ian Delaney @ 2015-09-26 15:21 UTC (permalink / raw
To: gentoo-commits
commit: a57c97265679f39675e243ff1b7e3d17d6e458ad
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 15:21:06 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 15:21:06 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57c9726
x11-misc/x11vnc: rm old, clean up for sec bug #515268
Package-Manager: portage-2.2.20.1
x11-misc/x11vnc/Manifest | 1 -
.../x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch | 35 ----------
x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch | 42 ------------
x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild | 76 ----------------------
x11-misc/x11vnc/x11vnc-0.9.13.ebuild | 74 ---------------------
5 files changed, 228 deletions(-)
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 4a60226..d072f19 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,2 +1 @@
DIST 82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip 1830730 SHA256 fc6a28df089e47b68931019ce038b6e2fcd78e93de7f6984a22262252d01c16f SHA512 0fa4f7b52442793ec1bd82c74f9d092c69262e4f1fa93584fef17bbe0e5cbde08bc5ad0924631801bb43b41d90c37077a317c61511553f98698096eab05791eb WHIRLPOOL f1a45b549fb6ff9bea2eb4e3719b5dd43a78f6f418c61691cebab313d56761147d928648e103c654309575bec7c716a6f1cd1ef7a9b484c09edee37233cb0ce7
-DIST x11vnc-0.9.13.tar.gz 2853769 SHA256 f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b SHA512 7b24e495f29122032e1c8ced7f7d8e0a56a2a8263e761a50725320742c99a0fcd5680d13038dd5d47e1c05d3b889d0caa13ba0b1aeda6fa42d5fb5ef3c43f908 WHIRLPOOL d812b257e70d6caccc6669c7fca89cacc590b5908c7877f62bdd14a159b0712b5b60e8587b6a385a5a68c46e15296ab838b07196786ac354fccb0759725685c4
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch
deleted file mode 100644
index 0d5d78b..0000000
--- a/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-fix that is already in upstream x11vnc-0.9.14 dev
-
-from ChromiumOS:
-
-x11vnc: Fix shm close on early shutdown.
-
-Global structures {scanline,fullscreen,scanrect}_shm are initialized to
-zero, including the .shmid field. This creates problems when shutdown /
-clean_shm is called before these structures are properly initialized in
-initialize_polling_images. shm_delete will be called on the structure,
-and since the shmid isn't -1, shmctl(id, IPC_RMID...) will be called for
-id=0. id=0 is in fact a valid shmid, and it might belong to some other
-shared memory for some other processes, creating many potential problems.
-
-Fix is to initialize shmid to -1 to indicate that it is in fact
-uninitialized.
-
-https://chromium-review.googlesource.com/37971
-
---- a/x11vnc/x11vnc_defs.c
-+++ b/x11vnc/x11vnc_defs.c
-@@ -82,10 +82,10 @@
- XImage *raw_fb_image = NULL; /* the raw fb */
-
- /* corresponding shm structures */
--XShmSegmentInfo scanline_shm;
--XShmSegmentInfo fullscreen_shm;
-+XShmSegmentInfo scanline_shm = {.shmid = -1};
-+XShmSegmentInfo fullscreen_shm = {.shmid = -1};
- XShmSegmentInfo *tile_row_shm; /* for all possible row runs */
--XShmSegmentInfo snaprect_shm;
-+XShmSegmentInfo snaprect_shm = {.shmid = -1};
-
- /* rfb screen info */
- rfbScreenInfoPtr screen = NULL;
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch
deleted file mode 100644
index f80e83f..0000000
--- a/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- x11vnc-0.9.13.orig/x11vnc/remote.c
-+++ x11vnc-0.9.13/x11vnc/remote.c
-@@ -5860,7 +5860,7 @@
- }
- if (!strcmp(p, "vncdisplay")) {
- snprintf(buf, bufn, "aro=%s:%s", p,
-- NONUL(vnc_desktop_name));
-+ vnc_desktop_name);
- goto qry;
- }
- if (!strcmp(p, "icon_mode")) {
-@@ -6062,7 +6062,7 @@
- if (!strcmp(p, "h") || !strcmp(p, "help") ||
- !strcmp(p, "V") || !strcmp(p, "version") ||
- !strcmp(p, "lastmod")) {
-- snprintf(buf, bufn, "aro=%s:%s", p, NONUL(lastmod));
-+ snprintf(buf, bufn, "aro=%s:%s", p, lastmod);
- goto qry;
- }
- if (!strcmp(p, "bg")) {
---- x11vnc-0.9.13.orig/x11vnc/sslhelper.c
-+++ x11vnc-0.9.13/x11vnc/sslhelper.c
-@@ -4041,7 +4041,7 @@
- strncpy(last_get, rcookie, 100);
- if (db) fprintf(stderr, "last_get: '%s'\n", last_get);
- }
-- if (rcookie && strstr(rcookie, "VncViewer.class")) {
-+ if (strstr(rcookie, "VncViewer.class")) {
- rfbLog("\n");
- rfbLog("helper[%d]:\n", pid);
- rfbLog("***********************************************************\n");
---- x11vnc-0.9.13.orig/x11vnc/userinput.c
-+++ x11vnc-0.9.13/x11vnc/userinput.c
-@@ -1305,7 +1305,7 @@
- int font_size = 15;
- int win_y, scr_y, loc_cut = 4*font_size, y_cut = 10*font_size;
-
-- if (!xrecord_set_by_keys || !xrecord_name_info) {
-+ if (!xrecord_set_by_keys) {
- return 0;
- }
- if (xrecord_name_info[0] == '\0') {
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
deleted file mode 100644
index 3993d81..0000000
--- a/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="http://www.karlrunge.com/x11vnc/"
-SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="avahi crypt fbcon +jpeg ssl system-libvncserver threads tk xinerama +zlib"
-
-RDEPEND="
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libX11
- >=x11-libs/libXtst-1.1.0
- x11-libs/libXdamage
- x11-libs/libXext
- avahi? ( >=net-dns/avahi-0.6.4 )
- ssl? ( dev-libs/openssl )
- system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
- !system-libvncserver? (
- zlib? ( sys-libs/zlib )
- jpeg? ( virtual/jpeg:0 )
- )
- tk? ( dev-lang/tk )
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- x11-libs/libXt
- x11-proto/inputproto
- x11-proto/trapproto
- x11-proto/recordproto
- x11-proto/xproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )"
-
-pkg_setup() {
- if use avahi && ! use threads ; then
- ewarn "Non-native avahi support has been enabled."
- ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-warnings.patch \
- "${FILESDIR}"/${P}-shm-cleanup.patch
-}
-
-src_configure() {
- # --without-v4l because of missing video4linux 2.x support wrt #389079
- econf \
- $(use_with system-libvncserver) \
- $(use_with xinerama) \
- --without-v4l \
- $(use_with fbcon fbdev) \
- $(use_with crypt) \
- $(use_with ssl crypto) \
- $(use_with ssl) \
- $(use_with avahi) \
- $(use_with jpeg) \
- $(use_with zlib) \
- $(use_with threads pthread)
-}
-
-src_install() {
- default
- dodoc x11vnc/{ChangeLog,README}
- # Remove include files, which conflict with net-libs/libvncserver
- rm -rf "${ED%/}"/usr/include
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13.ebuild
deleted file mode 100644
index c8f68aa..0000000
--- a/x11-misc/x11vnc/x11vnc-0.9.13.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="http://www.karlrunge.com/x11vnc/"
-SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="avahi crypt fbcon +jpeg ssl system-libvncserver threads tk xinerama +zlib"
-
-RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
- !system-libvncserver? (
- zlib? ( sys-libs/zlib )
- jpeg? ( virtual/jpeg:0 )
- )
- ssl? ( dev-libs/openssl )
- tk? ( dev-lang/tk )
- avahi? ( >=net-dns/avahi-0.6.4 )
- xinerama? ( x11-libs/libXinerama )
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libX11
- >=x11-libs/libXtst-1.1.0
- x11-libs/libXdamage
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-libs/libXt
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/inputproto
- x11-proto/trapproto
- x11-proto/recordproto
- x11-proto/xproto
- x11-proto/xextproto"
-
-pkg_setup() {
- if use avahi && ! use threads ; then
- ewarn "Non-native avahi support has been enabled."
- ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-warnings.patch
-}
-
-src_configure() {
- # --without-v4l because of missing video4linux 2.x support wrt #389079
- econf \
- $(use_with system-libvncserver) \
- $(use_with avahi) \
- $(use_with xinerama) \
- $(use_with ssl) \
- $(use_with ssl crypto) \
- $(use_with crypt) \
- --without-v4l \
- $(use_with jpeg) \
- $(use_with zlib) \
- $(use_with threads pthread) \
- $(use_with fbcon fbdev)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc x11vnc/{ChangeLog,README}
- # Remove include files, which conflict with net-libs/libvncserver
- rm -rf "${D}"/usr/include
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2016-10-13 21:11 Patrice Clement
0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2016-10-13 21:11 UTC (permalink / raw
To: gentoo-commits
commit: ac9d99001ff403466ad56287e2afaba08fd2e165
Author: Michał Kępień <github <AT> kempniu <DOT> pl>
AuthorDate: Thu Oct 13 07:54:26 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 21:11:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac9d9900
x11-misc/x11vnc: fix compiler detection.
Closes: https://github.com/gentoo/gentoo/pull/2549
Gentoo-Bug: https://bugs.gentoo.org/584968
Gentoo-Bug: https://bugs.gentoo.org/596138
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
x11-misc/x11vnc/files/x11vnc-0.9.13-fix-compiler-detection.patch | 6 ++++++
x11-misc/x11vnc/x11vnc-0.9.13_p20150111-r1.ebuild | 1 +
x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild | 1 +
x11-misc/x11vnc/x11vnc-0.9.13_p20150627.ebuild | 1 +
x11-misc/x11vnc/x11vnc-0.9.14.ebuild | 1 +
5 files changed, 10 insertions(+)
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-fix-compiler-detection.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-fix-compiler-detection.patch
new file mode 100644
index 00000000..0828b01
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.13-fix-compiler-detection.patch
@@ -0,0 +1,6 @@
+--- a/configure.ac 2015-11-14 18:49:21.000000000 +0100
++++ b/configure.ac 2016-10-13 09:30:37.530000000 +0200
+@@ -6,2 +6,3 @@
+ AC_CONFIG_MACRO_DIR([m4])
++AC_PROG_CC
+
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111-r1.ebuild
index 1134013..b7ccc06 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111-r1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111-r1.ebuild
@@ -43,6 +43,7 @@ S="${WORKDIR}/x11vnc-82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a"
DOCS=(ChangeLog README)
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.9.13-fix-compiler-detection.patch
eautoreconf
}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
index db5d85c..436aa97 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
@@ -40,6 +40,7 @@ S="${WORKDIR}/x11vnc-82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a"
DOCS=(ChangeLog README)
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.9.13-fix-compiler-detection.patch
eautoreconf
}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13_p20150627.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13_p20150627.ebuild
index bfe2cb09..f00bc73 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.13_p20150627.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.13_p20150627.ebuild
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
DOCS=(ChangeLog README)
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.9.13-fix-compiler-detection.patch
eautoreconf
}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.14.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14.ebuild
index 54e382b..4e87afb 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.14.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.14.ebuild
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}
DOCS=(ChangeLog README)
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.9.13-fix-compiler-detection.patch
eautoreconf
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2016-11-27 21:17 Mike Frysinger
0 siblings, 0 replies; 12+ messages in thread
From: Mike Frysinger @ 2016-11-27 21:17 UTC (permalink / raw
To: gentoo-commits
commit: 31d39424920068b244f74223e501fc462a40ca3a
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 21:15:02 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 21:16:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d39424
x11-misc/x11vnc: add upstream fixes for -unixpw handling #567612
.../x11vnc-0.9.14-libvncserver-defines-1.patch | 50 ++++
.../x11vnc-0.9.14-libvncserver-defines-2.patch | 264 +++++++++++++++++++++
x11-misc/x11vnc/x11vnc-0.9.14-r1.ebuild | 65 +++++
3 files changed, 379 insertions(+)
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.14-libvncserver-defines-1.patch b/x11-misc/x11vnc/files/x11vnc-0.9.14-libvncserver-defines-1.patch
new file mode 100644
index 00000000..9129e3c
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.14-libvncserver-defines-1.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/567612
+
+From a6852d61dce708bf5185a7e42770475a070433bc Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Fri, 27 Nov 2015 15:57:51 +0100
+Subject: [PATCH] Fix the remaining HAVE_WAITPID occurences.
+
+---
+ src/sslhelper.c | 4 ++--
+ src/unixpw.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/sslhelper.c b/src/sslhelper.c
+index bae897fd22d1..8045d7706ba5 100644
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -2964,7 +2964,7 @@ void ssl_helper_pid(pid_t pid, int sock) {
+ }
+ }
+
+-#if LIBVNCSERVER_HAVE_SYS_WAIT_H && LIBVNCSERVER_HAVE_WAITPID
++#if LIBVNCSERVER_HAVE_SYS_WAIT_H && HAVE_WAITPID
+ wret = waitpid(helpers[i], &status, WNOHANG);
+
+ if (db) fprintf(stderr, "waitpid(%d)\n", helpers[i]);
+@@ -3000,7 +3000,7 @@ if (db) fprintf(stderr, "ssl_helper_pid(%d, %d)\n", pid, sock);
+ for (i=0; i < HPSIZE; i++) {
+ if (helpers[i] == pid) {
+ if (sock == -1) {
+-#if LIBVNCSERVER_HAVE_SYS_WAIT_H && LIBVNCSERVER_HAVE_WAITPID
++#if LIBVNCSERVER_HAVE_SYS_WAIT_H && HAVE_WAITPID
+ pid_t wret;
+ wret = waitpid(helpers[i], &status, WNOHANG);
+
+diff --git a/src/unixpw.c b/src/unixpw.c
+index 4267b5ccf659..3a548808881f 100644
+--- a/src/unixpw.c
++++ b/src/unixpw.c
+@@ -56,7 +56,7 @@ extern char *crypt(const char*, const char *);
+ #include "default8x16.h"
+
+ #if LIBVNCSERVER_HAVE_FORK
+-#if LIBVNCSERVER_HAVE_SYS_WAIT_H && LIBVNCSERVER_HAVE_WAITPID
++#if LIBVNCSERVER_HAVE_SYS_WAIT_H && HAVE_WAITPID
+ #define UNIXPW_SU
+ #endif
+ #endif
+--
+2.11.0.rc2
+
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.14-libvncserver-defines-2.patch b/x11-misc/x11vnc/files/x11vnc-0.9.14-libvncserver-defines-2.patch
new file mode 100644
index 00000000..d010837
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.14-libvncserver-defines-2.patch
@@ -0,0 +1,264 @@
+https://bugs.gentoo.org/567612
+
+From e70123d8f778e3f0c3bf1606f68a70b0d9748c6a Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Tue, 1 Dec 2015 14:14:00 +0100
+Subject: [PATCH] Fix the remaining x11vnc-specific defines that are not in
+ LibVNCServer anymore.
+
+---
+ src/macosx.c | 4 ++--
+ src/macosx_opengl.c | 2 +-
+ src/screen.c | 2 +-
+ src/uinput.c | 4 ++--
+ src/unixpw.c | 30 +++++++++++++++---------------
+ src/user.c | 6 +++---
+ src/v4l.c | 2 +-
+ src/x11vnc.h | 8 ++++----
+ 8 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/src/macosx.c b/src/macosx.c
+index 6645018968c3..df622db0232d 100644
+--- a/src/macosx.c
++++ b/src/macosx.c
+@@ -33,7 +33,7 @@ so, delete this exception statement from your version.
+ /* -- macosx.c -- */
+
+ #include "config.h"
+-#if (defined(__MACH__) && defined(__APPLE__) && defined(LIBVNCSERVER_HAVE_MACOSX_NATIVE_DISPLAY))
++#if (defined(__MACH__) && defined(__APPLE__) && defined(HAVE_MACOSX_NATIVE_DISPLAY))
+
+ #define DOMAC 1
+
+@@ -748,5 +748,5 @@ int macosx_check_clipped(int win, int *list, int n) {
+ }
+
+
+-#endif /* LIBVNCSERVER_HAVE_MACOSX_NATIVE_DISPLAY */
++#endif /* HAVE_MACOSX_NATIVE_DISPLAY */
+
+diff --git a/src/macosx_opengl.c b/src/macosx_opengl.c
+index 97882797452e..4efc7be94c2e 100644
+--- a/src/macosx_opengl.c
++++ b/src/macosx_opengl.c
+@@ -38,7 +38,7 @@ so, delete this exception statement from your version.
+ #include <ApplicationServices/ApplicationServices.h>
+
+ #include <rfb/rfb.h>
+-#if LIBVNCSERVER_HAVE_MACOSX_OPENGL_H
++#if HAVE_MACOSX_OPENGL_H
+ #include <OpenGL/OpenGL.h>
+ #include <OpenGL/gl.h>
+ #endif
+diff --git a/src/screen.c b/src/screen.c
+index 5d37761c9038..bda46903b59a 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -2119,7 +2119,7 @@ if (db) fprintf(stderr, "initialize_raw_fb reset\n");
+
+ if (sscanf(str, "shm:%d", &shmid) == 1) {
+ /* shm:N */
+-#if HAVE_XSHM || LIBVNCSERVER_HAVE_SHMAT
++#if HAVE_XSHM || HAVE_SHMAT
+ raw_fb_addr = (char *) shmat(shmid, 0, SHM_RDONLY);
+ if (! raw_fb_addr) {
+ rfbLogEnable(1);
+diff --git a/src/uinput.c b/src/uinput.c
+index ac0324f1b0f0..d9e2b2656a5f 100644
+--- a/src/uinput.c
++++ b/src/uinput.c
+@@ -42,8 +42,8 @@ so, delete this exception statement from your version.
+ #include "allowed_input_t.h"
+
+ #if LIBVNCSERVER_HAVE_SYS_IOCTL_H
+-#if LIBVNCSERVER_HAVE_LINUX_INPUT_H
+-#if LIBVNCSERVER_HAVE_LINUX_UINPUT_H
++#if HAVE_LINUX_INPUT_H
++#if HAVE_LINUX_UINPUT_H
+ #define UINPUT_OK
+ #endif
+ #endif
+diff --git a/src/unixpw.c b/src/unixpw.c
+index 3a548808881f..66b776f1e8a4 100644
+--- a/src/unixpw.c
++++ b/src/unixpw.c
+@@ -62,14 +62,14 @@ extern char *crypt(const char*, const char *);
+ #endif
+
+ #ifdef IGNORE_GETSPNAM
+-#undef LIBVNCSERVER_HAVE_GETSPNAM
+-#define LIBVNCSERVER_HAVE_GETSPNAM 0
++#undef HAVE_GETSPNAM
++#define HAVE_GETSPNAM 0
+ #endif
+
+-#if LIBVNCSERVER_HAVE_PWD_H && LIBVNCSERVER_HAVE_GETPWNAM
++#if LIBVNCSERVER_HAVE_PWD_H && HAVE_GETPWNAM
+ #if LIBVNCSERVER_HAVE_CRYPT || LIBVNCSERVER_HAVE_LIBCRYPT || HAVE_LIBCRYPT
+ #define UNIXPW_CRYPT
+-#if LIBVNCSERVER_HAVE_GETSPNAM
++#if HAVE_GETSPNAM
+ #include <shadow.h>
+ #endif
+ #endif
+@@ -78,10 +78,10 @@ extern char *crypt(const char*, const char *);
+ #if LIBVNCSERVER_HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+ #endif
+-#if LIBVNCSERVER_HAVE_TERMIOS_H
++#if HAVE_TERMIOS_H
+ #include <termios.h>
+ #endif
+-#if LIBVNCSERVER_HAVE_SYS_STROPTS_H
++#if HAVE_SYS_STROPTS_H
+ #include <sys/stropts.h>
+ #endif
+
+@@ -520,7 +520,7 @@ char *get_pty_ptmx(int *fd_p) {
+
+ *fd_p = -1;
+
+-#if LIBVNCSERVER_HAVE_GRANTPT
++#if HAVE_GRANTPT
+
+ for (i=0; i < ndevs; i++) {
+ #ifdef O_NOCTTY
+@@ -628,7 +628,7 @@ char *get_pty(int *fd_p) {
+ #ifdef IS_BSD
+ return get_pty_loop(fd_p);
+ #else
+-#if LIBVNCSERVER_HAVE_GRANTPT
++#if HAVE_GRANTPT
+ used_get_pty_ptmx = 1;
+ return get_pty_ptmx(fd_p);
+ #else
+@@ -644,16 +644,16 @@ void try_to_be_nobody(void) {
+ pw = getpwnam("nobody");
+
+ if (pw) {
+-#if LIBVNCSERVER_HAVE_SETUID
++#if HAVE_SETUID
+ setuid(pw->pw_uid);
+ #endif
+-#if LIBVNCSERVER_HAVE_SETEUID
++#if HAVE_SETEUID
+ seteuid(pw->pw_uid);
+ #endif
+-#if LIBVNCSERVER_HAVE_SETGID
++#if HAVE_SETGID
+ setgid(pw->pw_gid);
+ #endif
+-#if LIBVNCSERVER_HAVE_SETEGID
++#if HAVE_SETEGID
+ setegid(pw->pw_gid);
+ #endif
+ }
+@@ -788,7 +788,7 @@ int crypt_verify(char *user, char *pass) {
+
+ if (strlen(realpw) < 12) {
+ /* e.g. "x", try getspnam(), sometimes root for inetd, etc */
+-#if LIBVNCSERVER_HAVE_GETSPNAM
++#if HAVE_GETSPNAM
+ struct spwd *sp = getspnam(user);
+ if (sp != NULL && sp->sp_pwdp != NULL) {
+ if (db) fprintf(stderr, "using getspnam()\n");
+@@ -1086,7 +1086,7 @@ int su_verify(char *user, char *pass, char *cmd, char *rbuf, int *rbuf_size, int
+
+ /* streams options fixups, handle cases as they are found: */
+ #if defined(__hpux)
+-#if LIBVNCSERVER_HAVE_SYS_STROPTS_H
++#if HAVE_SYS_STROPTS_H
+ #if LIBVNCSERVER_HAVE_SYS_IOCTL_H && defined(I_PUSH)
+ if (used_get_pty_ptmx) {
+ ioctl(sfd, I_PUSH, "ptem");
+@@ -1127,7 +1127,7 @@ int su_verify(char *user, char *pass, char *cmd, char *rbuf, int *rbuf_size, int
+ chdir("/");
+
+ try_to_be_nobody();
+-#if LIBVNCSERVER_HAVE_GETUID
++#if HAVE_GETUID
+ if (getuid() == 0 || geteuid() == 0) {
+ exit(1);
+ }
+diff --git a/src/user.c b/src/user.c
+index b759a61ae50a..aa14814de2b7 100644
+--- a/src/user.c
++++ b/src/user.c
+@@ -140,7 +140,7 @@ void check_switched_user(void) {
+ /* utilities for switching users */
+ static char *get_login_list(int with_display) {
+ char *out;
+-#if LIBVNCSERVER_HAVE_UTMPX_H
++#if HAVE_UTMPX_H
+ int i, cnt, max = 200, ut_namesize = 32;
+ int dpymax = 1000, sawdpy[1000];
+ struct utmpx *utx;
+@@ -761,7 +761,7 @@ static int switch_user_env(uid_t uid, gid_t gid, char *name, char *home, int fb_
+ int reset_fb = 0;
+ int grp_ok = 0;
+
+-#if !LIBVNCSERVER_HAVE_SETUID
++#if !HAVE_SETUID
+ return 0;
+ #else
+ /*
+@@ -773,7 +773,7 @@ static int switch_user_env(uid_t uid, gid_t gid, char *name, char *home, int fb_
+ clean_shm(0);
+ free_tiles();
+ }
+-#if LIBVNCSERVER_HAVE_INITGROUPS
++#if HAVE_INITGROUPS
+ #if LIBVNCSERVER_HAVE_PWD_H
+ if (getpwuid(uid) != NULL && getenv("X11VNC_SINGLE_GROUP") == NULL) {
+ struct passwd *p = getpwuid(uid);
+diff --git a/src/v4l.c b/src/v4l.c
+index 86c33a6b9e75..8a3581362599 100644
+--- a/src/v4l.c
++++ b/src/v4l.c
+@@ -41,7 +41,7 @@ so, delete this exception statement from your version.
+ #include "keyboard.h"
+ #include "allowed_input_t.h"
+
+-#if LIBVNCSERVER_HAVE_LINUX_VIDEODEV_H
++#if HAVE_LINUX_VIDEODEV_H
+ #if LIBVNCSERVER_HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+ #define CONFIG_VIDEO_V4L1_COMPAT
+diff --git a/src/x11vnc.h b/src/x11vnc.h
+index 7a84703eabc8..79319a420eec 100644
+--- a/src/x11vnc.h
++++ b/src/x11vnc.h
+@@ -255,10 +255,10 @@ so, delete this exception statement from your version.
+ #endif
+
+ #if (SMALL_FOOTPRINT > 2)
+-#undef LIBVNCSERVER_HAVE_UTMPX_H
++#undef HAVE_UTMPX_H
+ #undef LIBVNCSERVER_HAVE_PWD_H
+ #undef REMOTE_CONTROL
+-#define LIBVNCSERVER_HAVE_UTMPX_H 0
++#define HAVE_UTMPX_H 0
+ #define LIBVNCSERVER_HAVE_PWD_H 0
+ #define REMOTE_CONTROL 0
+ #endif
+@@ -308,7 +308,7 @@ so, delete this exception statement from your version.
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
+ #endif
+-#if LIBVNCSERVER_HAVE_SHMAT
++#if HAVE_SHMAT
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #endif
+@@ -392,7 +392,7 @@ extern int h_errno;
+ #if LIBVNCSERVER_HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+ #endif
+-#if LIBVNCSERVER_HAVE_UTMPX_H
++#if HAVE_UTMPX_H
+ #include <utmpx.h>
+ #endif
+
+--
+2.11.0.rc2
+
diff --git a/x11-misc/x11vnc/x11vnc-0.9.14-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14-r1.ebuild
new file mode 100644
index 00000000..43e7b13
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.14-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils vcs-snapshot
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/0.9.14.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl ssl xinerama zeroconf"
+
+RDEPEND=">=net-libs/libvncserver-0.9.8
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ >=x11-libs/libXtst-1.1.0
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ xinerama? ( x11-libs/libXinerama )
+ zeroconf? ( >=net-dns/avahi-0.6.4 )
+"
+DEPEND="${RDEPEND}
+ x11-libs/libXt
+ x11-proto/inputproto
+ x11-proto/trapproto
+ x11-proto/recordproto
+ x11-proto/xproto
+ x11-proto/xextproto
+ xinerama? ( x11-proto/xineramaproto )"
+
+DOCS=(ChangeLog README)
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.9.13-fix-compiler-detection.patch
+ epatch "${FILESDIR}"/${P}-libvncserver-defines-1.patch #567612
+ epatch "${FILESDIR}"/${P}-libvncserver-defines-2.patch #567612
+ eautoreconf
+}
+
+src_configure() {
+ # --without-v4l because of missing video4linux 2.x support wrt #389079
+ econf \
+ $(use_with crypt) \
+ $(use_with fbcon fbdev) \
+ $(use_with ssl) \
+ $(use_with ssl crypto) \
+ --without-v4l \
+ $(use_with xinerama) \
+ $(use_with zeroconf avahi)
+}
+
+src_install() {
+ default
+ doinitd "${FILESDIR}/x11vnc.init.d"
+ doconfd "${FILESDIR}/x11vnc.conf.d"
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2017-05-28 7:18 Michał Górny
0 siblings, 0 replies; 12+ messages in thread
From: Michał Górny @ 2017-05-28 7:18 UTC (permalink / raw
To: gentoo-commits
commit: 487377a532ca955416a2dfea5b30344fd7dd554e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 07:18:39 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 28 07:18:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=487377a5
x11-misc/x11vnc: Clean old up, #619894
.../x11vnc-0.9.13-fix-compiler-detection.patch | 6 ---
x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild | 56 ----------------------
2 files changed, 62 deletions(-)
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-fix-compiler-detection.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-fix-compiler-detection.patch
deleted file mode 100644
index 0828b0154e6..00000000000
--- a/x11-misc/x11vnc/files/x11vnc-0.9.13-fix-compiler-detection.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- a/configure.ac 2015-11-14 18:49:21.000000000 +0100
-+++ b/configure.ac 2016-10-13 09:30:37.530000000 +0200
-@@ -6,2 +6,3 @@
- AC_CONFIG_MACRO_DIR([m4])
-+AC_PROG_CC
-
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
deleted file mode 100644
index 4fac03cbeaa..00000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="http://www.karlrunge.com/x11vnc/"
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="avahi crypt fbcon ssl xinerama"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- >=x11-libs/libXtst-1.1.0
- avahi? ( >=net-dns/avahi-0.6.4 )
- ssl? ( dev-libs/openssl:= )
- >=net-libs/libvncserver-0.9.8
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- x11-libs/libXt
- x11-proto/inputproto
- x11-proto/trapproto
- x11-proto/recordproto
- x11-proto/xproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )"
-
-S="${WORKDIR}/x11vnc-82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a"
-
-DOCS=(ChangeLog README)
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.9.13-fix-compiler-detection.patch
- eautoreconf
-}
-
-src_configure() {
- # --without-v4l because of missing video4linux 2.x support wrt #389079
- econf \
- $(use_with avahi) \
- $(use_with crypt) \
- $(use_with fbcon fbdev) \
- $(use_with ssl) \
- $(use_with ssl crypto) \
- --without-v4l \
- $(use_with xinerama)
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2019-02-24 10:53 Pacho Ramos
0 siblings, 0 replies; 12+ messages in thread
From: Pacho Ramos @ 2019-02-24 10:53 UTC (permalink / raw
To: gentoo-commits
commit: c421fb9e8c2826b925b3adc0d17b6f70a23c809c
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 10:32:41 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 10:53:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c421fb9e
x11-misc/x11vnc: Fix dependencies and build issues
Closes: https://bugs.gentoo.org/675596
Closes: https://bugs.gentoo.org/648898
Closes: https://bugs.gentoo.org/611088
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch | 23 ++++++++
x11-misc/x11vnc/metadata.xml | 6 ++
x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild | 75 ++++++++++++++++++++++++
3 files changed, 104 insertions(+)
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch
new file mode 100644
index 00000000000..21872e73cb7
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch
@@ -0,0 +1,23 @@
+From 3024af3685be9eb618352bd17ba37953d8076946 Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+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/metadata.xml b/x11-misc/x11vnc/metadata.xml
index f25d54c1912..4ad5dbb6d54 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -7,6 +7,12 @@
simple command-line server utility that allows a VNC viewer
to connect to an actual X display.
</longdescription>
+ <use>
+ <flag name="xdamage">Enable support for the Xdamage library</flag>
+ <flag name="xfixes">Enable support for the Xfixes library</flag>
+ <flag name="xrandr">Enable support for the X xrandr extension</flag>
+ <flag name="xtrap">Enable support for the XTrap library</flag>
+ </use>
<upstream>
<remote-id type="sourceforge">libvncserver</remote-id>
<remote-id type="github">LibVNC/x11vnc</remote-id>
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
new file mode 100644
index 00000000000..b34c657ccd3
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools vcs-snapshot
+
+DESCRIPTION="A 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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr xtrap 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
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ xcomposite? ( x11-libs/libXcomposite )
+ xdamage? ( x11-libs/libXdamage )
+ xfixes? ( x11-libs/libXfixes )
+ xinerama? ( x11-libs/libXinerama )
+ xrandr? ( x11-libs/libXrandr )
+ xtrap? ( x11-libs/libXTrap )
+ 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="dev-lang/tk:0"
+
+PATCHES=(
+ # https://github.com/LibVNC/x11vnc/issues/86
+ "${FILESDIR}"/${P}-crypto.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # --without-v4l because of missing video4linux 2.x support wrt #389079
+ econf \
+ --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 xtrap) \
+ $(use_with zeroconf avahi)
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
+ newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2019-06-01 8:15 Michał Górny
0 siblings, 0 replies; 12+ messages in thread
From: Michał Górny @ 2019-06-01 8:15 UTC (permalink / raw
To: gentoo-commits
commit: 8b853a8081e1c2ce0c4966203bdf0f928d782ce3
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Tue May 21 19:29:59 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 08:15:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b853a80
x11-misc/x11vnc: fix building with libressl
Closes: https://bugs.gentoo.org/675610
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch | 93 ++++++++++++++++++++++
x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild | 1 +
2 files changed, 94 insertions(+)
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
new file mode 100644
index 00000000000..8e5d8a69217
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
@@ -0,0 +1,93 @@
+diff --git a/src/sslhelper.c b/src/sslhelper.c
+index 04c2e27..fb9daa6 100644
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, int rwflag,
+ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ const ASN1_INTEGER *revoked_serial;
+ X509_STORE_CTX *store_ctx;
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT *obj;
+ #else
+ X509_OBJECT obj;
+@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ * the current certificate in order to verify it's integrity. */
+ store_ctx = X509_STORE_CTX_new();
+ X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ obj = X509_OBJECT_new();
+ rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj);
+ crl = X509_OBJECT_get0_X509_CRL(obj);
+@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ rfbLog("Invalid signature on CRL\n");
+ X509_STORE_CTX_set_error(callback_ctx,
+ X509_V_ERR_CRL_SIGNATURE_FAILURE);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ rfbLog("Found CRL has invalid nextUpdate field\n");
+ X509_STORE_CTX_set_error(callback_ctx,
+ X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ rfbLog("Found CRL is expired - "
+ "revoking all certificates until you get updated CRL\n");
+ X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+ #endif
+ return 0; /* Reject connection */
+ }
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ * the current certificate in order to check for revocation. */
+ store_ctx = X509_STORE_CTX_new();
+ X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ obj = X509_OBJECT_new();
+ rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj);
+ crl = X509_OBJECT_get0_X509_CRL(obj);
+@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ "revoked per CRL from issuer %s\n", serial, serial, cp);
+ OPENSSL_free(cp);
+ X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ return 0; /* Reject connection */
+ }
+ }
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -1596,7 +1596,7 @@ 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)
+ /* 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-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
index f102419eb68..fa6c2d774e9 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
@@ -43,6 +43,7 @@ RDEPEND="${COMMON_DEPEND}
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}-libressl.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2020-01-30 6:33 Joonas Niilola
0 siblings, 0 replies; 12+ messages in thread
From: Joonas Niilola @ 2020-01-30 6:33 UTC (permalink / raw
To: gentoo-commits
commit: e82d0a5251dd59099ed8f07308d2b87374ac2afc
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Wed Jan 29 11:57:34 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 06:33:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82d0a52
x11-misc/x11vnc: fix build with -fno-common
Closes: https://bugs.gentoo.org/706840
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/14495
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../x11vnc/files/x11vnc-0.9.16-fno-common.patch | 45 ++++++++++++++++++++++
x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild | 3 +-
2 files changed, 47 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..504159efe92
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch
@@ -0,0 +1,45 @@
+From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+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/x11vnc-0.9.16-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
index bc16d70cde2..f01cd79f6ba 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,6 +44,7 @@ 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}-libressl.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2020-12-07 7:36 Joonas Niilola
0 siblings, 0 replies; 12+ messages in thread
From: Joonas Niilola @ 2020-12-07 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 10d026e0af2445f2a4b6f922486795ede8ef4907
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Fri Nov 27 16:50:50 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Dec 7 07:34:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d026e0
x11-misc/x11vnc: security bump for CVE-2020-29074
Bug: https://bugs.gentoo.org/756841
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/18432
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/x11vnc-0.9.16-CVE-2020-29074.patch | 25 +++++++
x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild | 81 ++++++++++++++++++++++
2 files changed, 106 insertions(+)
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
new file mode 100644
index 00000000000..12f65b94fb6
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch
@@ -0,0 +1,25 @@
+From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= <guenal.davalan@uca.fr>
+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/x11vnc-0.9.16-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
new file mode 100644
index 00000000000..31f1ea9b8f1
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl 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
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ 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}-libressl.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-CVE-2020-29074.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" x11vnc
+ newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2021-05-01 18:07 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2021-05-01 18:07 UTC (permalink / raw
To: gentoo-commits
commit: e5c07498fec32b108bc478d8381aa8c88c65a7e7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 17:32:20 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 1 18:06:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c07498
x11-misc/x11vnc: drop obsolete LibreSSL patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch | 93 ----------------------
x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild | 1 -
x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild | 1 -
3 files changed, 95 deletions(-)
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 8e5d8a69217..00000000000
--- a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/src/sslhelper.c b/src/sslhelper.c
-index 04c2e27..fb9daa6 100644
---- a/src/sslhelper.c
-+++ b/src/sslhelper.c
-@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, int rwflag,
- static int crl_callback(X509_STORE_CTX *callback_ctx) {
- const ASN1_INTEGER *revoked_serial;
- X509_STORE_CTX *store_ctx;
--#if OPENSSL_VERSION_NUMBER > 0x10100000L
-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- X509_OBJECT *obj;
- #else
- X509_OBJECT obj;
-@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- * the current certificate in order to verify it's integrity. */
- store_ctx = X509_STORE_CTX_new();
- X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
--#if OPENSSL_VERSION_NUMBER > 0x10100000L
-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- obj = X509_OBJECT_new();
- rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj);
- crl = X509_OBJECT_get0_X509_CRL(obj);
-@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- rfbLog("Invalid signature on CRL\n");
- X509_STORE_CTX_set_error(callback_ctx,
- X509_V_ERR_CRL_SIGNATURE_FAILURE);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- X509_OBJECT_free(obj);
- #else
- X509_OBJECT_free_contents(&obj);
-@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- rfbLog("Found CRL has invalid nextUpdate field\n");
- X509_STORE_CTX_set_error(callback_ctx,
- X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- X509_OBJECT_free(obj);
- #else
- X509_OBJECT_free_contents(&obj);
-@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- rfbLog("Found CRL is expired - "
- "revoking all certificates until you get updated CRL\n");
- X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- X509_OBJECT_free(obj);
- #else
- X509_OBJECT_free_contents(&obj);
- #endif
- return 0; /* Reject connection */
- }
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- X509_OBJECT_free(obj);
- #else
- X509_OBJECT_free_contents(&obj);
-@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- * the current certificate in order to check for revocation. */
- store_ctx = X509_STORE_CTX_new();
- X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
--#if OPENSSL_VERSION_NUMBER > 0x10100000L
-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- obj = X509_OBJECT_new();
- rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj);
- crl = X509_OBJECT_get0_X509_CRL(obj);
-@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- "revoked per CRL from issuer %s\n", serial, serial, cp);
- OPENSSL_free(cp);
- X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- X509_OBJECT_free(obj);
- #else
- X509_OBJECT_free_contents(&obj);
-@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
- return 0; /* Reject connection */
- }
- }
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- X509_OBJECT_free(obj);
- #else
- X509_OBJECT_free_contents(&obj);
-@@ -1596,7 +1596,7 @@ 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)
- /* 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-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
index 9d0ae573e93..747abaec59d 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
@@ -40,7 +40,6 @@ RDEPEND="${COMMON_DEPEND}
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}-libressl.patch
"${FILESDIR}"/${P}-fno-common.patch
"${FILESDIR}"/${P}-CVE-2020-29074.patch
)
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
index 67620fb825d..0980e502c5f 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
@@ -40,7 +40,6 @@ RDEPEND="${COMMON_DEPEND}
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}-libressl.patch
"${FILESDIR}"/${P}-fno-common.patch
"${FILESDIR}"/${P}-CVE-2020-29074.patch
)
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2023-03-11 17:15 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2023-03-11 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 80eb507bfad9d199bfb85df9c07426473a670812
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Mar 5 22:29:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 17:15:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80eb507b
x11-misc/x11vnc: remove old
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/29949
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-misc/x11vnc/files/x11vnc.init.d | 70 -----------------------------
x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild | 78 ---------------------------------
2 files changed, 148 deletions(-)
diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d
deleted file mode 100644
index b6b16dafb943..000000000000
--- a/x11-misc/x11vnc/files/x11vnc.init.d
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="The x11vnc daemon init script"
-
-depend() {
- need net
- need xdm
-}
-
-checkconfig() {
-
- # Set Defaults
- X11VNC_RFBAUTH=${X11VNC_RFBAUTH:-/etc/x11vnc.pass}
- X11VNC_RFBPORT=${X11VNC_RFBPORT:-5900}
- X11VNC_DISPLAY=${X11VNC_DISPLAY:-:0}
- X11VNC_LOG=${X11VNC_LOG:-/var/log/x11vnc}
-
- X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}"
-
- if [ -n "${X11VNC_AUTOPORT}" ]; then
- X11VNC_PORT=""
- fi
-
- if [ ! -f "${X11VNC_RFBAUTH}" -o ! -s "${X11VNC_RFBAUTH}" ]; then
- eerror "VNC Password not set, please set one by running: \`x11vnc -storepasswd ${X11VNC_RFBAUTH}\`"
- return 1
- fi
- checkpath -q -f -m 0600 -o root:root "${X11VNC_RFBAUTH}"
-
- # Attempt to find X-Auth file
- if ! type xauth > /dev/null 2>&1 ||
- ! xauth -f /root/.Xauthority extract - "${X11VNC_DISPLAY}" > "${X11VNC_AUTH}" 2>/dev/null ||
- [ ! -s "${X11VNC_AUTH}" ]; then
- # Let x11vnc guess at auth
- X11VNC_AUTH_OPTS="--env FD_XDM=1 -auth guess"
- else
- # We found the proper auth
- X11VNC_AUTH_OPTS="-auth ${X11VNC_AUTH}"
- fi
-
- if [ ! -f "${X11VNC_AUTH}" ]; then
- eerror "Specified X-Authority file '${X11VNC_AUTH}' not found!"
- return 1
- fi
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start \
- --exec /usr/bin/x11vnc -- \
- ${X11VNC_AUTH_OPTS} \
- -rfbauth ${X11VNC_RFBAUTH} \
- ${X11VNC_RFBPORT:+-rfbport} ${X11VNC_RFBPORT} \
- ${X11VNC_AUTOPORT:+-autoport} ${X11VNC_AUTOPORT} \
- -display ${X11VNC_DISPLAY} \
- -o ${X11VNC_LOG} \
- -bg -forever \
- ${X11VNC_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop /usr/bin/x11vnc
- eend $?
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild
deleted file mode 100644
index 74df787e2dd1..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-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
-)
-
-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" x11vnc
- newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2023-05-10 16:38 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2023-05-10 16:38 UTC (permalink / raw
To: gentoo-commits
commit: 6736b24818b00f95d55ca46ac02335bfc505e71f
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed May 3 13:13:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 10 16:35:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6736b248
x11-misc/x11vnc: add upstream libressl patch
This patch was accepted upstream and fixed the build with LibreSSL < 3.6
which doesn't have SSL_CTX_set_security_level() which is added in the also
upstreamed x11vnc-0.9.16-anonymous-ssl.patch. The function is
appropriately enabled for LibreSSL >= 3.6.
Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/LibVNC/x11vnc/pull/202
Upstream-Commit: https://github.com/LibVNC/x11vnc/commit/af63109a17f1b1ec8b1e332d215501f11c4a33a0
Upstream-PR: https://github.com/LibVNC/x11vnc/pull/224
Upstream-Commit: https://github.com/LibVNC/x11vnc/commit/354602cffa8edcbe813da6dfd051b96d94b3efbc
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30856
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch | 45 ++++++++++++++++++++++
x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild | 1 +
2 files changed, 46 insertions(+)
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
new file mode 100644
index 000000000000..3a21f30d7f14
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
@@ -0,0 +1,45 @@
+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 <orbea@riseup.net>
+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 <orbea@riseup.net>
+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
index 63e3af4a67a1..59488c833952 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fno-common.patch
"${FILESDIR}"/${P}-CVE-2020-29074.patch
"${FILESDIR}"/${P}-implicit-function-declaration.patch
+ "${FILESDIR}"/${P}-libressl.patch # 903001
)
src_prepare() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/
@ 2024-08-10 7:24 Joonas Niilola
0 siblings, 0 replies; 12+ messages in thread
From: Joonas Niilola @ 2024-08-10 7:24 UTC (permalink / raw
To: gentoo-commits
commit: 12d9341c943a4cd4ae728a2f9f7d87eccca73185
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Wed Jul 31 22:44:58 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 07:06:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d9341c
x11-misc/x11vnc: fix build on 32bit arches with 64bit time_t
Closes: https://bugs.gentoo.org/936857
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/37891
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/x11vnc-0.9.16-fix-build-on-32bit.patch | 105 +++++++++++++++++++++
x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild | 3 +-
2 files changed, 107 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000000000000..6239e0877923
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-fix-build-on-32bit.patch
@@ -0,0 +1,105 @@
+From daecf59cc8b294265666482a4766aaa3148c308b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+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/x11vnc-0.9.16-r8.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
index 62b802f2bb43..214d2bf12b72 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -45,6 +45,7 @@ PATCHES=(
"${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() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-08-10 7:24 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-01 18:07 [gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/, x11-misc/x11vnc/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-10 7:24 Joonas Niilola
2023-05-10 16:38 Sam James
2023-03-11 17:15 Sam James
2020-12-07 7:36 Joonas Niilola
2020-01-30 6:33 Joonas Niilola
2019-06-01 8:15 Michał Górny
2019-02-24 10:53 Pacho Ramos
2017-05-28 7:18 Michał Górny
2016-11-27 21:17 Mike Frysinger
2016-10-13 21:11 Patrice Clement
2015-09-26 15:21 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox