gentoo auto-resync : 10:05:2023 - 23:44:41

3 files changed, 48 insertions, 1 deletions

diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index a3c1e7098d23..6728babbb400 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -3,8 +3,9 @@ AUX x11vnc-0.9.16-anonymous-ssl.patch 841 BLAKE2B d037f4f784fe12cedca33be6a63852
 AUX x11vnc-0.9.16-crypto.patch 645 BLAKE2B a821861e4e4807e5e019c787d07791912083a3ae2d1e4c77eb3264adee65a68ea51c35fdfcd0d71b996f4af42ff8481c877f5f324180139857e5cfc7d0ac3db3 SHA512 6e9ec1eb5aba65999dda9048fb01e13c55cbbf6f3e226c23e20ee906891487a5c94efd09f54ac765ca1ed99290357403a0b2caa3a7226fc967b0e8ecf19360a6
 AUX x11vnc-0.9.16-fno-common.patch 1079 BLAKE2B eb1cbe8e959eeea0940b44d3804406d2b9a18261a279b05fa54dff1240674d51dc44ce4fff9ea64a6644e532c80499287bbb1025b06b47d3b2546eb76f32fbce SHA512 3acaa4e57921673aef14ce2e9931880bcbc8c3d73708124599b8ffc79be6c4fa43713184f01983f4f432e29137c3628902681aed275ca98c7a6f32cb10bc54ca
 AUX x11vnc-0.9.16-implicit-function-declaration.patch 633 BLAKE2B 54f24f5f46f91c2c9b9aaec2b0446b0a48772ebfae7ac479f500ceec45d46c7c5f025ce9daa1094052ec5a1c3a81ebc8a04fc89c60d634b4acbaea4c6f0b0214 SHA512 a95fad04879bcfcd2660acb22006f35042d3a2be0a7013c35ab2cc38103c1e9ced283cb6a1c5e46d28dcae2c7da55c92e4f2e6309c52b8b879e0257c8c65cc29
+AUX x11vnc-0.9.16-libressl.patch 1721 BLAKE2B a2565c9b9d6cb778846197ba1258a94b57c9f5a854da35aaa1cbf561752a4667c1ea164dbe1297160e5d410fbc6cc72da6fa6336dd237e3145fe48df3b986dbc SHA512 53279b391d567849d9e26248cd20b14f8d181752ceca0ec10142fdea486ccd3cb273c7e31c3b0ab023e722c93f1a4d4af27a6f50306744b29ac0093d89fc1c14
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d-r1 1740 BLAKE2B 85f5c40a47287eb648d49c5e6211ea950abcad1378690ee7f45313378d49f4cc826a08d15f36dc49fc76dc4cc763fd6182c4324de053c5ba40cea97001546c74 SHA512 def0edac62b35b231354fb24372b48ac346730af2e507522e7a598c9661a78252ee31dab7c3635d85ec128873d0261913a35482c8dc0be744806e8db5af222aa
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-EBUILD x11vnc-0.9.16-r8.ebuild 2037 BLAKE2B 643621bb1bc88b54df7829e661adbdb0f075dd4a4143e683eb42c13d353d752f41012ed811df6ee1ba5ed9ffb6d20c337e6d56b389c9be83c7a0d45c6a190788 SHA512 dbee62887862077830ea142614c3f364f857d6cf2a8b7874f0d424365bc817e72fe414ed61d0fae00acea464523dc38abfce34da4a5a56a40164cc205383b3da
+EBUILD x11vnc-0.9.16-r8.ebuild 2081 BLAKE2B 66bbc998a8fd0eaecd04b57075186bd3adf4ee1b6d499af5f65caffea06c962c2cc6e639b17de885d3b5b700efb0831fd0d9f8de64f38b9fa7a1d95b57624db8 SHA512 04dfb9b406ebb0d0f7c64749065ab12d919eead8a3b86f763ccac0459c71d93cc9de2f8f85f0987b5abeedbc3e040be3f94fcb679995599b3b10d82201f98ab3
 MISC metadata.xml 953 BLAKE2B 716b40da30ae65560d74a2dc7ea528180e0d8da048355dfc7557df06704ccde01cba1a3fa24a3f5f53bc6349482d430f180e0678bf6d032be8966d971a612445 SHA512 a9de2facb44bc2eeab0fda61de359b191d7c1243560a3cfa21e1566cad6c113ed126dd117befc8666d4dfa8080cb291ac9fed75b9fcc4f6986ed6bebd89ab710
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() {