[gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/, x11-misc/qterm/files/

[Sam James]

commit:     1c7a9d147b1b195f8161a04d757e73d3ed5b94e2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 19:19:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 23:27:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7a9d14

x11-misc/qterm: drop obsolete LibreSSL patch

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

 x11-misc/qterm/files/qterm-libressl.patch | 60 -------------------------------
 x11-misc/qterm/qterm-0.7.3.ebuild         |  1 -
 2 files changed, 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 d0e0ae1f9cb..00000000000
--- 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 5e1d0e49b0a..6b63700224d 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() {