commit: 4c7718c22531f81ac0e1564921170f760f3c45f7 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Oct 27 09:03:06 2019 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Fri Nov 8 02:42:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c7718c2
net-misc/spice-gtk: remove unused patch Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13462 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../spice-gtk/files/spice-gtk-0.35-libressl.patch | 50 ---------------------- 1 file changed, 50 deletions(-) diff --git a/net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch b/net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch deleted file mode 100644 index 6ecea6d11c2..00000000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch +++ /dev/null @@ -1,50 +0,0 @@ -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,8 @@ - #include <string.h> - #include <gio/gio.h> - --#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); -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,8 @@ - #include "spice-util.h" - #include "bio-gio.h" - --#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, -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,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 || 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) { -
