commit: ec47cda8eadca7faba22bbece20b2100b2ad86a1 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Wed Jul 12 19:02:36 2023 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Wed Jul 12 19:02:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ec47cda8
app-crypt/qca: drop 2.3.5-r1 Signed-off-by: orbea <orbea <AT> riseup.net> app-crypt/qca/Manifest | 1 - app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch | 54 ------------- app-crypt/qca/qca-2.3.5-r1.ebuild | 91 ---------------------- 3 files changed, 146 deletions(-) diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest index 4581cb6..dab7687 100644 --- a/app-crypt/qca/Manifest +++ b/app-crypt/qca/Manifest @@ -1,2 +1 @@ -DIST qca-2.3.5.tar.xz 741036 BLAKE2B 3948dc9b58a8ef03eec246cc14c7582d30e2513ea4b8f457a44d4a0c8f91fdb10af041f7cc342a0c8d9540a43cb47b4ca5b35641dfc3716c065fc3a1d6ff227a SHA512 656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96 DIST qca-2.3.6.tar.xz 745864 BLAKE2B a3a5955215504b5703db304f241ae9c0c9b243c280cacb6180f631b3259b5f9a8af1c08b233f70e8e4130ac2e957dc3d8a99817b4dec2df0fab41b39bc54f8c8 SHA512 018bde919df28cfc9e5d6c5ad30724199a1a17437022751fb92bfc1ce691d8a56c62b661526e346f5a0c5ff7ffd556499f2ee25efe9f8b1698b3f8eee480811c diff --git a/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch b/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch deleted file mode 100644 index c9c581e..0000000 --- a/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://bugs.gentoo.org/904234 -https://invent.kde.org/libraries/qca/-/commit/33a35a699928318032f62eab0e39e263c604ad9e -https://invent.kde.org/libraries/qca/-/commit/714073747c4a3ccff7a8c85c72872bdf6bd3db4a - -From 33a35a699928318032f62eab0e39e263c604ad9e Mon Sep 17 00:00:00 2001 -From: Pino Toscano <p...@kde.org> -Date: Sat, 22 Oct 2022 13:51:17 +0200 -Subject: [PATCH] hashunittest: run sha384longtest only for providers that - support sha384 - -Fixes commit bdb0e9d37d78ec8e01d4008dba5243afe9029346 that accidentally -left the wrong logic when refactoring the file, and makes the check as -done in the other longtest tests. ---- a/unittest/hashunittest/hashunittest.cpp -+++ b/unittest/hashunittest/hashunittest.cpp -@@ -581,7 +581,7 @@ void HashUnitTest::sha384longtest() - fillerString.fill('a', 1000); - - foreach (QString provider, providersToTest) { -- if (!QCA::isSupported("sha384", provider)) { -+ if (QCA::isSupported("sha384", provider)) { - // QTime t; - // t.start(); - QCA::Hash shaHash(QStringLiteral("sha384"), provider); --- -GitLab - -From 714073747c4a3ccff7a8c85c72872bdf6bd3db4a Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aa...@kde.org> -Date: Mon, 20 Feb 2023 00:19:19 +0100 -Subject: [PATCH] Remove test that openssl has decided it's wrong - ---- a/unittest/pkits/pkits.cpp -+++ b/unittest/pkits/pkits.cpp -@@ -256,6 +256,9 @@ void Pkits::pkits4_1_4() - - void Pkits::pkits4_1_5() - { -+ // openssl has decided that they don't want to support this ¯\_(ツ)_/¯ -+ // https://github.com/openssl/openssl/issues/20233 -+#if 0 - QStringList providersToTest; - providersToTest.append(QStringLiteral("qca-ossl")); - -@@ -298,6 +301,7 @@ void Pkits::pkits4_1_5() - QCOMPARE(cert.validate(trusted, untrusted), QCA::ValidityGood); - } - } -+#endif - } - - void Pkits::pkits4_1_6() --- -GitLab diff --git a/app-crypt/qca/qca-2.3.5-r1.ebuild b/app-crypt/qca/qca-2.3.5-r1.ebuild deleted file mode 100644 index c15cc19..0000000 --- a/app-crypt/qca/qca-2.3.5-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake kde.org 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 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-qt/qtcore-5.14:5 - botan? ( dev-libs/botan:2= ) - 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:= ) -" -DEPEND="${RDEPEND} - test? ( - dev-qt/qtnetwork:5 - dev-qt/qttest:5 - ) -" -BDEPEND=" - doc? ( - app-doc/doxygen[dot] - virtual/latex-base - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-disable-pgp-test.patch" - "${FILESDIR}/${PN}-2.3.5-openssl3-tests.patch" - "${FILESDIR}/${PN}-2.3.4-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 -}
