| 1 |
commit: 1c7a9d147b1b195f8161a04d757e73d3ed5b94e2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 29 19:19:31 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 30 23:27:12 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7a9d14 |
| 7 |
|
| 8 |
x11-misc/qterm: drop obsolete LibreSSL patch |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
x11-misc/qterm/files/qterm-libressl.patch | 60 ------------------------------- |
| 13 |
x11-misc/qterm/qterm-0.7.3.ebuild | 1 - |
| 14 |
2 files changed, 61 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-misc/qterm/files/qterm-libressl.patch b/x11-misc/qterm/files/qterm-libressl.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index d0e0ae1f9cb..00000000000 |
| 19 |
--- a/x11-misc/qterm/files/qterm-libressl.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,60 +0,0 @@ |
| 22 |
---- a/src/ssh/libcrypto-compat.c |
| 23 |
-+++ b/src/ssh/libcrypto-compat.c |
| 24 |
-@@ -8,7 +8,7 @@ |
| 25 |
- */ |
| 26 |
- |
| 27 |
- #include "libcrypto-compat.h" |
| 28 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 29 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 30 |
- #include <string.h> |
| 31 |
- #include <openssl/engine.h> |
| 32 |
- |
| 33 |
---- a/src/ssh/libcrypto-compat.h |
| 34 |
-+++ b/src/ssh/libcrypto-compat.h |
| 35 |
-@@ -9,7 +9,7 @@ |
| 36 |
- #include <openssl/evp.h> |
| 37 |
- #include <openssl/hmac.h> |
| 38 |
- |
| 39 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 40 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 41 |
- |
| 42 |
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d); |
| 43 |
- int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q); |
| 44 |
---- a/src/ssh/socket.cpp |
| 45 |
-+++ b/src/ssh/socket.cpp |
| 46 |
-@@ -36,7 +36,7 @@ |
| 47 |
- SSH2SocketPriv::SSH2SocketPriv(SocketPrivate * plainSocket, QByteArray & banner, QObject * parent) |
| 48 |
- : SSHSocketPriv(parent), m_banner(banner), m_status(Init), m_sessionID(), m_channelList() |
| 49 |
- { |
| 50 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 51 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 52 |
- OpenSSL_add_all_ciphers(); |
| 53 |
- #endif |
| 54 |
- m_sessionID = NULL; |
| 55 |
-@@ -56,7 +56,7 @@ |
| 56 |
- |
| 57 |
- SSH2SocketPriv::~SSH2SocketPriv() |
| 58 |
- { |
| 59 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 60 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 61 |
- EVP_cleanup(); |
| 62 |
- #endif |
| 63 |
- } |
| 64 |
-@@ -133,7 +133,7 @@ |
| 65 |
- #ifdef SSH_DEBUG |
| 66 |
- qDebug() << "init ssh1 session"; |
| 67 |
- #endif |
| 68 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 69 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 70 |
- OpenSSL_add_all_ciphers(); |
| 71 |
- #endif |
| 72 |
- m_inPacket = new SSH1InBuffer(plainSocket, this); |
| 73 |
-@@ -148,7 +148,7 @@ |
| 74 |
- |
| 75 |
- SSH1SocketPriv::~SSH1SocketPriv() |
| 76 |
- { |
| 77 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 78 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 79 |
- EVP_cleanup(); |
| 80 |
- #endif |
| 81 |
- } |
| 82 |
|
| 83 |
diff --git a/x11-misc/qterm/qterm-0.7.3.ebuild b/x11-misc/qterm/qterm-0.7.3.ebuild |
| 84 |
index 5e1d0e49b0a..6b63700224d 100644 |
| 85 |
--- a/x11-misc/qterm/qterm-0.7.3.ebuild |
| 86 |
+++ b/x11-misc/qterm/qterm-0.7.3.ebuild |
| 87 |
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND} |
| 88 |
dev-qt/qthelp:5 |
| 89 |
x11-base/xorg-proto" |
| 90 |
|
| 91 |
-PATCHES=( "${FILESDIR}"/${PN}-libressl.patch ) |
| 92 |
DOCS=( README.rst RELEASE_NOTES TODO doc/script.txt ) |
| 93 |
|
| 94 |
src_prepare() { |
Archives