diff options
| author |   Stefan Strogin <stefan.strogin@gmail.com> | 2019-02-16 05:38:17 +0200 |
|---|---|---|
| committer |   Aaron Bauman <bman@gentoo.org> | 2019-02-16 12:59:30 -0500 |
| commit | 0c57f77f684053bbc14049127f8c537874ad61c1 (patch) | |
| tree | 198729dbd4545af5eccfcfd528c98500032e5f6f /net-misc/spice-gtk/files | |
| parent | sys-devel/binutils: update 9999 with patchset 3 (diff) | |
| download | gentoo-0c57f77f684053bbc14049127f8c537874ad61c1.tar.gz gentoo-0c57f77f684053bbc14049127f8c537874ad61c1.tar.bz2 gentoo-0c57f77f684053bbc14049127f8c537874ad61c1.zip | |
net-misc/spice-gtk: fix build for >=libressl-2.7.0
NB: spice-gtk-0.34-libressl.patch was not used anywhere.
Closes: https://bugs.gentoo.org/664512
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11062
Signed-off-by: Aaron Bauman <bman@gentoo.org>
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) { |