gentoo resync : 25.04.2020

3 files changed, 0 insertions, 51 deletions

diff --git a/app-emulation/spice/files/spice-0.14.0-fix-flexible-array-buffer-overflow.patch b/app-emulation/spice/files/spice-0.14.0-fix-flexible-array-buffer-overflow.patch
deleted file mode 100644
index a05bbb7545aa..000000000000
--- a/app-emulation/spice/files/spice-0.14.0-fix-flexible-array-buffer-overflow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/spice-common/python_modules/demarshal.py b/spice-common/python_modules/demarshal.py
-index 1ea131d..7172762 100644
---- a/spice-common/python_modules/demarshal.py
-+++ b/spice-common/python_modules/demarshal.py
-@@ -318,6 +318,7 @@ def write_validate_array_item(writer, container, item, scope, parent_scope, star
-         writer.assign(nelements, array.size)
-     elif array.is_remaining_length():
-         if element_type.is_fixed_nw_size():
-+            writer.error_check("%s > message_end" % item.get_position())
-             if element_type.get_fixed_nw_size() == 1:
-                 writer.assign(nelements, "message_end - %s" % item.get_position())
-             else:
diff --git a/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch b/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch
deleted file mode 100644
index 1dfce9480e9c..000000000000
--- a/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/spice-common/common/ssl_verify.c b/spice-common/common/ssl_verify.c
-index a9ed650..27aa5d3 100644
---- a/spice-common/common/ssl_verify.c
-+++ b/spice-common/common/ssl_verify.c
-@@ -33,7 +33,7 @@
- #include <string.h>
- #include <gio/gio.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
- {
-     return M_ASN1_STRING_data(asn1);
diff --git a/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch b/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch
deleted file mode 100644
index c1c5a1c04ba1..000000000000
--- a/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- spice-0.13.90-orig/server/reds.c	2017-07-27 01:04:10.000000000 +1000
-+++ spice-0.13.90/server/reds.c	2017-10-18 21:42:12.054934199 +1100
-@@ -34,6 +34,8 @@
- #include <ctype.h>
- 
- #include <openssl/err.h>
-+#include <openssl/bn.h>
-+#include <openssl/rsa.h>
- 
- #if HAVE_SASL
- #include <sasl/sasl.h>
-@@ -2795,9 +2797,12 @@
- 
- static gpointer openssl_global_init(gpointer arg)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined (LIBRESSL_VERSION_NUMBER)
-+    OPENSSL_init_ssl(0, NULL);
-+#else
-     SSL_library_init();
-     SSL_load_error_strings();
--
-+#endif
-     openssl_thread_setup();
- 
-     return NULL;
-