gentoo auto-resync : 13:04:2023 - 23:44:17

3 files changed, 60 insertions, 2 deletions

diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 3bd6a25c31fb..477c67e80c1d 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,4 +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
-EBUILD qca-2.3.5-r1.ebuild 1893 BLAKE2B eccd4140cad1b5828dedc438600ed9975b9133d90181a12048659f96989e141182a858b02e6a9057be8ca62516c04eaa37e542b31fa577e4277f6ebbb98d643f SHA512 8eebfd0802ac7a7afe7dff297ee6554bf6643e22b7dd94b3dce799dd6e36734830df456d921c1100184f1802fffe594178922ab4dd72a2a2b8f9ee804f489cf2
+EBUILD qca-2.3.5-r1.ebuild 1942 BLAKE2B 4c9fef3d9db33f26911d742dc6808f280892330674b124ed73cdef791428d9594203d4bf8c9119dc86a4c021bbf0d170b4c476e40ac06d2b5b488de598321367 SHA512 e4dee1c08c28a926707544bd8781e3fa8e86142a014ccd09e4389924bdff8ba759ba5ac798dac7d9bce6474dd113b71e0879fcf735d93c88c5db5f666832cbdd
 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
new file mode 100644
index 000000000000..c9c581e87a10
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch
@@ -0,0 +1,54 @@
+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 <pino@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 <aacid@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
index 61e57608b494..3c45a569717c 100644
--- a/app-crypt/qca/qca-2.3.5-r1.ebuild
+++ b/app-crypt/qca/qca-2.3.5-r1.ebuild
@@ -42,7 +42,10 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+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")