commit: 3744eccc05fd490fb578d26107d884e487bee283 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Wed May 10 18:53:46 2023 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Wed May 10 18:53:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3744eccc
app-crypt/qca: sync ::gentoo Signed-off-by: orbea <orbea <AT> riseup.net> app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch | 54 ++++++++++++++++++++++ app-crypt/qca/qca-2.3.5-r1.ebuild | 1 + 2 files changed, 55 insertions(+) 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 0000000..c9c581e --- /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 <[email protected]> +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 <[email protected]> +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 0239b62..b64abeb 100644 --- a/app-crypt/qca/qca-2.3.5-r1.ebuild +++ b/app-crypt/qca/qca-2.3.5-r1.ebuild @@ -44,6 +44,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" + "${FILESDIR}/${PN}-2.3.5-openssl3-tests.patch" "${FILESDIR}/${PN}-2.3.4-libressl.patch" )
