diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2018-12-04 12:30:40 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2018-12-04 12:30:40 -0500 |
| commit | f71c4d0d7d8b4561bdae56c388a0676f6fca944b (patch) | |
| tree | 97c7b7c5a4186bf81be8823446c5417902c1cc98 /net-misc | |
| parent | mate-extra/mate-power-manager: Fix invalid pkg ref in metadata.xml (diff) | |
| download | gentoo-f71c4d0d7d8b4561bdae56c388a0676f6fca944b.tar.gz gentoo-f71c4d0d7d8b4561bdae56c388a0676f6fca944b.tar.bz2 gentoo-f71c4d0d7d8b4561bdae56c388a0676f6fca944b.zip | |
net-misc/freerdp: fix build with libressl
Closes: https://bugs.gentoo.org/672094
Package-Manager: Portage-2.3.51_p14, Repoman-2.3.12_p5
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/freerdp/files/2.0.0-rc4-libressl.patch | 47 | ||||
| -rw-r--r-- | net-misc/freerdp/freerdp-2.0.0_rc4.ebuild | 4 |
2 files changed, 51 insertions, 0 deletions
diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch new file mode 100644 index 000000000000..f666e0d4d671 --- /dev/null +++ b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch @@ -0,0 +1,47 @@ +From 649f49fa61ca98a05b26c3b2a26a1c30ca24ea26 Mon Sep 17 00:00:00 2001 +From: Armin Novak <armin.novak@thincast.com> +Date: Thu, 22 Nov 2018 09:23:46 +0100 +Subject: [PATCH] Fix #5049: LibreSSL does not have SSL_CTX_set_security_level + +--- + libfreerdp/crypto/tls.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c +index 20fde415d8..76f51701fe 100644 +--- a/libfreerdp/crypto/tls.c ++++ b/libfreerdp/crypto/tls.c +@@ -656,7 +656,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method, + #endif + + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L + SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel); + #endif + +From effa8b8562d5e4b017570815c7e4d8faa0dd9a9e Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Thu, 22 Nov 2018 19:10:05 +0100 +Subject: [PATCH] Fix #5049: Libressl declares OPENSSL_VERSION_NUMBER too high + +Need to check specifically for LIBRESSL_VERSION_NUMBER as they +set the version higher than OpenSSL 1.1 but without API support. +--- + libfreerdp/crypto/tls.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c +index 76f51701fe..ded41f127e 100644 +--- a/libfreerdp/crypto/tls.c ++++ b/libfreerdp/crypto/tls.c +@@ -655,8 +655,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method, + SSL_CTX_set_max_proto_version(tls->ctx, 0); /* highest supported version by library */ + #endif + +- +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel); + #endif + diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild index 69625f21c2aa..b0b9ea11319d 100644 --- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild +++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild @@ -87,6 +87,10 @@ DEPEND="${RDEPEND} ) ) ) " +PATCHES=( + "${FILESDIR}"/2.0.0-rc4-libressl.patch +) + src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test) |