commit: 896edbbf9188b6770754c75abe2256a803c4fc55 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sat Jun 4 04:27:18 2022 +0000 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> CommitDate: Sun Jun 5 01:45:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=896edbbf
app-crypt/qca: Remove old versions Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/libressl/pull/416 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> app-crypt/qca/Manifest | 2 - app-crypt/qca/files/qca-2.2.0-libressl.patch | 116 --------------------------- app-crypt/qca/files/qca-2.3.0-libressl.patch | 68 ---------------- app-crypt/qca/files/qca-2.3.1-libressl.patch | 104 ------------------------ app-crypt/qca/qca-2.3.0.ebuild | 87 -------------------- app-crypt/qca/qca-2.3.1.ebuild | 87 -------------------- 6 files changed, 464 deletions(-) diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest index a5a57d8..aad1181 100644 --- a/app-crypt/qca/Manifest +++ b/app-crypt/qca/Manifest @@ -1,3 +1 @@ -DIST qca-2.3.0.tar.xz 729504 BLAKE2B 71cf9dfae00066c14e1055da1fa1a8e1210f538b1addfde1b99a9b26b1e8f7dd61e289d0f505b5ec04d5f4745216d4fd0f8be8f8de9e9cbf74123907ba703d0e SHA512 ca9251868e073834562fa62ffc64b3e7817c9ddadc6bc3fb99cf8b5c8d859969562170a98874be9590c617b2dd8e5590d2c83792554f54bb880c677902db22fe -DIST qca-2.3.1.tar.xz 725984 BLAKE2B a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052 SHA512 092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021 DIST qca-2.3.4.tar.xz 737072 BLAKE2B 64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703 SHA512 af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8 diff --git a/app-crypt/qca/files/qca-2.2.0-libressl.patch b/app-crypt/qca/files/qca-2.2.0-libressl.patch deleted file mode 100644 index 537dd11..0000000 --- a/app-crypt/qca/files/qca-2.2.0-libressl.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 3cfe5c3a7cfbf0b7351dedb64785b837667fc0b1 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <[email protected]> -Date: Wed, 2 Oct 2019 17:28:44 +0300 -Subject: [PATCH] Fix build with LibreSSL - -Provide RSA_meth_set_{sign,verify} for LibreSSL. -Do not redefine M_ASN1_IA5STRING_new and RSA_F_RSA_EAY_PRIVATE_DECRYPT. -Disable HKDF. - -Upstream-Status: Submitted [https://phabricator.kde.org/D20259] -Signed-off-by: Stefan Strogin <[email protected]> ---- - plugins/qca-ossl/ossl110-compat.h | 35 +++++++++++++++++-------------- - plugins/qca-ossl/qca-ossl.cpp | 10 ++++----- - 2 files changed, 24 insertions(+), 21 deletions(-) - -diff --git a/plugins/qca-ossl/ossl110-compat.h b/plugins/qca-ossl/ossl110-compat.h -index b320707..0a8b49b 100644 ---- a/plugins/qca-ossl/ossl110-compat.h -+++ b/plugins/qca-ossl/ossl110-compat.h -@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int (*priv_dec) (int flen, con - return 1; - } - --static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m, -- unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa)) --{ -- if (!meth) return 0; -- meth->rsa_sign = sign; -- return 1; --} -- --static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m, -- unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa)) --{ -- if (!meth) return 0; -- meth->rsa_verify = verify; -- return 1; --} -- - static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa)) - { - if (!meth) return 0; -@@ -272,4 +256,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx) - - #endif // OPENSSL_VERSION_NUMBER < 0x10100000L - -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000000fL) -+static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m, -+ unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa)) -+{ -+ if (!meth) return 0; -+ meth->rsa_sign = sign; -+ return 1; -+} -+ -+static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m, -+ unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa)) -+{ -+ if (!meth) return 0; -+ meth->rsa_verify = verify; -+ return 1; -+} -+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) -+ - #endif // OSSL110COMPAT_H -diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp -index 11ecdc9..75c48fc 100644 ---- a/plugins/qca-ossl/qca-ossl.cpp -+++ b/plugins/qca-ossl/qca-ossl.cpp -@@ -62,12 +62,12 @@ - #endif - - // OpenSSL 1.1.0 compatibility macros --#ifdef OSSL_110 -+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER) - #define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new() - #define RSA_F_RSA_EAY_PRIVATE_DECRYPT RSA_F_RSA_OSSL_PRIVATE_DECRYPT - #endif - --#ifdef OSSL_110 -+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER) - #include <openssl/kdf.h> - #endif - -@@ -1280,7 +1280,7 @@ public: - protected: - }; - --#ifdef OSSL_110 -+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER) - class opensslHkdfContext : public HKDFContext - { - public: -@@ -7416,7 +7416,7 @@ public: - #endif - list += "pbkdf1(sha1)"; - list += "pbkdf2(sha1)"; --#ifdef OSSL_110 -+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER) - list += "hkdf(sha256)"; - #endif - list += "pkey"; -@@ -7489,7 +7489,7 @@ public: - #endif - else if ( type == "pbkdf2(sha1)" ) - return new opensslPbkdf2Context( this, type ); --#ifdef OSSL_110 -+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER) - else if ( type == "hkdf(sha256)" ) - return new opensslHkdfContext( this, type ); - #endif --- -2.23.0 - diff --git a/app-crypt/qca/files/qca-2.3.0-libressl.patch b/app-crypt/qca/files/qca-2.3.0-libressl.patch deleted file mode 100644 index c06ba60..0000000 --- a/app-crypt/qca/files/qca-2.3.0-libressl.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c3001c187f91a6eccfcb75828876f03f5310d283 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <[email protected]> -Date: Wed, 26 Feb 2020 04:41:28 +0200 -Subject: [PATCH] Fix build with LibreSSL - -Signed-off-by: Stefan Strogin <[email protected]> ---- - plugins/qca-ossl/qca-ossl.cpp | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp -index 559dc3f6..5ba9f1e7 100644 ---- a/plugins/qca-ossl/qca-ossl.cpp -+++ b/plugins/qca-ossl/qca-ossl.cpp -@@ -41,7 +41,13 @@ - #include <openssl/pkcs12.h> - #include <openssl/ssl.h> - -+#ifndef RSA_F_RSA_OSSL_PRIVATE_DECRYPT -+#define RSA_F_RSA_OSSL_PRIVATE_DECRYPT RSA_F_RSA_EAY_PRIVATE_DECRYPT -+#endif -+ -+#ifndef LIBRESSL_VERSION_NUMBER - #include <openssl/kdf.h> -+#endif - - using namespace QCA; - -@@ -1255,6 +1261,7 @@ public: - protected: - }; - -+#ifndef LIBRESSL_VERSION_NUMBER - class opensslHkdfContext : public HKDFContext - { - Q_OBJECT -@@ -1284,6 +1291,7 @@ public: - return out; - } - }; -+#endif // LIBRESSL_VERSION_NUMBER - - class opensslHMACContext : public MACContext - { -@@ -7268,7 +7276,9 @@ public: - #endif - list += QStringLiteral("pbkdf1(sha1)"); - list += QStringLiteral("pbkdf2(sha1)"); -+#ifndef LIBRESSL_VERSION_NUMBER - list += QStringLiteral("hkdf(sha256)"); -+#endif - list += QStringLiteral("pkey"); - list += QStringLiteral("dlgroup"); - list += QStringLiteral("rsa"); -@@ -7337,8 +7347,10 @@ public: - #endif - else if ( type == QLatin1String("pbkdf2(sha1)") ) - return new opensslPbkdf2Context( this, type ); -+#ifndef LIBRESSL_VERSION_NUMBER - else if ( type == QLatin1String("hkdf(sha256)") ) - return new opensslHkdfContext( this, type ); -+#endif - else if ( type == QLatin1String("hmac(md5)") ) - return new opensslHMACContext( EVP_md5(), this, type ); - else if ( type == QLatin1String("hmac(sha1)") ) --- -2.25.1 - diff --git a/app-crypt/qca/files/qca-2.3.1-libressl.patch b/app-crypt/qca/files/qca-2.3.1-libressl.patch deleted file mode 100644 index 0424378..0000000 --- a/app-crypt/qca/files/qca-2.3.1-libressl.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 56f60bc221d88e0753494c3e7ee320dc0f9de030 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <[email protected]> -Date: Wed, 26 Feb 2020 04:41:28 +0200 -Subject: [PATCH] Fix build with LibreSSL - -Signed-off-by: Stefan Strogin <[email protected]> ---- - plugins/qca-ossl/qca-ossl.cpp | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp -index ee872d72..4ee5d7c8 100644 ---- a/plugins/qca-ossl/qca-ossl.cpp -+++ b/plugins/qca-ossl/qca-ossl.cpp -@@ -41,7 +41,13 @@ - #include <openssl/pkcs12.h> - #include <openssl/ssl.h> - -+#ifndef RSA_F_RSA_OSSL_PRIVATE_DECRYPT -+#define RSA_F_RSA_OSSL_PRIVATE_DECRYPT RSA_F_RSA_EAY_PRIVATE_DECRYPT -+#endif -+ -+#ifndef LIBRESSL_VERSION_NUMBER - #include <openssl/kdf.h> -+#endif - - using namespace QCA; - -@@ -1262,6 +1268,7 @@ public: - protected: - }; - -+#ifndef LIBRESSL_VERSION_NUMBER - class opensslHkdfContext : public HKDFContext - { - Q_OBJECT -@@ -1291,6 +1298,7 @@ public: - return out; - } - }; -+#endif // LIBRESSL_VERSION_NUMBER - - class opensslHMACContext : public MACContext - { -@@ -4990,7 +4998,11 @@ public: - case TLS::TLS_v1: - ctx = SSL_CTX_new(TLS_client_method()); - SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION); -+#ifdef TLS1_3_VERSION - SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION); -+#else -+ SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION); -+#endif - break; - case TLS::DTLS_v1: - default: -@@ -5011,7 +5023,11 @@ public: - QStringList cipherList; - for(int i = 0; i < sk_SSL_CIPHER_num(sk); ++i) { - const SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i); -+#ifndef LIBRESSL_VERSION_NUMBER - cipherList += QString::fromLatin1(SSL_CIPHER_standard_name(thisCipher)); -+#else -+ cipherList += QString::fromLatin1(SSL_CIPHER_get_name(thisCipher)); -+#endif - } - sk_SSL_CIPHER_free(sk); - -@@ -5404,7 +5420,11 @@ public: - sessInfo.version = TLS::TLS_v1; - } - -+#ifndef LIBRESSL_VERSION_NUMBER - sessInfo.cipherSuite = QString::fromLatin1(SSL_CIPHER_standard_name(SSL_get_current_cipher(ssl))); -+#else -+ sessInfo.cipherSuite = QString::fromLatin1(SSL_CIPHER_get_name(SSL_get_current_cipher(ssl))); -+#endif - - sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl, &(sessInfo.cipherBits)); - -@@ -6751,7 +6771,9 @@ public: - #endif - list += QStringLiteral("pbkdf1(sha1)"); - list += QStringLiteral("pbkdf2(sha1)"); -+#ifndef LIBRESSL_VERSION_NUMBER - list += QStringLiteral("hkdf(sha256)"); -+#endif - list += QStringLiteral("pkey"); - list += QStringLiteral("dlgroup"); - list += QStringLiteral("rsa"); -@@ -6820,8 +6842,10 @@ public: - #endif - else if ( type == QLatin1String("pbkdf2(sha1)") ) - return new opensslPbkdf2Context( this, type ); -+#ifndef LIBRESSL_VERSION_NUMBER - else if ( type == QLatin1String("hkdf(sha256)") ) - return new opensslHkdfContext( this, type ); -+#endif - else if ( type == QLatin1String("hmac(md5)") ) - return new opensslHMACContext( EVP_md5(), this, type ); - else if ( type == QLatin1String("hmac(sha1)") ) --- -2.27.0 - diff --git a/app-crypt/qca/qca-2.3.0.ebuild b/app-crypt/qca/qca-2.3.0.ebuild deleted file mode 100644 index 049f0e1..0000000 --- a/app-crypt/qca/qca-2.3.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde.org cmake qmake-utils - -DESCRIPTION="Qt Cryptographic Architecture (QCA)" -HOMEPAGE="https://userbase.kde.org/QCA"; -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="2" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - doc? ( app-doc/doxygen ) -" -RDEPEND=" - dev-qt/qtcore:5 - botan? ( dev-libs/botan:= ) - gcrypt? ( dev-libs/libgcrypt:= ) - gpg? ( app-crypt/gnupg ) - nss? ( dev-libs/nss ) - pkcs11? ( - >=dev-libs/openssl-1.1 - dev-libs/pkcs11-helper - ) - sasl? ( dev-libs/cyrus-sasl:2 ) - ssl? ( >=dev-libs/openssl-1.1:0= ) -" -DEPEND="${RDEPEND} - test? ( - dev-qt/qtnetwork:5 - dev-qt/qttest:5 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-disable-pgp-test.patch" - "${FILESDIR}/${P}-libressl.patch" -) - -qca_plugin_use() { - echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") -} - -src_configure() { - local mycmakeargs=( - -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features" - -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)" - $(qca_plugin_use botan) - $(qca_plugin_use gcrypt) - $(qca_plugin_use gpg gnupg) - $(qca_plugin_use logger) - $(qca_plugin_use nss) - $(qca_plugin_use pkcs11) - $(qca_plugin_use sasl cyrus-sasl) - $(qca_plugin_use softstore) - $(qca_plugin_use ssl ossl) - -DBUILD_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_test() { - local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" - cmake_src_test -} - -src_install() { - cmake_src_install - - if use doc; then - pushd "${BUILD_DIR}" >/dev/null || die - doxygen Doxyfile || die - dodoc -r apidocs/html - popd >/dev/null || die - fi - - if use examples; then - dodoc -r "${S}"/examples - fi -} diff --git a/app-crypt/qca/qca-2.3.1.ebuild b/app-crypt/qca/qca-2.3.1.ebuild deleted file mode 100644 index 049f0e1..0000000 --- a/app-crypt/qca/qca-2.3.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde.org cmake qmake-utils - -DESCRIPTION="Qt Cryptographic Architecture (QCA)" -HOMEPAGE="https://userbase.kde.org/QCA"; -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="2" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - doc? ( app-doc/doxygen ) -" -RDEPEND=" - dev-qt/qtcore:5 - botan? ( dev-libs/botan:= ) - gcrypt? ( dev-libs/libgcrypt:= ) - gpg? ( app-crypt/gnupg ) - nss? ( dev-libs/nss ) - pkcs11? ( - >=dev-libs/openssl-1.1 - dev-libs/pkcs11-helper - ) - sasl? ( dev-libs/cyrus-sasl:2 ) - ssl? ( >=dev-libs/openssl-1.1:0= ) -" -DEPEND="${RDEPEND} - test? ( - dev-qt/qtnetwork:5 - dev-qt/qttest:5 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-disable-pgp-test.patch" - "${FILESDIR}/${P}-libressl.patch" -) - -qca_plugin_use() { - echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") -} - -src_configure() { - local mycmakeargs=( - -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features" - -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)" - $(qca_plugin_use botan) - $(qca_plugin_use gcrypt) - $(qca_plugin_use gpg gnupg) - $(qca_plugin_use logger) - $(qca_plugin_use nss) - $(qca_plugin_use pkcs11) - $(qca_plugin_use sasl cyrus-sasl) - $(qca_plugin_use softstore) - $(qca_plugin_use ssl ossl) - -DBUILD_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_test() { - local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" - cmake_src_test -} - -src_install() { - cmake_src_install - - if use doc; then - pushd "${BUILD_DIR}" >/dev/null || die - doxygen Doxyfile || die - dodoc -r apidocs/html - popd >/dev/null || die - fi - - if use examples; then - dodoc -r "${S}"/examples - fi -}
