[gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/, net-misc/rdesktop/files/

["Sam James" <sam@gentoo.org>]

commit:     05a6a738e36a6ca89865fd8371b58b2cc0cfa3cf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 17:36:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  1 18:06:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a6a738

net-misc/rdesktop: cleanup obsolete LibreSSL patches

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch | 16 ----------------
 net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild            |  1 -
 net-misc/rdesktop/rdesktop-1.8.6.ebuild               |  1 -
 3 files changed, 18 deletions(-)

diff --git a/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch b/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch
deleted file mode 100644
index b56cbfc3053..00000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/ssl.c b/ssl.c
-index 07d7aa5..45df34f 100644
---- a/ssl.c
-+++ b/ssl.c
-@@ -225,7 +225,7 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len,
- 	BIGNUM *e = NULL;
- 	BIGNUM *n = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L  || defined(LIBRESSL_VERSION_NUMBER))
- 	e = rkey->e;
- 	n = rkey->n;
- #else
--- 
-2.20.1
-

diff --git a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
index 846fe239b10..aa98e027770 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
@@ -37,7 +37,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
 	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
 	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
-	"${FILESDIR}"/${PN}-1.8.4-libressl.patch
 	"${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch
 	"${FILESDIR}"/${P}-sec_decrypt.patch
 )

diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
index 1c7e7ed745b..b81e1b57614 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
@@ -37,7 +37,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
 	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
 	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
-	"${FILESDIR}"/${PN}-1.8.4-libressl.patch
 	"${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch
 )