summaryrefslogtreecommitdiff
path: root/app-emulation/spice/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-02-15 16:58:00 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-02-15 16:58:00 +0000
commit434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch)
treeb72c523c72e764420f835ba9d63d43ffef687dcf /app-emulation/spice/files
parentf78108598211053d41752a83e0345441bb9014ae (diff)
gentoo resync : 15.02.2018
Diffstat (limited to 'app-emulation/spice/files')
-rw-r--r--app-emulation/spice/files/spice-0.14.0-libressl_fix.patch13
-rw-r--r--app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch26
2 files changed, 39 insertions, 0 deletions
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
new file mode 100644
index 000000000000..2f77fa5a0006
--- /dev/null
+++ b/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch
@@ -0,0 +1,13 @@
+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)
+ 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
new file mode 100644
index 000000000000..5854d8788c75
--- /dev/null
+++ b/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch
@@ -0,0 +1,26 @@
+--- 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
++ OPENSSL_init_ssl(0, NULL);
++#else
+ SSL_library_init();
+ SSL_load_error_strings();
+-
++#endif
+ openssl_thread_setup();
+
+ return NULL;
+