gentoo auto-resync : 01:09:2022 - 19:24:10

3 files changed, 0 insertions, 183 deletions

diff --git a/net-voip/mumble/files/mumble-1.4-crypto-threads.patch b/net-voip/mumble/files/mumble-1.4-crypto-threads.patch
deleted file mode 100644
index 0ad371cd6c63..000000000000
--- a/net-voip/mumble/files/mumble-1.4-crypto-threads.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-commit f8d47db318f302f5a7d343f15c9936c7030c49c4
-Author: Terry Geng <terry@terriex.com>
-Date:   Sun Dec 12 22:39:38 2021 -0500
-
-    FIX(crypto): Sharing EVP context between threads crushes Mumble
-    
-    Functions ocb_encrypt and ocb_decrypt share the same set
-    of encrypt and decrypt contexts. However, they are invoked
-    in different threads (audio input thread and server
-    handler thread).
-    This may lead to conflicts that would crash Mumble.
-    This patch separates contexts used in these two functions
-    to avoid such conflicts.
-    
-    Fixes #5361
-
-diff --git a/src/crypto/CryptStateOCB2.cpp b/src/crypto/CryptStateOCB2.cpp
-index 640fdedac..3b3473ffe 100644
---- a/src/crypto/CryptStateOCB2.cpp
-+++ b/src/crypto/CryptStateOCB2.cpp
-@@ -30,7 +30,9 @@
- #include <cstring>
- #include <openssl/rand.h>
- 
--CryptStateOCB2::CryptStateOCB2() : CryptState(), enc_ctx(EVP_CIPHER_CTX_new()), dec_ctx(EVP_CIPHER_CTX_new()) {
-+CryptStateOCB2::CryptStateOCB2()
-+	: CryptState(), enc_ctx_ocb_enc(EVP_CIPHER_CTX_new()), dec_ctx_ocb_enc(EVP_CIPHER_CTX_new()),
-+	  enc_ctx_ocb_dec(EVP_CIPHER_CTX_new()), dec_ctx_ocb_dec(EVP_CIPHER_CTX_new()) {
- 	for (int i = 0; i < 0x100; i++)
- 		decrypt_history[i] = 0;
- 	memset(raw_key, 0, AES_KEY_SIZE_BYTES);
-@@ -39,8 +41,10 @@ CryptStateOCB2::CryptStateOCB2() : CryptState(), enc_ctx(EVP_CIPHER_CTX_new()),
- }
- 
- CryptStateOCB2::~CryptStateOCB2() noexcept {
--	EVP_CIPHER_CTX_free(enc_ctx);
--	EVP_CIPHER_CTX_free(dec_ctx);
-+	EVP_CIPHER_CTX_free(enc_ctx_ocb_enc);
-+	EVP_CIPHER_CTX_free(dec_ctx_ocb_enc);
-+	EVP_CIPHER_CTX_free(enc_ctx_ocb_dec);
-+	EVP_CIPHER_CTX_free(dec_ctx_ocb_dec);
- }
- 
- bool CryptStateOCB2::isValid() const {
-@@ -257,25 +261,28 @@ static void inline ZERO(keyblock &block) {
- 		block[i] = 0;
- }
- 
--#define AESencrypt(src, dst, key)                                                                 \
--	{                                                                                             \
--		int outlen = 0;                                                                           \
--		EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key, NULL);                          \
--		EVP_CIPHER_CTX_set_padding(enc_ctx, 0);                                                   \
--		EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char * >(dst), &outlen,             \
--						  reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE);        \
--		EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
-+#define AESencrypt_ctx(src, dst, key, enc_ctx)                                                      \
-+	{                                                                                               \
-+		int outlen = 0;                                                                             \
-+		EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key, NULL);                            \
-+		EVP_CIPHER_CTX_set_padding(enc_ctx, 0);                                                     \
-+		EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char * >(dst), &outlen,               \
-+						  reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE);          \
-+		EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >((dst) + outlen), &outlen); \
- 	}
--#define AESdecrypt(src, dst, key)                                                                 \
--	{                                                                                             \
--		int outlen = 0;                                                                           \
--		EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL);                          \
--		EVP_CIPHER_CTX_set_padding(dec_ctx, 0);                                                   \
--		EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen,             \
--						  reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE);        \
--		EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
-+#define AESdecrypt_ctx(src, dst, key, dec_ctx)                                                      \
-+	{                                                                                               \
-+		int outlen = 0;                                                                             \
-+		EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL);                            \
-+		EVP_CIPHER_CTX_set_padding(dec_ctx, 0);                                                     \
-+		EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen,               \
-+						  reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE);          \
-+		EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >((dst) + outlen), &outlen); \
- 	}
- 
-+#define AESencrypt(src, dst, key) AESencrypt_ctx(src, dst, key, enc_ctx_ocb_enc)
-+#define AESdecrypt(src, dst, key) AESdecrypt_ctx(src, dst, key, dec_ctx_ocb_enc)
-+
- bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encrypted, unsigned int len,
- 								 const unsigned char *nonce, unsigned char *tag, bool modifyPlainOnXEXStarAttack) {
- 	keyblock checksum, delta, tmp, pad;
-@@ -345,6 +352,12 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
- 	return success;
- }
- 
-+#undef AESencrypt
-+#undef AESdecrypt
-+
-+#define AESencrypt(src, dst, key) AESencrypt_ctx(src, dst, key, enc_ctx_ocb_dec)
-+#define AESdecrypt(src, dst, key) AESdecrypt_ctx(src, dst, key, dec_ctx_ocb_dec)
-+
- bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *plain, unsigned int len,
- 								 const unsigned char *nonce, unsigned char *tag) {
- 	keyblock checksum, delta, tmp, pad;
-@@ -392,9 +405,9 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
- 	return success;
- }
- 
-+#undef AESencrypt
-+#undef AESdecrypt
- #undef BLOCKSIZE
- #undef SHIFTBITS
- #undef SWAPPED
- #undef HIGHBIT
--#undef AESencrypt
--#undef AESdecrypt
-diff --git a/src/crypto/CryptStateOCB2.h b/src/crypto/CryptStateOCB2.h
-index cc3f1c0bc..0fd3000ad 100644
---- a/src/crypto/CryptStateOCB2.h
-+++ b/src/crypto/CryptStateOCB2.h
-@@ -44,8 +44,10 @@ private:
- 	unsigned char decrypt_iv[AES_BLOCK_SIZE];
- 	unsigned char decrypt_history[0x100];
- 
--	EVP_CIPHER_CTX *enc_ctx;
--	EVP_CIPHER_CTX *dec_ctx;
-+	EVP_CIPHER_CTX *enc_ctx_ocb_enc;
-+	EVP_CIPHER_CTX *dec_ctx_ocb_enc;
-+	EVP_CIPHER_CTX *enc_ctx_ocb_dec;
-+	EVP_CIPHER_CTX *dec_ctx_ocb_dec;
- };
- 
- 
diff --git a/net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch b/net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
deleted file mode 100644
index 624a8594d995..000000000000
--- a/net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/mumble-voip/mumble/commit/36398fb3b293fc889bbc38df29665359f5c2a0ca
-
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Sun, 27 Feb 2022 10:59:57 +0000
-Subject: [PATCH] BUILD(positional-audio): Fix missing <memory> include
-
-Without the change the build fails on upcoming gcc-12 as:
-
-    /build/mumble/plugins/gtav/gtav.cpp:13:13:
-      error: 'unique_ptr' in namespace 'std' does not name a template type
-       13 | static std::unique_ptr< Game > game;
-          |             ^~~~~~~~~~
-    /build/mumble/plugins/gtav/gtav.cpp:12:1:
-      note: 'std::unique_ptr' is defined in header '<memory>';
-        did you forget to '#include <memory>'?
-       11 | #include <cstring>
-      +++ |+#include <memory>
-       12 |
---- a/plugins/gtav/gtav.cpp
-+++ b/plugins/gtav/gtav.cpp
-@@ -9,6 +9,7 @@
- #include "mumble_positional_audio_utils.h"
- 
- #include <cstring>
-+#include <memory>
- 
- static std::unique_ptr< Game > game;
- 
diff --git a/net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch b/net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch
deleted file mode 100644
index d1b4dee11d51..000000000000
--- a/net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/842984
-https://github.com/mumble-voip/mumble/commit/fefdd79ebcd53a3035967789d004938ee39e2030
-
-Fix underlinking against Poco.
---- a/src/mumble/CMakeLists.txt
-+++ b/src/mumble/CMakeLists.txt
-@@ -383,11 +383,16 @@ target_include_directories(mumble
- 		"${PLUGINS_DIR}"
- )
- 
--find_pkg(Poco COMPONENTS Zip)
-+find_pkg(Poco
-+	COMPONENTS
-+		XML
-+		Zip
-+)
- 
- if(TARGET Poco::Zip)
- 	target_link_libraries(mumble
- 		PRIVATE
-+			Poco::XML
- 			Poco::Zip
- 	)
- else()