diff options
Diffstat (limited to 'x11-misc/qterm')
| -rw-r--r-- | x11-misc/qterm/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/qterm/files/qterm-libressl.patch | 60 | ||||
| -rw-r--r-- | x11-misc/qterm/qterm-0.7.3.ebuild | 5 |
3 files changed, 2 insertions, 66 deletions
diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest index 8a7a2ef2ddb3..791cea41b81d 100644 --- a/x11-misc/qterm/Manifest +++ b/x11-misc/qterm/Manifest @@ -1,4 +1,3 @@ -AUX qterm-libressl.patch 1838 BLAKE2B 806757d7a8d63cbdffd2b6eb99bcb9333cdbcbe8e74ea5f5d73d53e1fca0fdc6c8aa25337f144aca0398606e771024fd52d96eb320a7d0f8f85c114850a29557 SHA512 927c2753d205c1d047f2c289ea170da65d9db1eb5713334a947e1aebe0a3c67e630d06a2607b0656e286e27813dca781e0e6f8215dfa483fc804b4dfdb19c171 DIST qterm-0.7.3.tar.gz 901423 BLAKE2B e3f799946bfff4531e77d04fe535d53ef92093d1435aca32b06fa43c444c55798ab1c8408847dde81d1d24b5fda0c4a4f58fb563369f2c4669ba43929695cbd8 SHA512 93fdd24d79a81853654a4702ff55b2fad80c1cc734ec3230a297b3a2613cf24d41f4c645eadc5f34b6025f548e7c8cd5d291d4c29fc919f8966eeb8b44f5c046 -EBUILD qterm-0.7.3.ebuild 1232 BLAKE2B a6a50c25de78620c24210afe6d5d5f7daae19e0381fe7f2c35feb7c01520b3ab9d071642a4c5962fe4a46bb7296616cfadd989b5774236e21905a74140eba3d9 SHA512 43db3c5df8b8205c318c60f89480fd89b3a6d52ac8e749c0daf160da81bec4f096497cd4c80164fb5c1218c80230730037464ae387652f1397d63273e7fcff25 +EBUILD qterm-0.7.3.ebuild 1119 BLAKE2B c7f6a58a67a1fe5d845a3188a6046aa9fb9966cf968bdee274970870dca617b044fe72bbaf482eb4917815bc7b8ed28c152fac365bb14a737b0deca8a2729562 SHA512 181e47bfb5e2c6784bf8d32fb57d247d84d2c8aad0158b0fd856c6033ab1f0be74b02c8e1c2ac197767c71ea4ed528b96108d549f5d876f3bc205cf352730ae0 MISC metadata.xml 293 BLAKE2B 6002fd21add821174cd04d8dc6ec845ef5c157b471c793a95677a8caa7a5cb29dd264a04fd2567b9b0e1db1c5e7be231f1687de178da32c978c662c32d08e3d2 SHA512 173faeb4d6ac45faa8f9997a26d1fe2fc915e5ec9174055103560dd154ee772fc930ad901c3b4288fbd69b88914955a018d0526bc8fbdcd197a8597157ab308a 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 981295849dc6..6b63700224d9 100644 --- a/x11-misc/qterm/qterm-0.7.3.ebuild +++ b/x11-misc/qterm/qterm-0.7.3.ebuild @@ -12,7 +12,6 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="libressl" RDEPEND="dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -23,14 +22,12 @@ RDEPEND="dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-libs/libX11 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= )" + dev-libs/openssl:0=" DEPEND="${RDEPEND} dev-qt/linguist-tools:5 dev-qt/qthelp:5 x11-base/xorg-proto" -PATCHES=( "${FILESDIR}"/${PN}-libressl.patch ) DOCS=( README.rst RELEASE_NOTES TODO doc/script.txt ) src_prepare() { |