gentoo resync : 23.03.2018

2 files changed, 59 insertions, 0 deletions

diff --git a/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch b/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch
new file mode 100644
index 000000000000..e39efaee2746
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/631250
+https://631250.bugs.gentoo.org/attachment.cgi?id=513720
+
+diff --git a/spice-common/common/ssl_verify.c b/spice-common/common/ssl_verify.c
+index a9ed650..821faa9 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/src/bio-gio.c b/src/bio-gio.c
+index 9358fae..30aa73b 100644
+--- a/src/bio-gio.c
++++ b/src/bio-gio.c
+@@ -23,7 +23,7 @@
+ #include "spice-util.h"
+ #include "bio-gio.h"
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static BIO_METHOD one_static_bio;
+ 
+ static int BIO_meth_set_read(BIO_METHOD *biom,
+diff --git a/src/spice-channel.c b/src/spice-channel.c
+index 4c3db9d..9df0203 100644
+--- a/src/spice-channel.c
++++ b/src/spice-channel.c
+@@ -55,7 +55,7 @@ static void spice_channel_reset_capabilities(SpiceChannel *channel);
+ static void spice_channel_send_migration_handshake(SpiceChannel *channel);
+ static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
+ {
+     if (pkey->type != EVP_PKEY_RSA) {
+
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch b/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch
new file mode 100644
index 000000000000..572475d79a44
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch
@@ -0,0 +1,16 @@
+https://617764.bugs.gentoo.org/attachment.cgi?id=522368
+https://bugs.gentoo.org/617764
+
+--- spice-gtk-0.34.orig/src/spice-channel.c	2017-07-12 10:23:31.000000000 +0200
++++ spice-gtk-0.34/src/spice-channel.c	2018-03-04 13:12:14.351051444 +0100
+@@ -392,8 +392,10 @@
+ 
+     g_type_class_add_private(klass, sizeof(SpiceChannelPrivate));
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     SSL_library_init();
+     SSL_load_error_strings();
++#endif
+ }
+ 
+ /* ---------------------------------------------------------------- */