* [gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/, app-crypt/qca/files/
@ 2019-04-11 18:43 Stefan Strogin
0 siblings, 0 replies; 3+ messages in thread
From: Stefan Strogin @ 2019-04-11 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 656e54a46c18a478a03b9ff1d860fa03ef1d240e
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
AuthorDate: Thu Apr 11 18:42:04 2019 +0000
Commit: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
CommitDate: Thu Apr 11 18:42:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=656e54a4
app-crypt/qca: bump version to 2.2.0; update patch
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com>
app-crypt/qca/Manifest | 2 +-
...606-libressl.patch => qca-2.2.0-libressl.patch} | 52 ++++++++++++++++++----
...a-2.2.0_pre20180606.ebuild => qca-2.2.0.ebuild} | 2 +-
3 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index f525059..421d83e 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1 +1 @@
-DIST qca-2.2.0_pre20180606.tar.xz 700756 BLAKE2B 0204854a664f211e9289cd4609938fd21e62de5bec5d7f5a99843a12483c960b6f8cc7392dc84bcf0676220411106bf7f23c5059d4f7031791fe9a3259d21d2c SHA512 78f9f8ebc726e95768034c580d5ac30933f7c06e026b7daad04f11477dc623e4267895e409f7830c5149e620876dcc524278ef569956d03820b0864d629c4df8
+DIST qca-2.2.0.tar.xz 691264 BLAKE2B 3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf SHA512 2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
diff --git a/app-crypt/qca/files/qca-2.2.0_pre20180606-libressl.patch b/app-crypt/qca/files/qca-2.2.0-libressl.patch
similarity index 66%
rename from app-crypt/qca/files/qca-2.2.0_pre20180606-libressl.patch
rename to app-crypt/qca/files/qca-2.2.0-libressl.patch
index 2f6d461..f4c2f01 100644
--- a/app-crypt/qca/files/qca-2.2.0_pre20180606-libressl.patch
+++ b/app-crypt/qca/files/qca-2.2.0-libressl.patch
@@ -1,23 +1,24 @@
-From 32e4f55732e42103cd7ba5e84ddd086bf8103948 Mon Sep 17 00:00:00 2001
+From bfc0dd038fea35f004867867935eb695b958f849 Mon Sep 17 00:00:00 2001
From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Fri, 5 Apr 2019 09:57:14 +0300
+Date: Fri, 5 Apr 2019 09:17:23 +0300
Subject: [PATCH] Fix build with LibreSSL
Provide RSA_meth_set_{sign,verify} for LibreSSL.
Do not redefine M_ASN1_IA5STRING_new and RSA_F_RSA_EAY_PRIVATE_DECRYPT.
+Disable HKDF.
Upstream-Status: Submitted [https://phabricator.kde.org/D20259]
Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
---
plugins/qca-ossl/ossl110-compat.h | 34 ++++++++++++++++---------------
- plugins/qca-ossl/qca-ossl.cpp | 2 +-
- 2 files changed, 19 insertions(+), 17 deletions(-)
+ plugins/qca-ossl/qca-ossl.cpp | 10 ++++-----
+ 2 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/plugins/qca-ossl/ossl110-compat.h b/plugins/qca-ossl/ossl110-compat.h
-index ec15475..2d47835 100644
+index b320707..d093e50 100644
--- a/plugins/qca-ossl/ossl110-compat.h
+++ b/plugins/qca-ossl/ossl110-compat.h
-@@ -213,22 +213,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int (*priv_dec) (int flen, con
+@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int (*priv_dec) (int flen, con
return 1;
}
@@ -40,7 +41,7 @@ index ec15475..2d47835 100644
static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
{
if (!meth) return 0;
-@@ -280,4 +264,22 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
+@@ -272,4 +256,22 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
#endif // OPENSSL_VERSION_NUMBER < 0x10100000L
@@ -64,10 +65,10 @@ index ec15475..2d47835 100644
+
#endif // OSSL110COMPAT_H
diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index 39dbc2b..1216bef 100644
+index 11ecdc9..75c48fc 100644
--- a/plugins/qca-ossl/qca-ossl.cpp
+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -61,7 +61,7 @@
+@@ -62,12 +62,12 @@
#endif
// OpenSSL 1.1.0 compatibility macros
@@ -76,6 +77,39 @@ index 39dbc2b..1216bef 100644
#define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
#define RSA_F_RSA_EAY_PRIVATE_DECRYPT RSA_F_RSA_OSSL_PRIVATE_DECRYPT
#endif
+
+-#ifdef OSSL_110
++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
+ #include <openssl/kdf.h>
+ #endif
+
+@@ -1280,7 +1280,7 @@ public:
+ protected:
+ };
+
+-#ifdef OSSL_110
++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
+ class opensslHkdfContext : public HKDFContext
+ {
+ public:
+@@ -7416,7 +7416,7 @@ public:
+ #endif
+ list += "pbkdf1(sha1)";
+ list += "pbkdf2(sha1)";
+-#ifdef OSSL_110
++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
+ list += "hkdf(sha256)";
+ #endif
+ list += "pkey";
+@@ -7489,7 +7489,7 @@ public:
+ #endif
+ else if ( type == "pbkdf2(sha1)" )
+ return new opensslPbkdf2Context( this, type );
+-#ifdef OSSL_110
++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
+ else if ( type == "hkdf(sha256)" )
+ return new opensslHkdfContext( this, type );
+ #endif
--
2.21.0
diff --git a/app-crypt/qca/qca-2.2.0_pre20180606.ebuild b/app-crypt/qca/qca-2.2.0.ebuild
similarity index 96%
rename from app-crypt/qca/qca-2.2.0_pre20180606.ebuild
rename to app-crypt/qca/qca-2.2.0.ebuild
index 9aaf988..bdbfdd2 100644
--- a/app-crypt/qca/qca-2.2.0_pre20180606.ebuild
+++ b/app-crypt/qca/qca-2.2.0.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils qmake-utils
DESCRIPTION="Qt Cryptographic Architecture (QCA)"
HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="2"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/, app-crypt/qca/files/
@ 2023-05-10 21:14 orbea
0 siblings, 0 replies; 3+ messages in thread
From: orbea @ 2023-05-10 21:14 UTC (permalink / raw
To: gentoo-commits
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 <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 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"
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/, app-crypt/qca/files/
@ 2024-10-17 1:22 orbea
0 siblings, 0 replies; 3+ messages in thread
From: orbea @ 2024-10-17 1:22 UTC (permalink / raw
To: gentoo-commits
commit: 031cfe58d433906398d6501795d433d7e2bede2b
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Oct 17 01:21:32 2024 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Thu Oct 17 01:21:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=031cfe58
app-crypt/qca: drop 2.3.8
Signed-off-by: orbea <orbea <AT> riseup.net>
app-crypt/qca/Manifest | 1 -
.../qca/files/qca-2.3.7-use-sha256-not-sha1.patch | 29 -----
app-crypt/qca/qca-2.3.8.ebuild | 119 ---------------------
3 files changed, 149 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index dc6d605..b0ad302 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.3.8.tar.xz 761340 BLAKE2B 04ec8d2fb9c2c00b04407828c549a4bb7d8bf6cda2f1071078dd446b8fc90c89872b2a4dc838bcb4eb34132545365be210c0043bde95c084901661a874600b34 SHA512 ddb410214e8264955c2bb8c68d018e3826cb8ec48f8cc7207c2aec1c36051dc0501455b5049eff927dcf354603c0646f86ca10f2cebebe87789b3fd07a993b68
DIST qca-2.3.9.tar.xz 765256 BLAKE2B 6f8015f45c252d4991dce9154f270d7450b94ec40156e91d537fbdbc17969873689f324032ee24e3fa1c7205a41c6da2870375bfafa308cf82f266bc89da8081 SHA512 025ef203c66e413a9c93d7e0e5449d8a23fb6bb27b2f1c4f137173e33b8c17ff6dec794c8349b6b37ee9d7fffe23875a2cf7cf6592efc373f1aac9230f83aa06
diff --git a/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch b/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch
deleted file mode 100644
index e16fa76..0000000
--- a/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 123123453bd4f3ac87ca6dd641a9028e6e7a29f0 Mon Sep 17 00:00:00 2001
-From: Albert Vaca Cintora <albertvaka@gmail.com>
-Date: Mon, 24 Jul 2023 13:32:30 +0000
-Subject: [PATCH] Sign self-signed certs with SHA256
-
----
- plugins/qca-ossl/qca-ossl.cpp | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index 893631c9..f340ee2f 100644
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -3470,10 +3470,8 @@ public:
- X509_EXTENSION *ex;
-
- const EVP_MD *md;
-- if (priv.key()->type() == PKey::RSA)
-- md = EVP_sha1();
-- else if (priv.key()->type() == PKey::DSA)
-- md = EVP_sha1();
-+ if (priv.key()->type() == PKey::RSA || priv.key()->type() == PKey::DSA)
-+ md = EVP_sha256();
- else
- return false;
-
---
-GitLab
-
diff --git a/app-crypt/qca/qca-2.3.8.ebuild b/app-crypt/qca/qca-2.3.8.ebuild
deleted file mode 100644
index cda39d7..0000000
--- a/app-crypt/qca/qca-2.3.8.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org multibuild out-of-source-utils 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 +qt5 qt6 sasl softstore +ssl test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- botan? ( dev-libs/botan:3= )
- gcrypt? ( dev-libs/libgcrypt:= )
- gpg? ( app-crypt/gnupg )
- nss? ( dev-libs/nss )
- pkcs11? (
- >=dev-libs/openssl-1.1
- dev-libs/pkcs11-helper
- )
- qt5? ( >=dev-qt/qtcore-5.14:5 )
- qt6? (
- dev-qt/qtbase:6
- dev-qt/qt5compat:6
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
- ssl? ( >=dev-libs/openssl-1.1:= )
-"
-DEPEND="${RDEPEND}
- test? (
- qt5? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
- qt6? ( dev-qt/qtbase:6[network] )
- )
-"
-BDEPEND="
- doc? (
- app-text/doxygen[dot]
- virtual/latex-base
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.4-libressl.patch"
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${PN}-2.3.7-use-sha256-not-sha1.patch" # git master
-)
-
-qca_plugin_use() {
- echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-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} == qt6 ]]; then
- mycmakeargs+=( -DBUILD_WITH_QT6=ON )
- else
- mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
- fi
- cmake_src_configure
- }
-
- multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
- multibuild_foreach_variant cmake_src_compile
- if use doc; then
- multibuild_for_best_variant cmake_build doc
- fi
-}
-
-src_test() {
- mytest() {
- local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
- cmake_src_test
- }
- multibuild_foreach_variant mytest
-}
-
-src_install() {
- multibuild_foreach_variant cmake_src_install
-
- if use doc; then
- multibuild_for_best_variant run_in_build_dir dodoc -r apidocs/html
- fi
-
- if use examples; then
- dodoc -r "${S}"/examples
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-17 1:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-17 1:22 [gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/, app-crypt/qca/files/ orbea
-- strict thread matches above, loose matches on Subject: below --
2023-05-10 21:14 orbea
2019-04-11 18:43 Stefan Strogin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox