commit: e99054b5b5a1545b422ef03f2bf58fec31639ba9 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Fri Jun 9 16:39:00 2017 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Fri Jun 9 16:39:50 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e99054b5
app-crypt/qca: Remove 2.1.1-r1 Package-Manager: Portage-2.3.6, Repoman-2.3.2 app-crypt/qca/Manifest | 1 - app-crypt/qca/files/qca-2.1.0.3-qt55.patch | 26 ----- .../qca/files/qca-2.1.1-libressl-230-sha0.patch | 48 -------- .../qca/files/qca-2.1.1-libressl-230-sslv3.patch | 28 ----- app-crypt/qca/qca-2.1.1-r1.ebuild | 123 --------------------- 5 files changed, 226 deletions(-) diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest index 650ee54cc31..a55185d76d7 100644 --- a/app-crypt/qca/Manifest +++ b/app-crypt/qca/Manifest @@ -1,2 +1 @@ -DIST qca-2.1.1.tar.xz 688460 SHA256 95de3e7910b5f9ec7084169989c9d98bfb527e6a4865fe17269c3b24308be983 SHA512 f077b5a4cc6539e0880f4d0a615bebcf851f634e99c6c355522598204f625e5195e0cbc8a1976593669018e57eff95796c8fef69b1301b42cb18736bc8aa1abf WHIRLPOOL 454751a76f5e59aa09d6cc979bc26a490b23a2e5308f663400f45f38a95e6ad7a34428cffb1a2a82ec6958aa0b4418e0054503a58b43e0c172201cbaa7c669f8 DIST qca-2.1.3.tar.xz 686340 SHA256 003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353 SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a WHIRLPOOL bd004ad0e754850e4349aef72a7bc2449a95850b86bb383d9a60fb7d7c69c7e5e2dcc8e1cc945b647623678484f0bd15c5e125e7e278c2a0964b28b48ee8c8f3 diff --git a/app-crypt/qca/files/qca-2.1.0.3-qt55.patch b/app-crypt/qca/files/qca-2.1.0.3-qt55.patch deleted file mode 100644 index 277c24e0280..00000000000 --- a/app-crypt/qca/files/qca-2.1.0.3-qt55.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7207e6285e932044cd66d49d0dc484666cfb0092 Mon Sep 17 00:00:00 2001 -From: Hrvoje Senjan <[email protected]> -Date: Sat, 17 Jan 2015 20:12:18 +0100 -Subject: [PATCH] Add missing QIODevice include - -Fixes build with Qt 5.5 ---- - include/QtCrypto/qca_basic.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/QtCrypto/qca_basic.h b/include/QtCrypto/qca_basic.h -index 42808c5..e0c6cbb 100644 ---- a/include/QtCrypto/qca_basic.h -+++ b/include/QtCrypto/qca_basic.h -@@ -35,6 +35,8 @@ - - #include "qca_core.h" - -+#include <QIODevice> -+ - // Qt5 comes with QStringLiteral for wrapping string literals, which Qt4 does - // not have. It is needed if the headers are built with QT_NO_CAST_FROM_ASCII. - // Defining it here as QString::fromUtf8 for convenience. --- -2.0.5 - diff --git a/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch b/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch deleted file mode 100644 index 3e112c622a5..00000000000 --- a/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 0dbed8eb38afd1561907a52283091c37e7b85156 -Author: Heiko Becker <[email protected]> -Date: Thu Sep 24 23:05:21 2015 +0200 - - qca-ossl: Fix build without support for SHA-0 - - LibreSSL >= 2.3.0 removed support for SHA-0, so there's no EVP_sha - anymore. - Wikipedia says about SHA-0: "160-bit hash function published in 1993 - under the name SHA. It was withdrawn shortly after publication due to - an undisclosed "significant flaw" and replaced by the slightly revised - version SHA-1.' - - REVIEW: 125387 - -diff --git a/plugins/qca-ossl/CMakeLists.txt b/plugins/qca-ossl/CMakeLists.txt -index 3124f02..cdeaeca 100644 ---- a/plugins/qca-ossl/CMakeLists.txt -+++ b/plugins/qca-ossl/CMakeLists.txt -@@ -25,6 +25,13 @@ if(OPENSSL_FOUND) - message(WARNING "qca-ossl will be compiled without AES CTR mode encryption support") - endif(HAVE_OPENSSL_AES_CTR) - -+ check_function_exists(EVP_sha HAVE_OPENSSL_SHA0) -+ if(HAVE_OPENSSL_SHA0) -+ add_definitions(-DHAVE_OPENSSL_SHA0) -+ else(HAVE_OPENSSL_SHA0) -+ message(WARNING "qca-ossl will be compiled without SHA-0 digest algorithm support") -+ endif(HAVE_OPENSSL_SHA0) -+ - set(QCA_OSSL_SOURCES qca-ossl.cpp) - - my_automoc( QCA_OSSL_SOURCES ) -diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp -index b34ecc1..61d9e43 100644 ---- a/plugins/qca-ossl/qca-ossl.cpp -+++ b/plugins/qca-ossl/qca-ossl.cpp -@@ -7135,8 +7135,10 @@ public: - return new opensslInfoContext(this); - else if ( type == "sha1" ) - return new opensslHashContext( EVP_sha1(), this, type); -+#ifdef HAVE_OPENSSL_SHA0 - else if ( type == "sha0" ) - return new opensslHashContext( EVP_sha(), this, type); -+#endif - else if ( type == "ripemd160" ) - return new opensslHashContext( EVP_ripemd160(), this, type); - #ifdef HAVE_OPENSSL_MD2 diff --git a/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch b/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch deleted file mode 100644 index accefc49c3d..00000000000 --- a/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 20a587d77636186edb044cd2b71d6d90fe98d232 -Author: Heiko Becker <[email protected]> -Date: Thu Sep 24 22:54:41 2015 +0200 - - qca-ossl: Fix build without SSLv3 - - This fixes building with LibreSSL >= 2.3.0 which has removed support - for SSLv3 completely. As far as I know OpenSSL can be configured to - build without it, so it might be helpful there as well. - - REVIEW: 125386 - -diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp -index cfb1e9f..b34ecc1 100644 ---- a/plugins/qca-ossl/qca-ossl.cpp -+++ b/plugins/qca-ossl/qca-ossl.cpp -@@ -5403,9 +5403,11 @@ public: - ctx = SSL_CTX_new(SSLv2_client_method()); - break; - #endif -+#ifndef OPENSSL_NO_SSL3_METHOD - case TLS::SSL_v3: - ctx = SSL_CTX_new(SSLv3_client_method()); - break; -+#endif - case TLS::TLS_v1: - ctx = SSL_CTX_new(TLSv1_client_method()); - break; diff --git a/app-crypt/qca/qca-2.1.1-r1.ebuild b/app-crypt/qca/qca-2.1.1-r1.ebuild deleted file mode 100644 index 764e6018c3a..00000000000 --- a/app-crypt/qca/qca-2.1.1-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils multibuild qmake-utils - -DESCRIPTION="Qt Cryptographic Architecture (QCA)" -HOMEPAGE="https://userbase.kde.org/QCA"; -SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" - -IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 +qt4 qt5 sasl softstore +ssl test" -REQUIRED_USE="|| ( qt4 qt5 )" - -RDEPEND=" - !app-crypt/qca-cyrus-sasl - !app-crypt/qca-gnupg - !app-crypt/qca-logger - !app-crypt/qca-ossl - !app-crypt/qca-pkcs11 - botan? ( dev-libs/botan:0 ) - gcrypt? ( dev-libs/libgcrypt:= ) - gpg? ( app-crypt/gnupg ) - nss? ( dev-libs/nss ) - pkcs11? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - dev-libs/pkcs11-helper - ) - qt4? ( dev-qt/qtcore:4 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtnetwork:5 - ) - sasl? ( dev-libs/cyrus-sasl:2 ) - ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1:0= ) - libressl? ( dev-libs/libressl:= ) - ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - ) -" - -DOCS=( README TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-disable-pgp-test.patch" - "${FILESDIR}/${P}-libressl-230-sslv3.patch" - "${FILESDIR}/${P}-libressl-230-sha0.patch" -) - -qca_plugin_use() { - echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") -} - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features" - -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_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) - ) - - if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then - mycmakeargs+=(-DQT4_BUILD=ON) - fi - - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_test() { - mytest() { - local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" - cmake-utils_src_test - } - - multibuild_foreach_variant mytest -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install - - if use doc; then - pushd "${BUILD_DIR}" >/dev/null || die - doxygen Doxyfile.in || die - dodoc -r apidocs/html - popd >/dev/null || die - fi - - if use examples; then - dodoc -r "${S}"/examples - fi -}
