From cd7ab3ad114e9777d85ced67abdd5b25d0bd4efe Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 9 Jul 2023 16:25:07 +0100 Subject: gentoo auto-resync : 09:07:2023 - 16:25:07 --- app-crypt/qca/Manifest | 3 - app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch | 54 ------------- app-crypt/qca/qca-2.3.5-r1.ebuild | 90 ---------------------- 3 files changed, 147 deletions(-) delete mode 100644 app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch delete mode 100644 app-crypt/qca/qca-2.3.5-r1.ebuild (limited to 'app-crypt/qca') diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest index 4d2b62a1a3b2..cb3b0c495333 100644 --- a/app-crypt/qca/Manifest +++ b/app-crypt/qca/Manifest @@ -1,8 +1,5 @@ -AUX qca-2.3.5-openssl3-tests.patch 1876 BLAKE2B 45e8bf99ffefc6576f042a2466d2fa8e554377e53633bbb569b4d4ec3d1d3a461f2b75f9710617dfde0ebf819ddfe881b67821938378aeab4097608917a28100 SHA512 03210d76366ccc658d44a95b8f91709dbf7a8e77e13d5bcc09867f21bdeeef212cbb3235a74c6bc6b84e7788484a0e5accd8d49cd9693e0a3b13bfeae509354f AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104 -DIST qca-2.3.5.tar.xz 741036 BLAKE2B 3948dc9b58a8ef03eec246cc14c7582d30e2513ea4b8f457a44d4a0c8f91fdb10af041f7cc342a0c8d9540a43cb47b4ca5b35641dfc3716c065fc3a1d6ff227a SHA512 656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96 DIST qca-2.3.6.tar.xz 745864 BLAKE2B a3a5955215504b5703db304f241ae9c0c9b243c280cacb6180f631b3259b5f9a8af1c08b233f70e8e4130ac2e957dc3d8a99817b4dec2df0fab41b39bc54f8c8 SHA512 018bde919df28cfc9e5d6c5ad30724199a1a17437022751fb92bfc1ce691d8a56c62b661526e346f5a0c5ff7ffd556499f2ee25efe9f8b1698b3f8eee480811c -EBUILD qca-2.3.5-r1.ebuild 1927 BLAKE2B 2c8deada2814ebe5c1f29d0ed5aa1331af687519d8acd4b901af41510ed846b104b512217516df272124435b6d14c6d9931fea1b77ed564fc4840aa0a7da3a31 SHA512 1f176e5a7d78c6c53a5e0ed7d20ad1647076f62d7dfa8e7691ead13a244308f5a8b1d6ae8baa97ca7296311e619589430ca95bb75b0a653e8890676c9e99b864 EBUILD qca-2.3.6-r1.ebuild 1878 BLAKE2B eb333c51e31bbf7df91e267c2e6786201645ff73d4d747dface11905e9c354ac6cf31d3185fed58a48589881e7872acf0490d3bbea30dc807ebfbddbcdcd2a43 SHA512 b40d18b16b398dc45f69949e4c30c2d0e02ae97cbcfa6e59f36a4b22b63ede50c27dd7c66cd5fe533d227e988ea00522910c6e87d2a01323794f4d1d13cec9dc EBUILD qca-2.3.6-r2.ebuild 2550 BLAKE2B d87cb78dbf2260c082d4e8afabf7b77019e8ef75cbb80bc0fb8abd42981b709757c9432d38dfffaab8731a2a0721140d48088a8547397cab36956d57fe1ccee2 SHA512 ed4ca01439c5a4603e0db58ec29eee9d343f265fa808e2be14684efcf0f0ab85ca0ec8b0717b1d93d28998bc6bf5015103b7b70260293c3c441856d02271666d MISC metadata.xml 832 BLAKE2B 9044b545fa732c5f86c7dbb026630b4946a538ba77369eae28e894bf636ca60f6a31d7aad258fa19aee4c433d6d5a8e2a34a7c2850eef3a40d44261e592032b0 SHA512 b01bfe83343fdc265abc25922300cdc67f556a9a6f6db16918b0b3ee44c4e83db524695c5cb8952278f3e1f2e5d60a49bcc9312b35ab95f0ecc42e03764fb6bd 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 c9c581e87a10..000000000000 --- 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 -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 -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 14304dc07d6c..000000000000 --- a/app-crypt/qca/qca-2.3.5-r1.ebuild +++ /dev/null @@ -1,90 +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" -) - -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 -} -- cgit v1.2.3