summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-29 20:19:31 +0100
committerSam James <sam@gentoo.org>2021-05-01 00:27:12 +0100
commit1c7a9d147b1b195f8161a04d757e73d3ed5b94e2 (patch)
tree28f1a5bc2b3293f1134bcc0f93f02da2c28e5adf /x11-misc/qterm
parentmail-client/mutt: remove other LibreSSL references (diff)
downloadgentoo-1c7a9d147b1b195f8161a04d757e73d3ed5b94e2.tar.gz
gentoo-1c7a9d147b1b195f8161a04d757e73d3ed5b94e2.tar.bz2
gentoo-1c7a9d147b1b195f8161a04d757e73d3ed5b94e2.zip
x11-misc/qterm: drop obsolete LibreSSL patch
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-misc/qterm')
-rw-r--r--x11-misc/qterm/files/qterm-libressl.patch60
-rw-r--r--x11-misc/qterm/qterm-0.7.3.ebuild1
2 files changed, 0 insertions, 61 deletions
diff --git a/x11-misc/qterm/files/qterm-libressl.patch b/x11-misc/qterm/files/qterm-libressl.patch
deleted file mode 100644
index d0e0ae1f9cb5..000000000000
--- a/x11-misc/qterm/files/qterm-libressl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/src/ssh/libcrypto-compat.c
-+++ b/src/ssh/libcrypto-compat.c
-@@ -8,7 +8,7 @@
- */
-
- #include "libcrypto-compat.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #include <string.h>
- #include <openssl/engine.h>
-
---- a/src/ssh/libcrypto-compat.h
-+++ b/src/ssh/libcrypto-compat.h
-@@ -9,7 +9,7 @@
- #include <openssl/evp.h>
- #include <openssl/hmac.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
- int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
---- a/src/ssh/socket.cpp
-+++ b/src/ssh/socket.cpp
-@@ -36,7 +36,7 @@
- SSH2SocketPriv::SSH2SocketPriv(SocketPrivate * plainSocket, QByteArray & banner, QObject * parent)
- : SSHSocketPriv(parent), m_banner(banner), m_status(Init), m_sessionID(), m_channelList()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- OpenSSL_add_all_ciphers();
- #endif
- m_sessionID = NULL;
-@@ -56,7 +56,7 @@
-
- SSH2SocketPriv::~SSH2SocketPriv()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_cleanup();
- #endif
- }
-@@ -133,7 +133,7 @@
- #ifdef SSH_DEBUG
- qDebug() << "init ssh1 session";
- #endif
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- OpenSSL_add_all_ciphers();
- #endif
- m_inPacket = new SSH1InBuffer(plainSocket, this);
-@@ -148,7 +148,7 @@
-
- SSH1SocketPriv::~SSH1SocketPriv()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_cleanup();
- #endif
- }
diff --git a/x11-misc/qterm/qterm-0.7.3.ebuild b/x11-misc/qterm/qterm-0.7.3.ebuild
index 5e1d0e49b0af..6b63700224d9 100644
--- a/x11-misc/qterm/qterm-0.7.3.ebuild
+++ b/x11-misc/qterm/qterm-0.7.3.ebuild
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND}
dev-qt/qthelp:5
x11-base/xorg-proto"
-PATCHES=( "${FILESDIR}"/${PN}-libressl.patch )
DOCS=( README.rst RELEASE_NOTES TODO doc/script.txt )
src_prepare() {