commit: 91cd2520dd18de7426f88967aec7dd404b29d175 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Tue Jul 5 16:07:06 2022 +0000 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> CommitDate: Tue Jul 5 21:18:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=91cd2520
x11-misc/x11vnc: Add 0.9.16-r7 Upstream-PR: https://github.com/LibVNC/x11vnc/pull/202 Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/libressl/pull/435 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch | 94 +++------------------- x11-misc/x11vnc/files/x11vnc.conf.d | 2 +- x11-misc/x11vnc/files/x11vnc.init.d | 2 +- .../files/{x11vnc.init.d => x11vnc.init.d-r1} | 2 +- x11-misc/x11vnc/metadata.xml | 6 +- ...nc-0.9.16-r4.ebuild => x11vnc-0.9.16-r7.ebuild} | 5 +- 6 files changed, 22 insertions(+), 89 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 index 8e5d8a6..cad9f5e 100644 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch +++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch @@ -1,87 +1,19 @@ +Upstream-PR: https://github.com/LibVNC/x11vnc/pull/202 + +From d81e9d8e56ccc1b346b5aeb4b64fa0a32737c22d Mon Sep 17 00:00:00 2001 +From: orbea <[email protected]> +Date: Tue, 5 Jul 2022 08:57:29 -0700 +Subject: [PATCH] Support LibreSSL + +This builds with LibreSSL 3.5.x. +--- + src/sslhelper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/src/sslhelper.c b/src/sslhelper.c -index 04c2e27..fb9daa6 100644 +index ba680b35..bd5ef0fb 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; diff --git a/x11-misc/x11vnc/files/x11vnc.conf.d b/x11-misc/x11vnc/files/x11vnc.conf.d index 91f2a13..7df3a13 100644 --- a/x11-misc/x11vnc/files/x11vnc.conf.d +++ b/x11-misc/x11vnc/files/x11vnc.conf.d @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Configuration for running x11vnc as a service. This allows VNC diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d index 4adcb23..b6b16da 100644 --- a/x11-misc/x11vnc/files/x11vnc.init.d +++ b/x11-misc/x11vnc/files/x11vnc.init.d @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 description="The x11vnc daemon init script" diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d-r1 similarity index 98% copy from x11-misc/x11vnc/files/x11vnc.init.d copy to x11-misc/x11vnc/files/x11vnc.init.d-r1 index 4adcb23..04c36ea 100644 --- a/x11-misc/x11vnc/files/x11vnc.init.d +++ b/x11-misc/x11vnc/files/x11vnc.init.d-r1 @@ -6,7 +6,7 @@ description="The x11vnc daemon init script" depend() { need net - need xdm + need display-manager } checkconfig() { diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml index 40fa318..432585e 100644 --- a/x11-misc/x11vnc/metadata.xml +++ b/x11-misc/x11vnc/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>[email protected]</email> <name>Alexander Tsoy</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>[email protected]</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild similarity index 89% rename from x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild rename to x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild index 9d0ae57..9ce245d 100644 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild +++ b/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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=" @@ -20,6 +20,7 @@ COMMON_DEPEND=" 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 ) @@ -73,6 +74,6 @@ src_configure() { src_install() { default - newinitd "${FILESDIR}/x11vnc.init.d" x11vnc + newinitd "${FILESDIR}/x11vnc.init.d-r1" x11vnc newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc }
