gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

x11-misc/qterm: drop obsolete LibreSSL patch

Browse Source 
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-04-29 20:19:31 +01:00
parent 3456acfe2a
commit 1c7a9d147b
2 changed files with 0 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
x11-misc/qterm/files/qterm-libressl.patch
View File

@@ -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
}

1
x11-misc/qterm/qterm-0.7.3.ebuild
View File

@@ -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() {