diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
| commit | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch) | |
| tree | b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /net-misc/spice-gtk/files | |
| parent | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff) | |
gentoo resync : 20.02.2019
Diffstat (limited to 'net-misc/spice-gtk/files')
| -rw-r--r-- | net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch (renamed from net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch) | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch b/net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch index e39efaee2746..6ecea6d11c2e 100644 --- a/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch +++ b/net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch @@ -1,16 +1,21 @@ https://bugs.gentoo.org/631250 https://631250.bugs.gentoo.org/attachment.cgi?id=513720 +https://bugs.gentoo.org/664512 +https://cgit.freedesktop.org/spice/spice-common/commit/?id=8e8476d932d9866d950fe616fe1c10361b75a3a2 +https://cgit.freedesktop.org/spice/spice-gtk/commit/?id=a45e8a56e389e41c891eaa204b16dd89e74e2e69 + 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 @@ +@@ -33,7 +33,8 @@ #include <string.h> #include <gio/gio.h> --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) +-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || \ ++ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) { return M_ASN1_STRING_data(asn1); @@ -18,12 +23,13 @@ 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 @@ +@@ -23,7 +23,8 @@ #include "spice-util.h" #include "bio-gio.h" --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) +-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) static BIO_METHOD one_static_bio; static int BIO_meth_set_read(BIO_METHOD *biom, @@ -31,12 +37,13 @@ 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); +@@ -55,7 +55,8 @@ 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) +-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey) { if (pkey->type != EVP_PKEY_RSA) { |