diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-02-04 09:15:00 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-02-04 09:15:00 +0300 |
| commit | 4628225a5d8c879dd3b4c6e9a505c3bb97d6b440 (patch) | |
| tree | 04676234031ec848833f4aa38fd025e18b8a44ed | |
| parent | 611aaaa36c2a47c0617ec92590e5b122eef44000 (diff) | |
spice-gtk: libressl build fixed by upstream
| -rw-r--r-- | net-misc/spice-gtk/files/libressl.patch | 39 | ||||
| -rw-r--r-- | net-misc/spice-gtk/spice-gtk-scm.ebuild | 6 |
2 files changed, 3 insertions, 42 deletions
diff --git a/net-misc/spice-gtk/files/libressl.patch b/net-misc/spice-gtk/files/libressl.patch deleted file mode 100644 index c42bbcd..0000000 --- a/net-misc/spice-gtk/files/libressl.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/spice-common/common/ssl_verify.c b/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/src/bio-gio.c b/src/bio-gio.c -index 9358fae..15f73ff 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 21f868d..74648d9 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/spice-gtk-scm.ebuild b/net-misc/spice-gtk/spice-gtk-scm.ebuild index a6a681e..48bdf7a 100644 --- a/net-misc/spice-gtk/spice-gtk-scm.ebuild +++ b/net-misc/spice-gtk/spice-gtk-scm.ebuild @@ -79,9 +79,9 @@ DEPEND="${RDEPEND} # dev-lang/vala:0.14 # dev-lang/perl -PATCHES=( - "${FILESDIR}/libressl.patch" -) +#PATCHES=( +# "${FILESDIR}/libressl.patch" +#) src_prepare() { default |