summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori Hattori <hattya@gentoo.org>2018-08-18 11:04:25 +0900
committerAkinori Hattori <hattya@gentoo.org>2018-08-18 11:04:25 +0900
commit3996b4a6d01bf9f5025bbeaf77c382c1f8b6be06 (patch)
tree4f87342ddc7431a0fa5f8bcc13d2875497a2e602 /x11-misc/qterm
parentx11-misc/qterm: fix build with Qt 5.11 (diff)
downloadgentoo-3996b4a6d01bf9f5025bbeaf77c382c1f8b6be06.tar.gz
gentoo-3996b4a6d01bf9f5025bbeaf77c382c1f8b6be06.tar.bz2
gentoo-3996b4a6d01bf9f5025bbeaf77c382c1f8b6be06.zip
x11-misc/qterm: fix build with libressl
Closes: https://bugs.gentoo.org/645390 Package-Manager: Portage-2.3.40, Repoman-2.3.9
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.1.ebuild5
2 files changed, 64 insertions, 1 deletions
diff --git a/x11-misc/qterm/files/qterm-libressl.patch b/x11-misc/qterm/files/qterm-libressl.patch
new file mode 100644
index 00000000000..d0e0ae1f9cb
--- /dev/null
+++ b/x11-misc/qterm/files/qterm-libressl.patch
@@ -0,0 +1,60 @@
+--- 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.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild
index daf1248d0cb..d1116333ae8 100644
--- a/x11-misc/qterm/qterm-0.7.1.ebuild
+++ b/x11-misc/qterm/qterm-0.7.1.ebuild
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
dev-qt/qthelp:5
x11-base/xorg-proto"
-PATCHES=( "${FILESDIR}"/${P}-headers.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-libressl.patch
+ "${FILESDIR}"/${P}-headers.patch
+)
DOCS=( README.rst RELEASE_NOTES TODO )
src_prepare() {