| 1 |
commit: 05a6a738e36a6ca89865fd8371b58b2cc0cfa3cf |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 1 17:36:26 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 1 18:06:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a6a738 |
| 7 |
|
| 8 |
net-misc/rdesktop: cleanup obsolete LibreSSL patches |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch | 16 ---------------- |
| 13 |
net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild | 1 - |
| 14 |
net-misc/rdesktop/rdesktop-1.8.6.ebuild | 1 - |
| 15 |
3 files changed, 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch b/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index b56cbfc3053..00000000000 |
| 20 |
--- a/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,16 +0,0 @@ |
| 23 |
-diff --git a/ssl.c b/ssl.c |
| 24 |
-index 07d7aa5..45df34f 100644 |
| 25 |
---- a/ssl.c |
| 26 |
-+++ b/ssl.c |
| 27 |
-@@ -225,7 +225,7 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, |
| 28 |
- BIGNUM *e = NULL; |
| 29 |
- BIGNUM *n = NULL; |
| 30 |
- |
| 31 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 32 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) |
| 33 |
- e = rkey->e; |
| 34 |
- n = rkey->n; |
| 35 |
- #else |
| 36 |
--- |
| 37 |
-2.20.1 |
| 38 |
- |
| 39 |
|
| 40 |
diff --git a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild |
| 41 |
index 846fe239b10..aa98e027770 100644 |
| 42 |
--- a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild |
| 43 |
+++ b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild |
| 44 |
@@ -37,7 +37,6 @@ PATCHES=( |
| 45 |
"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch |
| 46 |
"${FILESDIR}"/${PN}-1.8.3-no_strip.patch |
| 47 |
"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch |
| 48 |
- "${FILESDIR}"/${PN}-1.8.4-libressl.patch |
| 49 |
"${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch |
| 50 |
"${FILESDIR}"/${P}-sec_decrypt.patch |
| 51 |
) |
| 52 |
|
| 53 |
diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild |
| 54 |
index 1c7e7ed745b..b81e1b57614 100644 |
| 55 |
--- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild |
| 56 |
+++ b/net-misc/rdesktop/rdesktop-1.8.6.ebuild |
| 57 |
@@ -37,7 +37,6 @@ PATCHES=( |
| 58 |
"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch |
| 59 |
"${FILESDIR}"/${PN}-1.8.3-no_strip.patch |
| 60 |
"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch |
| 61 |
- "${FILESDIR}"/${PN}-1.8.4-libressl.patch |
| 62 |
"${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch |
| 63 |
) |
Archives