gentoo auto-resync : 08:10:2024 - 04:26:34

4 files changed, 61 insertions, 1 deletions

diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index d3626eb002ec..d928406f30ef 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest
index d3be70944bcd..170f000e1e22 100644
--- a/net-voip/murmur/Manifest
+++ b/net-voip/murmur/Manifest
@@ -1,7 +1,8 @@
+AUX murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch 1962 BLAKE2B 74934c9772f81d56155cae1662e24347c2bf84b9eca248f8a9eecdd1a1ea02028a36ed39d99907b8570b2b25d23c034563dadc7a73b3008aa453f3034dd2d2f3 SHA512 b9c663599fbcf217e48c4a8c01b749fec0c81c498210ff08bd858b96a4a5e7194b56edae9dee9a4150b65487a5e5c6004cbed798be7bc37169da867531b2fc44
 AUX murmur.confd-r2 179 BLAKE2B bd4eecb479d0c12ed0ec29de964c949bfdfc17c89a0134ffe23fcbc885e1e2a82ca8fc003c49d25ba9eed5861f39be18d4b1b6784427a6728e91e901de420427 SHA512 4b293834867a6cdb909f6bd8abc952ea2d955daa2e465b370f09f6f884e13f857dee74b2c5058121f8009db3d9b6c951bafa25b3862d7b0375eee034055d2eeb
 AUX murmur.initd-r2 511 BLAKE2B 2ff09ffdb62c5131f97f52960ac71360eb4959bb974c8cbc7f0fb0a27da91f34826a3065840be5a5ef9c24e243185cee0106c85285aa2aefbb534934cff9621d SHA512 3153254ec2c31e1b19e4991cce65ae9df7a609ad61c13ff569bbe822fc728dcf562c63c0a0d3198de3bd1599524db3f0e122004d1491b6bceafdbb28066a56cc
 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
 DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59
-EBUILD murmur-1.5.634.ebuild 4418 BLAKE2B fc0b1b23c8ce31184a187c5e5e1e1e3690c8e26ab68e513bcc2a47ae2ae79bee9fcb8d4d4c8a6aeac5c2dcc2816416d4b881357b981f7eb5819fa48868870932 SHA512 5fd930c29f19765c115483f61bbf5f27b85a5d11fc57cea8851ace7e656db61561d2b75b21c56c67eb2e081b16e29b01ba47d85916eebef8a251644c860bbb0e
+EBUILD murmur-1.5.634.ebuild 4536 BLAKE2B 49869393f8c4b056367d4eac8c7e416c67daa1a0182d72edb13c4b703bea576662d3f074d55555918a82fa6a6fe60228da2604cf19e1df3ac7a3d9d4e31fe439 SHA512 a3817258a6642511915708369fadff773e23419814c3043e25c435abd32818d49658471980845d197f3aa1eaed24aaf808e1482cc2399d6aca9ab2f036bed965
 EBUILD murmur-9999.ebuild 4420 BLAKE2B 63d55eb952900c3f4114e874d795280c79c4d3f484e0e9a1af6eea33b89d17463d0b56e11489681a1d59e88b4ea1932bbc8a6e4ba16e84bf6341c42c96874702 SHA512 651b96e49ba4f6e94a52220a63dcb31f9abd925e095913b47d8c7aff90214f6ddd128260f9f9ac97a6961111180a907466aa1f12bbdbcb257e179b3092231989
 MISC metadata.xml 495 BLAKE2B d856fa5491939cbe46c66d445d0768429c1e1570ba7fa97b9601fbb53939a1aeabbd246a50705143dd5ea41d186f02c460fcaa0edf3c821813639fdc76ec6aed SHA512 0bccad9c369e38ddf5b4e212b0db6b7e5e6286e4aff4afbea64dd087d1b15934762bfd37a6289ac77119d6b5bbd68c7aecf2d2b433f9b854a3ed6b386d64661c
diff --git a/net-voip/murmur/files/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch b/net-voip/murmur/files/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch
new file mode 100644
index 000000000000..1e8806bda2fe
--- /dev/null
+++ b/net-voip/murmur/files/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch
@@ -0,0 +1,54 @@
+From 2be534747d2bd111e64fb163120caa6c78d04abe Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Mon, 16 Sep 2024 18:16:49 +0200
+Subject: [PATCH] FIX(client, server): Remove redundant OpenSSL locking
+ callback check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CRYPTO_get_locking_callback() has been defined to NULL since OpenSSL
+1.1.0.  This check therefore doesn't do anything in any supported
+version of OpenSSL:
+
+https://github.com/openssl/openssl/blob/abd30777cc72029e8a44e4b67201cae8ed3d19c1/include/openssl/crypto.h#L220
+
+This fixes the following compiler error that I saw with GCC 14:
+
+/build/source/src/SSL.cpp: In static member function ‘static void MumbleSSL::initialize()’:
+/build/source/src/SSL.cpp:36:14: error: converting to ‘bool’ from ‘std::nullptr_t’ requires direct-initialization [-fpermissive]
+   36 |         if (!CRYPTO_get_locking_callback()) {
+      |              ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+(cherry picked from commit 56945a9dfb62d29dccfe561572ebf64500deaed1)
+---
+ src/SSL.cpp | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/src/SSL.cpp b/src/SSL.cpp
+index bb30f7e9f..72161009c 100644
+--- a/src/SSL.cpp
++++ b/src/SSL.cpp
+@@ -24,18 +24,7 @@ void MumbleSSL::initialize() {
+ 	SSL_library_init(); // Safe to discard return value, per OpenSSL man pages.
+ 	SSL_load_error_strings();
+ 
+-	// Determine if a locking callback has not been set.
+-	// This should be the case if there are multiple copies
+-	// of OpensSSL in the address space. This is mostly due
+-	// to Qt dynamically loading OpenSSL when it is not
+-	// configured with -openssl-linked.
+-	//
+-	// If we detect that no locking callback is configured, we
+-	// have to set it up ourselves to allow multi-threaded use
+-	// of OpenSSL.
+-	if (!CRYPTO_get_locking_callback()) {
+-		SSLLocks::initialize();
+-	}
++	SSLLocks::initialize();
+ }
+ 
+ void MumbleSSL::destroy() {
+-- 
+2.46.2
+
diff --git a/net-voip/murmur/murmur-1.5.634.ebuild b/net-voip/murmur/murmur-1.5.634.ebuild
index 2162f57c5ffd..64472a63810f 100644
--- a/net-voip/murmur/murmur-1.5.634.ebuild
+++ b/net-voip/murmur/murmur-1.5.634.ebuild
@@ -72,6 +72,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# fix build on musl, bug #888960
+	"${FILESDIR}"/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch
+)
+
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 The default 'SuperUser' password will be written into the log file