* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2021-08-09 5:57 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2021-08-09 5:57 UTC (permalink / raw
To: gentoo-commits
commit: 8f0d0d52ade4ea790c82353e37999153ab6126d2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 9 05:53:24 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 9 05:53:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0d0d52
app-crypt/qca: Drop 2.3.2
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-crypt/qca/Manifest | 1 -
...signverify_message_invalid-fails-randomly.patch | 32 --------
...3.2-openssl-1.1.1i-empty-msg-verification.patch | 57 --------------
app-crypt/qca/qca-2.3.2.ebuild | 88 ----------------------
4 files changed, 178 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index d4d9f7558a0..ad17e4e1880 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.3.2.tar.xz 735500 BLAKE2B 559b27c48c756f2b4f4f206d2157c90ae4856610f1539b4162a2bffe7fffe19b5c768d3d3f9d0486d2098fb403eb64372515815f49fd428d22dfc0405d99e435 SHA512 da6415a097c99b878f45730c1dd1e0bfc7f96858ad7018918ac7c2ae2eca830cb73e131173b1018ee4caa6c3a504b80c8ad28f8f9448c2fd1593161c2ac8aad4
DIST qca-2.3.3.tar.xz 736456 BLAKE2B f0812fd33bd19293c8034e48bcf214d2d70dc1397860779c2c145fe841365384a8eb6bad9859520d32104010acb0cefb97e3a974b9852a37ca8039d52d9dbd03 SHA512 9a262350502daa1dd10802a7a24f0e4712d87d4ddcf752452a51caa8694a30835672f54f8e600aa8dc4afdac9ef073641deed52a24423e304d18ad2b83deeca6
diff --git a/app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch b/app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch
deleted file mode 100644
index af86e4539fb..00000000000
--- a/app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ecdd0538dded7d2ba9e73a51f4f52030dd3f5a3b Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Fri, 5 Feb 2021 17:43:45 +0100
-Subject: [PATCH] Fix CMSut::signverify_message_invalid failing "randomly"
-
-Once in a blue moon it happens that signedResult1[signedResult1.size() -
-2] is a 0, so setting it to 0 doesn't break the signature validation, so
- check if it's a 0 and if it is, set it to 1
----
- unittest/cms/cms.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/unittest/cms/cms.cpp b/unittest/cms/cms.cpp
-index 4901221e..9b541789 100644
---- a/unittest/cms/cms.cpp
-+++ b/unittest/cms/cms.cpp
-@@ -499,7 +499,11 @@ void CMSut::signverify_message_invalid()
-
- // This is just to break things
- // signedResult1[30] = signedResult1[30] + 1;
-- signedResult1[signedResult1.size() - 2] = 0x00;
-+ if (signedResult1.at(signedResult1.size() - 2) != 0) {
-+ signedResult1[signedResult1.size() - 2] = 0x00;
-+ } else {
-+ signedResult1[signedResult1.size() - 2] = 0x01;
-+ }
-
- msg.startVerify();
- msg.update(signedResult1);
---
-GitLab
-
diff --git a/app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch b/app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch
deleted file mode 100644
index 34258aed162..00000000000
--- a/app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bc94cc08e1d3ea733946861d90a21681d58665ab Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Fri, 5 Feb 2021 16:39:11 +0100
-Subject: [PATCH] openssl 1.1.1i made verification of empty messages always
- succeed
-
-BUGS: 432519
----
- unittest/cms/cms.cpp | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/unittest/cms/cms.cpp b/unittest/cms/cms.cpp
-index 37e188d0..4901221e 100644
---- a/unittest/cms/cms.cpp
-+++ b/unittest/cms/cms.cpp
-@@ -30,6 +30,8 @@
- #include "import_plugins.h"
- #endif
-
-+#include <openssl/opensslv.h>
-+
- class CMSut : public QObject
- {
- Q_OBJECT
-@@ -252,7 +254,9 @@ void CMSut::signverify()
- msg.waitForFinished(-1);
- QVERIFY(msg.wasSigned());
- QVERIFY(msg.success());
-+#if OPENSSL_VERSION_NUMBER < 0x1010109fL
- QEXPECT_FAIL("empty", "We don't seem to be able to verify signature of a zero length message", Continue);
-+#endif
- QVERIFY(msg.verifySuccess());
-
- msg.reset();
-@@ -264,7 +268,9 @@ void CMSut::signverify()
- msg.waitForFinished(-1);
- QVERIFY(msg.wasSigned());
- QVERIFY(msg.success());
-+#if OPENSSL_VERSION_NUMBER < 0x1010109fL
- QEXPECT_FAIL("empty", "We don't seem to be able to verify signature of a zero length message", Continue);
-+#endif
- QVERIFY(msg.verifySuccess());
-
- msg.reset();
-@@ -277,6 +283,9 @@ void CMSut::signverify()
- msg.waitForFinished(-1);
- QVERIFY(msg.wasSigned());
- QVERIFY(msg.success());
-+#if OPENSSL_VERSION_NUMBER >= 0x1010109fL
-+ QEXPECT_FAIL("empty", "On newer openssl verifaction of zero length message always succeeds", Continue);
-+#endif
- QCOMPARE(msg.verifySuccess(), false);
-
- msg.reset();
---
-GitLab
-
diff --git a/app-crypt/qca/qca-2.3.2.ebuild b/app-crypt/qca/qca-2.3.2.ebuild
deleted file mode 100644
index 8d66157373c..00000000000
--- a/app-crypt/qca/qca-2.3.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde.org cmake 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 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-RDEPEND="
- dev-qt/qtcore:5
- botan? ( dev-libs/botan:= )
- 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:0= )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${P}-openssl-1.1.1i-empty-msg-verification.patch" # bug 766932
- "${FILESDIR}/${P}-cmsut-signverify_message_invalid-fails-randomly.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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2023-07-25 8:23 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2023-07-25 8:23 UTC (permalink / raw
To: gentoo-commits
commit: 6533022d21cd2f298942770d6f5fce24f12bf2c7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 07:58:29 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 08:21:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6533022d
app-crypt/qca: add 2.3.7
See also:
https://mail.kde.org/pipermail/kde-announce-apps/2023-July/005763.html
Also backporting:
https://invent.kde.org/libraries/qca/-/merge_requests/101
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-crypt/qca/Manifest | 1 +
.../qca/files/qca-2.3.7-use-sha256-not-sha1.patch | 29 +++++
app-crypt/qca/qca-2.3.7.ebuild | 118 +++++++++++++++++++++
3 files changed, 148 insertions(+)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index dab768773b90..e75edf151c57 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1 +1,2 @@
DIST qca-2.3.6.tar.xz 745864 BLAKE2B a3a5955215504b5703db304f241ae9c0c9b243c280cacb6180f631b3259b5f9a8af1c08b233f70e8e4130ac2e957dc3d8a99817b4dec2df0fab41b39bc54f8c8 SHA512 018bde919df28cfc9e5d6c5ad30724199a1a17437022751fb92bfc1ce691d8a56c62b661526e346f5a0c5ff7ffd556499f2ee25efe9f8b1698b3f8eee480811c
+DIST qca-2.3.7.tar.xz 745880 BLAKE2B 87a029a3cca93f14c764a105e8f0b3c2a32a39ab16ea34e60fe155712ecd351dcb8d67659228ad339db7e3b572ce8ca9c50b9cdc2a5bf8511b482329497843ee SHA512 8932c3ea82378cacd408f787dbfd38a5ffe7a9a5e4c90a53a44b9a386c827f70b19094d4188d5ace8dc0a9c84caa4b242aa85967ef5948591e8d74d7cf3109f6
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
new file mode 100644
index 000000000000..e16fa76f6c57
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch
@@ -0,0 +1,29 @@
+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.7.ebuild b/app-crypt/qca/qca-2.3.7.ebuild
new file mode 100644
index 000000000000..7016ffd72ba9
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.7.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 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,test] )
+ )
+"
+BDEPEND="
+ doc? (
+ app-doc/doxygen[dot]
+ virtual/latex-base
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${P}-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] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2023-04-13 18:50 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2023-04-13 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 489a9221d41f98d87b5a48c81a2018ef0d010e62
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 18:49:28 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 18:49:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489a9221
app-crypt/qca: backport OpenSSL 3 test fixes
Test-only fixes.
Closes: https://bugs.gentoo.org/904234
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch | 54 ++++++++++++++++++++++
app-crypt/qca/qca-2.3.5-r1.ebuild | 5 +-
2 files changed, 58 insertions(+), 1 deletion(-)
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")
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2021-04-07 8:36 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2021-04-07 8:36 UTC (permalink / raw
To: gentoo-commits
commit: b1de4cef249cace6bc5f82c3145542ecbb55078a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 7 08:33:29 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 7 08:36:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1de4cef
app-crypt/qca: Drop 2.3.1
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-crypt/qca/Manifest | 1 -
app-crypt/qca/files/qca-2.3.1-gcc11.patch | 30 -----------
app-crypt/qca/qca-2.3.1.ebuild | 87 -------------------------------
3 files changed, 118 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index a9118e9afad..880177b2651 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.3.1.tar.xz 725984 BLAKE2B a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052 SHA512 092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021
DIST qca-2.3.2.tar.xz 735500 BLAKE2B 559b27c48c756f2b4f4f206d2157c90ae4856610f1539b4162a2bffe7fffe19b5c768d3d3f9d0486d2098fb403eb64372515815f49fd428d22dfc0405d99e435 SHA512 da6415a097c99b878f45730c1dd1e0bfc7f96858ad7018918ac7c2ae2eca830cb73e131173b1018ee4caa6c3a504b80c8ad28f8f9448c2fd1593161c2ac8aad4
diff --git a/app-crypt/qca/files/qca-2.3.1-gcc11.patch b/app-crypt/qca/files/qca-2.3.1-gcc11.patch
deleted file mode 100644
index cd4eaab8688..00000000000
--- a/app-crypt/qca/files/qca-2.3.1-gcc11.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f015cc64889035c084138864e2e030ece19c257b Mon Sep 17 00:00:00 2001
-From: Jeff Law <law@redhat.com>
-Date: Dec 04 2020 03:55:48 +0000
-Subject: Fix missing includes for gcc-11
-
-
-diff --git a/src/qca_cert.cpp b/src/qca_cert.cpp
-index 5e73d98..225aecd 100644
---- a/src/qca_cert.cpp
-+++ b/src/qca_cert.cpp
-@@ -19,6 +19,7 @@
- *
- */
-
-+#include <memory>
- #include "qca_cert.h"
-
- #include "qca_publickey.h"
-diff --git a/src/qca_default.cpp b/src/qca_default.cpp
-index fd35702..db87e87 100644
---- a/src/qca_default.cpp
-+++ b/src/qca_default.cpp
-@@ -19,6 +19,7 @@
- *
- */
-
-+#include <memory>
- #include "qca_core.h"
-
- #include <QMutex>
diff --git a/app-crypt/qca/qca-2.3.1.ebuild b/app-crypt/qca/qca-2.3.1.ebuild
deleted file mode 100644
index 4414a43132b..00000000000
--- a/app-crypt/qca/qca-2.3.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde.org cmake 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 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-RDEPEND="
- dev-qt/qtcore:5
- botan? ( dev-libs/botan:= )
- 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:0= )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${P}-gcc11.patch" # bug 764047
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2021-03-05 10:52 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2021-03-05 10:52 UTC (permalink / raw
To: gentoo-commits
commit: 44d67a9888121586b4839bb73dc748c398adfe23
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 5 10:39:56 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 5 10:39:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d67a98
app-crypt/qca: Fix CryptographicMessageSyntax
Closes: https://bugs.gentoo.org/766932
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...signverify_message_invalid-fails-randomly.patch | 32 ++++++++++++
...3.2-openssl-1.1.1i-empty-msg-verification.patch | 57 ++++++++++++++++++++++
app-crypt/qca/qca-2.3.2.ebuild | 6 ++-
3 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch b/app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch
new file mode 100644
index 00000000000..af86e4539fb
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch
@@ -0,0 +1,32 @@
+From ecdd0538dded7d2ba9e73a51f4f52030dd3f5a3b Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Fri, 5 Feb 2021 17:43:45 +0100
+Subject: [PATCH] Fix CMSut::signverify_message_invalid failing "randomly"
+
+Once in a blue moon it happens that signedResult1[signedResult1.size() -
+2] is a 0, so setting it to 0 doesn't break the signature validation, so
+ check if it's a 0 and if it is, set it to 1
+---
+ unittest/cms/cms.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/unittest/cms/cms.cpp b/unittest/cms/cms.cpp
+index 4901221e..9b541789 100644
+--- a/unittest/cms/cms.cpp
++++ b/unittest/cms/cms.cpp
+@@ -499,7 +499,11 @@ void CMSut::signverify_message_invalid()
+
+ // This is just to break things
+ // signedResult1[30] = signedResult1[30] + 1;
+- signedResult1[signedResult1.size() - 2] = 0x00;
++ if (signedResult1.at(signedResult1.size() - 2) != 0) {
++ signedResult1[signedResult1.size() - 2] = 0x00;
++ } else {
++ signedResult1[signedResult1.size() - 2] = 0x01;
++ }
+
+ msg.startVerify();
+ msg.update(signedResult1);
+--
+GitLab
+
diff --git a/app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch b/app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch
new file mode 100644
index 00000000000..34258aed162
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch
@@ -0,0 +1,57 @@
+From bc94cc08e1d3ea733946861d90a21681d58665ab Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Fri, 5 Feb 2021 16:39:11 +0100
+Subject: [PATCH] openssl 1.1.1i made verification of empty messages always
+ succeed
+
+BUGS: 432519
+---
+ unittest/cms/cms.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/unittest/cms/cms.cpp b/unittest/cms/cms.cpp
+index 37e188d0..4901221e 100644
+--- a/unittest/cms/cms.cpp
++++ b/unittest/cms/cms.cpp
+@@ -30,6 +30,8 @@
+ #include "import_plugins.h"
+ #endif
+
++#include <openssl/opensslv.h>
++
+ class CMSut : public QObject
+ {
+ Q_OBJECT
+@@ -252,7 +254,9 @@ void CMSut::signverify()
+ msg.waitForFinished(-1);
+ QVERIFY(msg.wasSigned());
+ QVERIFY(msg.success());
++#if OPENSSL_VERSION_NUMBER < 0x1010109fL
+ QEXPECT_FAIL("empty", "We don't seem to be able to verify signature of a zero length message", Continue);
++#endif
+ QVERIFY(msg.verifySuccess());
+
+ msg.reset();
+@@ -264,7 +268,9 @@ void CMSut::signverify()
+ msg.waitForFinished(-1);
+ QVERIFY(msg.wasSigned());
+ QVERIFY(msg.success());
++#if OPENSSL_VERSION_NUMBER < 0x1010109fL
+ QEXPECT_FAIL("empty", "We don't seem to be able to verify signature of a zero length message", Continue);
++#endif
+ QVERIFY(msg.verifySuccess());
+
+ msg.reset();
+@@ -277,6 +283,9 @@ void CMSut::signverify()
+ msg.waitForFinished(-1);
+ QVERIFY(msg.wasSigned());
+ QVERIFY(msg.success());
++#if OPENSSL_VERSION_NUMBER >= 0x1010109fL
++ QEXPECT_FAIL("empty", "On newer openssl verifaction of zero length message always succeeds", Continue);
++#endif
+ QCOMPARE(msg.verifySuccess(), false);
+
+ msg.reset();
+--
+GitLab
+
diff --git a/app-crypt/qca/qca-2.3.2.ebuild b/app-crypt/qca/qca-2.3.2.ebuild
index 9b020b5ca9f..2d0ade08ff7 100644
--- a/app-crypt/qca/qca-2.3.2.ebuild
+++ b/app-crypt/qca/qca-2.3.2.ebuild
@@ -39,7 +39,11 @@ DEPEND="${RDEPEND}
)
"
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${P}-openssl-1.1.1i-empty-msg-verification.patch" # bug 766932
+ "${FILESDIR}/${P}-cmsut-signverify_message_invalid-fails-randomly.patch"
+)
qca_plugin_use() {
echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2021-01-24 13:03 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2021-01-24 13:03 UTC (permalink / raw
To: gentoo-commits
commit: a2d112f5512cc3cb26f25a12085cc4be6ccc13f1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 00:28:36 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 13:03:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2d112f5
app-crypt/qca: Fix build with GCC-11
Closes: https://bugs.gentoo.org/764047
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-crypt/qca/files/qca-2.3.1-gcc11.patch | 30 ++++++++++++++++++++++++++++++
app-crypt/qca/qca-2.3.1.ebuild | 7 +++++--
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/app-crypt/qca/files/qca-2.3.1-gcc11.patch b/app-crypt/qca/files/qca-2.3.1-gcc11.patch
new file mode 100644
index 00000000000..cd4eaab8688
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.1-gcc11.patch
@@ -0,0 +1,30 @@
+From f015cc64889035c084138864e2e030ece19c257b Mon Sep 17 00:00:00 2001
+From: Jeff Law <law@redhat.com>
+Date: Dec 04 2020 03:55:48 +0000
+Subject: Fix missing includes for gcc-11
+
+
+diff --git a/src/qca_cert.cpp b/src/qca_cert.cpp
+index 5e73d98..225aecd 100644
+--- a/src/qca_cert.cpp
++++ b/src/qca_cert.cpp
+@@ -19,6 +19,7 @@
+ *
+ */
+
++#include <memory>
+ #include "qca_cert.h"
+
+ #include "qca_publickey.h"
+diff --git a/src/qca_default.cpp b/src/qca_default.cpp
+index fd35702..db87e87 100644
+--- a/src/qca_default.cpp
++++ b/src/qca_default.cpp
+@@ -19,6 +19,7 @@
+ *
+ */
+
++#include <memory>
+ #include "qca_core.h"
+
+ #include <QMutex>
diff --git a/app-crypt/qca/qca-2.3.1.ebuild b/app-crypt/qca/qca-2.3.1.ebuild
index b954f235e01..4414a43132b 100644
--- a/app-crypt/qca/qca-2.3.1.ebuild
+++ b/app-crypt/qca/qca-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -39,7 +39,10 @@ DEPEND="${RDEPEND}
)
"
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${P}-gcc11.patch" # bug 764047
+)
qca_plugin_use() {
echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2018-06-06 15:11 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2018-06-06 15:11 UTC (permalink / raw
To: gentoo-commits
commit: b6a7aac0a023ae6b4f41f4b998108f861685a1af
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 15:10:01 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 15:11:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a7aac0
app-crypt/qca: Actually fix deps
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-crypt/qca/files/qca-2.1.3-deps.patch | 38 ++++++++++++++++++++++++++++++++
app-crypt/qca/qca-2.1.3-r2.ebuild | 1 +
2 files changed, 39 insertions(+)
diff --git a/app-crypt/qca/files/qca-2.1.3-deps.patch b/app-crypt/qca/files/qca-2.1.3-deps.patch
new file mode 100644
index 00000000000..e1ef2e5c0e7
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.1.3-deps.patch
@@ -0,0 +1,38 @@
+From e854f357f4037e2c8c781ebd04ec5164a882b9b3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 12 Apr 2018 00:45:50 +0200
+Subject: [PATCH] Make Qt5Network conditional on BUILD_TESTS
+
+Summary: I did not find it in use somewhere else.
+
+Reviewers: iromanov, sitter, rjvbb
+
+Reviewed By: rjvbb
+
+Subscribers: fvogt
+
+Differential Revision: https://phabricator.kde.org/D12129
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 28b0169..65b95f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,11 @@ if (Qt5Core_FOUND)
+ message(STATUS "Building with Qt5 support")
+ # Got from ECM
+ # Distros have no ECM. So I just copied required cmake modules.
+- find_package(Qt5Transitional REQUIRED Core Network)
++ if(BUILD_TESTS)
++ find_package(Qt5Transitional REQUIRED Core Network)
++ else()
++ find_package(Qt5Transitional REQUIRED Core)
++ endif()
+ include(ECMQt4To5Porting)
+
+ include(GNUInstallDirs)
+--
+2.17.1
+
diff --git a/app-crypt/qca/qca-2.1.3-r2.ebuild b/app-crypt/qca/qca-2.1.3-r2.ebuild
index d93996ca867..a1d5bbb0df5 100644
--- a/app-crypt/qca/qca-2.1.3-r2.ebuild
+++ b/app-crypt/qca/qca-2.1.3-r2.ebuild
@@ -50,6 +50,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-disable-pgp-test.patch"
"${FILESDIR}/${P}-c++11.patch"
+ "${FILESDIR}/${P}-deps.patch"
)
qca_plugin_use() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2017-06-09 16:39 Johannes Huber
0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2017-06-09 16:39 UTC (permalink / raw
To: gentoo-commits
commit: e99054b5b5a1545b422ef03f2bf58fec31639ba9
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 16:39:00 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 16:39:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e99054b5
app-crypt/qca: Remove 2.1.1-r1
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-crypt/qca/Manifest | 1 -
app-crypt/qca/files/qca-2.1.0.3-qt55.patch | 26 -----
.../qca/files/qca-2.1.1-libressl-230-sha0.patch | 48 --------
.../qca/files/qca-2.1.1-libressl-230-sslv3.patch | 28 -----
app-crypt/qca/qca-2.1.1-r1.ebuild | 123 ---------------------
5 files changed, 226 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 650ee54cc31..a55185d76d7 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.1.1.tar.xz 688460 SHA256 95de3e7910b5f9ec7084169989c9d98bfb527e6a4865fe17269c3b24308be983 SHA512 f077b5a4cc6539e0880f4d0a615bebcf851f634e99c6c355522598204f625e5195e0cbc8a1976593669018e57eff95796c8fef69b1301b42cb18736bc8aa1abf WHIRLPOOL 454751a76f5e59aa09d6cc979bc26a490b23a2e5308f663400f45f38a95e6ad7a34428cffb1a2a82ec6958aa0b4418e0054503a58b43e0c172201cbaa7c669f8
DIST qca-2.1.3.tar.xz 686340 SHA256 003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353 SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a WHIRLPOOL bd004ad0e754850e4349aef72a7bc2449a95850b86bb383d9a60fb7d7c69c7e5e2dcc8e1cc945b647623678484f0bd15c5e125e7e278c2a0964b28b48ee8c8f3
diff --git a/app-crypt/qca/files/qca-2.1.0.3-qt55.patch b/app-crypt/qca/files/qca-2.1.0.3-qt55.patch
deleted file mode 100644
index 277c24e0280..00000000000
--- a/app-crypt/qca/files/qca-2.1.0.3-qt55.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7207e6285e932044cd66d49d0dc484666cfb0092 Mon Sep 17 00:00:00 2001
-From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
-Date: Sat, 17 Jan 2015 20:12:18 +0100
-Subject: [PATCH] Add missing QIODevice include
-
-Fixes build with Qt 5.5
----
- include/QtCrypto/qca_basic.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/QtCrypto/qca_basic.h b/include/QtCrypto/qca_basic.h
-index 42808c5..e0c6cbb 100644
---- a/include/QtCrypto/qca_basic.h
-+++ b/include/QtCrypto/qca_basic.h
-@@ -35,6 +35,8 @@
-
- #include "qca_core.h"
-
-+#include <QIODevice>
-+
- // Qt5 comes with QStringLiteral for wrapping string literals, which Qt4 does
- // not have. It is needed if the headers are built with QT_NO_CAST_FROM_ASCII.
- // Defining it here as QString::fromUtf8 for convenience.
---
-2.0.5
-
diff --git a/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch b/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch
deleted file mode 100644
index 3e112c622a5..00000000000
--- a/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 0dbed8eb38afd1561907a52283091c37e7b85156
-Author: Heiko Becker <heirecka@exherbo.org>
-Date: Thu Sep 24 23:05:21 2015 +0200
-
- qca-ossl: Fix build without support for SHA-0
-
- LibreSSL >= 2.3.0 removed support for SHA-0, so there's no EVP_sha
- anymore.
- Wikipedia says about SHA-0: "160-bit hash function published in 1993
- under the name SHA. It was withdrawn shortly after publication due to
- an undisclosed "significant flaw" and replaced by the slightly revised
- version SHA-1.'
-
- REVIEW: 125387
-
-diff --git a/plugins/qca-ossl/CMakeLists.txt b/plugins/qca-ossl/CMakeLists.txt
-index 3124f02..cdeaeca 100644
---- a/plugins/qca-ossl/CMakeLists.txt
-+++ b/plugins/qca-ossl/CMakeLists.txt
-@@ -25,6 +25,13 @@ if(OPENSSL_FOUND)
- message(WARNING "qca-ossl will be compiled without AES CTR mode encryption support")
- endif(HAVE_OPENSSL_AES_CTR)
-
-+ check_function_exists(EVP_sha HAVE_OPENSSL_SHA0)
-+ if(HAVE_OPENSSL_SHA0)
-+ add_definitions(-DHAVE_OPENSSL_SHA0)
-+ else(HAVE_OPENSSL_SHA0)
-+ message(WARNING "qca-ossl will be compiled without SHA-0 digest algorithm support")
-+ endif(HAVE_OPENSSL_SHA0)
-+
- set(QCA_OSSL_SOURCES qca-ossl.cpp)
-
- my_automoc( QCA_OSSL_SOURCES )
-diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index b34ecc1..61d9e43 100644
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -7135,8 +7135,10 @@ public:
- return new opensslInfoContext(this);
- else if ( type == "sha1" )
- return new opensslHashContext( EVP_sha1(), this, type);
-+#ifdef HAVE_OPENSSL_SHA0
- else if ( type == "sha0" )
- return new opensslHashContext( EVP_sha(), this, type);
-+#endif
- else if ( type == "ripemd160" )
- return new opensslHashContext( EVP_ripemd160(), this, type);
- #ifdef HAVE_OPENSSL_MD2
diff --git a/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch b/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch
deleted file mode 100644
index accefc49c3d..00000000000
--- a/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 20a587d77636186edb044cd2b71d6d90fe98d232
-Author: Heiko Becker <heirecka@exherbo.org>
-Date: Thu Sep 24 22:54:41 2015 +0200
-
- qca-ossl: Fix build without SSLv3
-
- This fixes building with LibreSSL >= 2.3.0 which has removed support
- for SSLv3 completely. As far as I know OpenSSL can be configured to
- build without it, so it might be helpful there as well.
-
- REVIEW: 125386
-
-diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index cfb1e9f..b34ecc1 100644
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -5403,9 +5403,11 @@ public:
- ctx = SSL_CTX_new(SSLv2_client_method());
- break;
- #endif
-+#ifndef OPENSSL_NO_SSL3_METHOD
- case TLS::SSL_v3:
- ctx = SSL_CTX_new(SSLv3_client_method());
- break;
-+#endif
- case TLS::TLS_v1:
- ctx = SSL_CTX_new(TLSv1_client_method());
- break;
diff --git a/app-crypt/qca/qca-2.1.1-r1.ebuild b/app-crypt/qca/qca-2.1.1-r1.ebuild
deleted file mode 100644
index 764e6018c3a..00000000000
--- a/app-crypt/qca/qca-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multibuild qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 +qt4 qt5 sasl softstore +ssl test"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
- !app-crypt/qca-cyrus-sasl
- !app-crypt/qca-gnupg
- !app-crypt/qca-logger
- !app-crypt/qca-ossl
- !app-crypt/qca-pkcs11
- botan? ( dev-libs/botan:0 )
- gcrypt? ( dev-libs/libgcrypt:= )
- gpg? ( app-crypt/gnupg )
- nss? ( dev-libs/nss )
- pkcs11? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- dev-libs/pkcs11-helper
- )
- qt4? ( dev-qt/qtcore:4 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtconcurrent:5
- dev-qt/qtnetwork:5
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- qt4? ( dev-qt/qttest:4 )
- qt5? ( dev-qt/qttest:5 )
- )
-"
-
-DOCS=( README TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${P}-libressl-230-sslv3.patch"
- "${FILESDIR}/${P}-libressl-230-sha0.patch"
-)
-
-qca_plugin_use() {
- echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-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} == qt4 ]]; then
- mycmakeargs+=(-DQT4_BUILD=ON)
- fi
-
- cmake-utils_src_configure
- }
-
- multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
- mytest() {
- local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
- cmake-utils_src_test
- }
-
- multibuild_foreach_variant mytest
-}
-
-src_install() {
- multibuild_foreach_variant cmake-utils_src_install
-
- if use doc; then
- pushd "${BUILD_DIR}" >/dev/null || die
- doxygen Doxyfile.in || die
- dodoc -r apidocs/html
- popd >/dev/null || die
- fi
-
- if use examples; then
- dodoc -r "${S}"/examples
- fi
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2017-03-21 10:42 Alon Bar-Lev
0 siblings, 0 replies; 12+ messages in thread
From: Alon Bar-Lev @ 2017-03-21 10:42 UTC (permalink / raw
To: gentoo-commits
commit: 2997c245b069f26aedf7ed60676acb69f2b3bbc0
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 10:41:24 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 10:42:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2997c245
app-crypt/qca: fix c++11 build
Bug: 612238
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-crypt/qca/files/qca-2.1.3-c++11.patch | 97 +++++++++++++++++++++++++++++++
app-crypt/qca/qca-2.1.3.ebuild | 1 +
2 files changed, 98 insertions(+)
diff --git a/app-crypt/qca/files/qca-2.1.3-c++11.patch b/app-crypt/qca/files/qca-2.1.3-c++11.patch
new file mode 100644
index 00000000000..a12f96bfcf4
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.1.3-c++11.patch
@@ -0,0 +1,97 @@
+From 5f18ebc705ec98e883aa63cb537e36e6a08b7e34 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Tue, 21 Mar 2017 12:23:17 +0200
+Subject: [PATCH] build: fix C++11 throwing distructors
+
+For >=C++11, explicitly mark throwing destructors `noexcept(false)`
+
+Thanks: Peter-Levine <plevine457@gmail.com>
+---
+ Doxyfile.in | 2 +-
+ src/botantools/botan/alloc_mmap/mmap_mem.cpp | 2 +-
+ src/botantools/botan/botan/allocate.h | 8 +++++++-
+ src/botantools/botan/botan/mem_pool.h | 2 +-
+ src/botantools/botan/mem_pool.cpp | 2 +-
+ 5 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/Doxyfile.in b/Doxyfile.in
+index 59d9afe..844c234 100644
+--- a/Doxyfile.in
++++ b/Doxyfile.in
+@@ -1070,7 +1070,7 @@ PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS \
+ # The macro definition that is found in the sources will be used.
+ # Use the PREDEFINED tag if you want to use a different macro definition.
+
+-EXPAND_AS_DEFINED = QCA_EXPORT
++EXPAND_AS_DEFINED = QCA_EXPORT QCA_NOEXCEPT
+
+ # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+ # doxygen's preprocessor will remove all function-like macros that are alone
+diff --git a/src/botantools/botan/alloc_mmap/mmap_mem.cpp b/src/botantools/botan/alloc_mmap/mmap_mem.cpp
+index 362b688..54f0d23 100644
+--- a/src/botantools/botan/alloc_mmap/mmap_mem.cpp
++++ b/src/botantools/botan/alloc_mmap/mmap_mem.cpp
+@@ -107,7 +107,7 @@ void* MemoryMapping_Allocator::alloc_block(u32bit n)
+ umask(old_umask);
+ }
+
+- ~TemporaryFile()
++ ~TemporaryFile() QCA_NOEXCEPT(false)
+ {
+ delete[] filepath;
+ if(fd != -1 && close(fd) == -1)
+diff --git a/src/botantools/botan/botan/allocate.h b/src/botantools/botan/botan/allocate.h
+index 0ac351e..52bc397 100644
+--- a/src/botantools/botan/botan/allocate.h
++++ b/src/botantools/botan/botan/allocate.h
+@@ -40,6 +40,12 @@ namespace QCA { // WRAPNS_LINE
+ #include <string>
+ namespace QCA { // WRAPNS_LINE
+
++#if __cplusplus >= 201103L
++#define QCA_NOEXCEPT(x) noexcept(x)
++#else
++#define QCA_NOEXCEPT(x)
++#endif
++
+ namespace Botan {
+
+ /*************************************************
+@@ -58,7 +64,7 @@ class Allocator
+ virtual void init() {}
+ virtual void destroy() {}
+
+- virtual ~Allocator() {}
++ virtual ~Allocator() QCA_NOEXCEPT(false) {}
+ };
+
+ /*************************************************
+diff --git a/src/botantools/botan/botan/mem_pool.h b/src/botantools/botan/botan/mem_pool.h
+index 32834b8..1cb903e 100644
+--- a/src/botantools/botan/botan/mem_pool.h
++++ b/src/botantools/botan/botan/mem_pool.h
+@@ -63,7 +63,7 @@ class Pooling_Allocator : public Allocator
+ void destroy();
+
+ Pooling_Allocator(u32bit, bool);
+- ~Pooling_Allocator();
++ ~Pooling_Allocator() QCA_NOEXCEPT(false);
+ private:
+ void get_more_core(u32bit);
+ byte* allocate_blocks(u32bit);
+diff --git a/src/botantools/botan/mem_pool.cpp b/src/botantools/botan/mem_pool.cpp
+index 00280ec..baa47aa 100644
+--- a/src/botantools/botan/mem_pool.cpp
++++ b/src/botantools/botan/mem_pool.cpp
+@@ -171,7 +171,7 @@ Pooling_Allocator::Pooling_Allocator(u32bit p_size, bool) :
+ /*************************************************
+ * Pooling_Allocator Destructor *
+ *************************************************/
+-Pooling_Allocator::~Pooling_Allocator()
++Pooling_Allocator::~Pooling_Allocator() QCA_NOEXCEPT(false)
+ {
+ delete mutex;
+ if(blocks.size())
+--
+2.10.2
+
diff --git a/app-crypt/qca/qca-2.1.3.ebuild b/app-crypt/qca/qca-2.1.3.ebuild
index fc600e04fb7..4b9e9bf3429 100644
--- a/app-crypt/qca/qca-2.1.3.ebuild
+++ b/app-crypt/qca/qca-2.1.3.ebuild
@@ -55,6 +55,7 @@ DOCS=( README TODO )
PATCHES=(
"${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${P}-c++11.patch"
)
qca_plugin_use() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2016-04-19 14:21 Johannes Huber
0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2016-04-19 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 48dfd5bed3c6b04af0752d085f0e852a1dd1d13f
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 14:18:48 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 14:21:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48dfd5be
app-crypt/qca: Fix build with libressl 2.3.0
Revision bump adds two upstream patch to fix build with
>=dev-libs/libressl-2.3.0.
Gentoo-bug: 573278
Reported-by: maurerpe <junk4me46806 <AT> yahoo.com>
Package-Manager: portage-2.2.28
.../qca/files/qca-2.1.1-libressl-230-sha0.patch | 48 ++++++++
.../qca/files/qca-2.1.1-libressl-230-sslv3.patch | 28 +++++
app-crypt/qca/qca-2.1.1-r1.ebuild | 124 +++++++++++++++++++++
3 files changed, 200 insertions(+)
diff --git a/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch b/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch
new file mode 100644
index 0000000..3e112c6
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch
@@ -0,0 +1,48 @@
+commit 0dbed8eb38afd1561907a52283091c37e7b85156
+Author: Heiko Becker <heirecka@exherbo.org>
+Date: Thu Sep 24 23:05:21 2015 +0200
+
+ qca-ossl: Fix build without support for SHA-0
+
+ LibreSSL >= 2.3.0 removed support for SHA-0, so there's no EVP_sha
+ anymore.
+ Wikipedia says about SHA-0: "160-bit hash function published in 1993
+ under the name SHA. It was withdrawn shortly after publication due to
+ an undisclosed "significant flaw" and replaced by the slightly revised
+ version SHA-1.'
+
+ REVIEW: 125387
+
+diff --git a/plugins/qca-ossl/CMakeLists.txt b/plugins/qca-ossl/CMakeLists.txt
+index 3124f02..cdeaeca 100644
+--- a/plugins/qca-ossl/CMakeLists.txt
++++ b/plugins/qca-ossl/CMakeLists.txt
+@@ -25,6 +25,13 @@ if(OPENSSL_FOUND)
+ message(WARNING "qca-ossl will be compiled without AES CTR mode encryption support")
+ endif(HAVE_OPENSSL_AES_CTR)
+
++ check_function_exists(EVP_sha HAVE_OPENSSL_SHA0)
++ if(HAVE_OPENSSL_SHA0)
++ add_definitions(-DHAVE_OPENSSL_SHA0)
++ else(HAVE_OPENSSL_SHA0)
++ message(WARNING "qca-ossl will be compiled without SHA-0 digest algorithm support")
++ endif(HAVE_OPENSSL_SHA0)
++
+ set(QCA_OSSL_SOURCES qca-ossl.cpp)
+
+ my_automoc( QCA_OSSL_SOURCES )
+diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
+index b34ecc1..61d9e43 100644
+--- a/plugins/qca-ossl/qca-ossl.cpp
++++ b/plugins/qca-ossl/qca-ossl.cpp
+@@ -7135,8 +7135,10 @@ public:
+ return new opensslInfoContext(this);
+ else if ( type == "sha1" )
+ return new opensslHashContext( EVP_sha1(), this, type);
++#ifdef HAVE_OPENSSL_SHA0
+ else if ( type == "sha0" )
+ return new opensslHashContext( EVP_sha(), this, type);
++#endif
+ else if ( type == "ripemd160" )
+ return new opensslHashContext( EVP_ripemd160(), this, type);
+ #ifdef HAVE_OPENSSL_MD2
diff --git a/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch b/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch
new file mode 100644
index 0000000..accefc4
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch
@@ -0,0 +1,28 @@
+commit 20a587d77636186edb044cd2b71d6d90fe98d232
+Author: Heiko Becker <heirecka@exherbo.org>
+Date: Thu Sep 24 22:54:41 2015 +0200
+
+ qca-ossl: Fix build without SSLv3
+
+ This fixes building with LibreSSL >= 2.3.0 which has removed support
+ for SSLv3 completely. As far as I know OpenSSL can be configured to
+ build without it, so it might be helpful there as well.
+
+ REVIEW: 125386
+
+diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
+index cfb1e9f..b34ecc1 100644
+--- a/plugins/qca-ossl/qca-ossl.cpp
++++ b/plugins/qca-ossl/qca-ossl.cpp
+@@ -5403,9 +5403,11 @@ public:
+ ctx = SSL_CTX_new(SSLv2_client_method());
+ break;
+ #endif
++#ifndef OPENSSL_NO_SSL3_METHOD
+ case TLS::SSL_v3:
+ ctx = SSL_CTX_new(SSLv3_client_method());
+ break;
++#endif
+ case TLS::TLS_v1:
+ ctx = SSL_CTX_new(TLSv1_client_method());
+ break;
diff --git a/app-crypt/qca/qca-2.1.1-r1.ebuild b/app-crypt/qca/qca-2.1.1-r1.ebuild
new file mode 100644
index 0000000..158e45a
--- /dev/null
+++ b/app-crypt/qca/qca-2.1.1-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils multibuild qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="http://delta.affinix.com/qca/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+ !app-crypt/qca-cyrus-sasl
+ !app-crypt/qca-gnupg
+ !app-crypt/qca-logger
+ !app-crypt/qca-ossl
+ !app-crypt/qca-pkcs11
+ botan? ( dev-libs/botan )
+ gcrypt? ( dev-libs/libgcrypt:= )
+ gpg? ( app-crypt/gnupg )
+ nss? ( dev-libs/nss )
+ openssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ pkcs11? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-libs/pkcs11-helper
+ )
+ qt4? ( dev-qt/qtcore:4 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtnetwork:5
+ )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+
+DOCS=( README TODO )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${P}-libressl-230-sslv3.patch"
+ "${FILESDIR}/${P}-libressl-230-sha0.patch"
+)
+
+qca_plugin_use() {
+ echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+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 openssl ossl)
+ $(qca_plugin_use pkcs11)
+ $(qca_plugin_use sasl cyrus-sasl)
+ $(qca_plugin_use softstore)
+ -DBUILD_TESTS=$(usex test)
+ )
+
+ if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
+ mycmakeargs+=(-DQT4_BUILD=ON)
+ fi
+
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ mytest() {
+ local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+ cmake-utils_src_test
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+
+ if use doc; then
+ pushd "${BUILD_DIR}" >/dev/null || die
+ doxygen Doxyfile.in || die
+ dodoc -r apidocs/html
+ popd >/dev/null || die
+ fi
+
+ if use examples; then
+ dodoc -r "${S}"/examples
+ fi
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2015-11-10 16:29 Michael Palimaka
0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2015-11-10 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 2014b3fe8912bd8ac87346276973ca3513806897
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 8 14:05:22 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 16:29:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2014b3fe
app-crypt/qca: remove old
Package-Manager: portage-2.2.20.1
app-crypt/qca/Manifest | 1 -
app-crypt/qca/files/qca-2.0.2-pcfilespath.patch | 13 ---
app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch | 59 ----------
.../qca/files/qca-2.1.0.3-fix-signals-slots.patch | 28 -----
app-crypt/qca/qca-2.0.3-r1.ebuild | 80 -------------
app-crypt/qca/qca-2.1.0.3-r1.ebuild | 124 --------------------
app-crypt/qca/qca-2.1.0.3-r2.ebuild | 128 ---------------------
7 files changed, 433 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index e2549c9..151de0d 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,3 +1,2 @@
-DIST qca-2.0.3.tar.bz2 4530731 SHA256 8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f SHA512 c1120ffb373e294fbcc76e21dc2f503ebd3398b26d0ffa7ab7ee3a3e1a4228159358b59c2673ac4a1c2363771e61da54a5080b201c65d586ceda2e3b2facc1bb WHIRLPOOL 2efba46098490ab5a75dcdf95eeb7d81a5509a962403a44602caa126927ebe9e69cb043586dbaebf0b111b79e614b607ae851242d12af9fa17d2dd191e559b0e
DIST qca-2.1.1.tar.xz 688460 SHA256 95de3e7910b5f9ec7084169989c9d98bfb527e6a4865fe17269c3b24308be983 SHA512 f077b5a4cc6539e0880f4d0a615bebcf851f634e99c6c355522598204f625e5195e0cbc8a1976593669018e57eff95796c8fef69b1301b42cb18736bc8aa1abf WHIRLPOOL 454751a76f5e59aa09d6cc979bc26a490b23a2e5308f663400f45f38a95e6ad7a34428cffb1a2a82ec6958aa0b4418e0054503a58b43e0c172201cbaa7c669f8
DIST qca-qt5-2.1.0.3.tar.xz 685652 SHA256 ab0170696a8ff87588d38a72d36d0b4b42db9080c991d1a40ceb3f8311d289f9 SHA512 2f50c92d3ff927c83353b65ae56ff49a5c1ea439fcef94cea0092b718f04abcc18f455abd91337ac786fddedae980ff55c9d090b5743a96890174dc7eee4f3f1 WHIRLPOOL 9db2770b031dbf5c9c117d4150e0b395c94d8a0af1bda9fac5e1ee862a8a40f1c03fb0c4901e3aaba0b12e8c0b4e71cb55a872bbc54eea8331aff3fbe1fd853c
diff --git a/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch b/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch
deleted file mode 100644
index c52e8e7..0000000
--- a/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qca-2.0.2/configure
-===================================================================
---- qca-2.0.2.orig/configure
-+++ qca-2.0.2/configure
-@@ -937,7 +937,7 @@ public:
- if(!pcfiles.isEmpty())
- {
- str = QString(
-- "pcfiles.path = \$\$LIBDIR/pkgconfig\n"
-+ "pcfiles.path = \$\$LIBDIR/../pkgconfig\n"
- "pcfiles.files = %1\n"
- "INSTALLS += pcfiles\n"
- ).arg(pcfiles.join(" "));
diff --git a/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch b/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch
deleted file mode 100644
index 1752dff..0000000
--- a/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- trunk/kdesupport/qca/src/botantools/botan/botan/secmem.h 2012/01/14 16:09:19 1273507
-+++ trunk/kdesupport/qca/src/botantools/botan/botan/secmem.h 2012/01/14 17:12:15 1273508
-@@ -191,15 +191,15 @@
- {
- public:
- MemoryVector<T>& operator=(const MemoryRegion<T>& in)
-- { if(this != &in) set(in); return (*this); }
-+ { if(this != &in) this->set(in); return (*this); }
-
- MemoryVector(u32bit n = 0) { MemoryRegion<T>::init(false, n); }
- MemoryVector(const T in[], u32bit n)
-- { MemoryRegion<T>::init(false); set(in, n); }
-+ { MemoryRegion<T>::init(false); this->set(in, n); }
- MemoryVector(const MemoryRegion<T>& in)
-- { MemoryRegion<T>::init(false); set(in); }
-+ { MemoryRegion<T>::init(false); this->set(in); }
- MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
-- { MemoryRegion<T>::init(false); set(in1); append(in2); }
-+ { MemoryRegion<T>::init(false); this->set(in1); append(in2); }
- };
-
- /*************************************************
-@@ -210,15 +210,15 @@
- {
- public:
- SecureVector<T>& operator=(const MemoryRegion<T>& in)
-- { if(this != &in) set(in); return (*this); }
-+ { if(this != &in) this->set(in); return (*this); }
-
- SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
- SecureVector(const T in[], u32bit n)
-- { MemoryRegion<T>::init(true); set(in, n); }
-+ { MemoryRegion<T>::init(true); this->set(in, n); }
- SecureVector(const MemoryRegion<T>& in)
-- { MemoryRegion<T>::init(true); set(in); }
-+ { MemoryRegion<T>::init(true); this->set(in); }
- SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
-- { MemoryRegion<T>::init(true); set(in1); append(in2); }
-+ { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
- };
-
- /*************************************************
-@@ -229,14 +229,14 @@
- {
- public:
- SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
-- { if(this != &in) set(in); return (*this); }
-+ { if(this != &in) this->set(in); return (*this); }
-
- SecureBuffer() { MemoryRegion<T>::init(true, L); }
- SecureBuffer(const T in[], u32bit n)
- { MemoryRegion<T>::init(true, L); copy(in, n); }
- private:
- SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
-- { if(this != &in) set(in); return (*this); }
-+ { if(this != &in) this->set(in); return (*this); }
- };
-
- }
diff --git a/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch b/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch
deleted file mode 100644
index d03a178..0000000
--- a/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jan Grulich <jgrulich@redhat.com>
-Date: Thu, 17 Sep 2015 14:14:24 +0000
-Subject: Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers from include dir
-X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=66b9754170759d9333d5fc1e348642814d0310dd
----
-Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers from include dir
-REVIEW:125289
----
-
-
---- a/include/QtCrypto/qca_safetimer.h
-+++ b/include/QtCrypto/qca_safetimer.h
-@@ -44,12 +44,12 @@
- void setSingleShot(bool singleShot);
- int timerId() const;
-
--public slots:
-+public Q_SLOTS:
- void start(int msec);
- void start();
- void stop();
-
--signals:
-+Q_SIGNALS:
- void timeout();
-
- protected:
-
diff --git a/app-crypt/qca/qca-2.0.3-r1.ebuild b/app-crypt/qca/qca-2.0.3-r1.ebuild
deleted file mode 100644
index 13d9729..0000000
--- a/app-crypt/qca/qca-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils multilib qt4-r2
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/download/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="aqua debug doc examples gpg logger +openssl pkcs11 sasl"
-RESTRICT="test"
-
-DEPEND="dev-qt/qtcore:4[debug?]"
-RDEPEND="${DEPEND}
- !<app-crypt/qca-1.0-r3:0"
-
-PDEPEND="gpg? ( app-crypt/qca-gnupg )
- logger? ( app-crypt/qca-logger )
- openssl? ( app-crypt/qca-ossl )
- pkcs11? ( app-crypt/qca-pkcs11 )
- sasl? ( app-crypt/qca-cyrus-sasl )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.2-pcfilespath.patch \
- "${FILESDIR}"/${P}+gcc-4.7.patch
-
- if use aqua; then
- sed -i -e "s|QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME = -Wl,-install_name,|g" \
- src/src.pro || die
- fi
-}
-
-src_configure() {
- # Ensure proper rpath
- export EXTRA_QMAKE_RPATH="${EPREFIX}/usr/$(get_libdir)/qca2"
-
- ABI= ./configure \
- --prefix="${EPREFIX}"/usr \
- --qtdir="${EPREFIX}"/usr \
- --includedir="${EPREFIX}"/usr/include/qca2 \
- --libdir="${EPREFIX}"/usr/$(get_libdir)/qca2 \
- --certstore-path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
- --no-separate-debug-info \
- --disable-tests \
- --$(use debug && echo debug || echo release) \
- --no-framework \
- || die "configure failed"
-
- eqmake4
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install || die
- dodoc README TODO || die
-
- cat <<-EOF > "${WORKDIR}"/44qca2
- LDPATH="${EPREFIX}/usr/$(get_libdir)/qca2"
- EOF
- doenvd "${WORKDIR}"/44qca2 || die
-
- if use doc; then
- dohtml "${S}"/apidocs/html/* || die
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}/
- doins -r "${S}"/examples || die
- fi
-
- # add the proper rpath for packages that do CONFIG += crypto
- echo "QMAKE_RPATHDIR += \"${EPREFIX}/usr/$(get_libdir)/qca2\"" >> \
- "${D%/}${EPREFIX}/usr/share/qt4/mkspecs/features/crypto.prf" \
- || die "failed to add rpath to crypto.prf"
-}
diff --git a/app-crypt/qca/qca-2.1.0.3-r1.ebuild b/app-crypt/qca/qca-2.1.0.3-r1.ebuild
deleted file mode 100644
index 0557851..0000000
--- a/app-crypt/qca/qca-2.1.0.3-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multibuild qmake-utils
-
-MY_PN="${PN}-qt5"
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-IUSE="botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
- !app-crypt/qca-cyrus-sasl
- !app-crypt/qca-gnupg
- !app-crypt/qca-logger
- !app-crypt/qca-ossl
- !app-crypt/qca-pkcs11
- botan? ( dev-libs/botan )
- gcrypt? ( dev-libs/libgcrypt:= )
- gpg? ( app-crypt/gnupg )
- nss? ( dev-libs/nss )
- openssl? ( >=dev-libs/openssl-1.0.1:0 )
- pkcs11? (
- dev-libs/openssl:0
- dev-libs/pkcs11-helper
- )
- qt4? ( dev-qt/qtcore:4 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtconcurrent:5
- dev-qt/qtnetwork:5
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- qt4? ( dev-qt/qttest:4 )
- qt5? ( dev-qt/qttest:5 )
- )
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DOCS=( README TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${P}-qt55.patch"
- "${FILESDIR}/${P}-fix-signals-slots.patch"
-)
-
-qca_plugin_use() {
- echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-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 openssl ossl)
- $(qca_plugin_use pkcs11)
- $(qca_plugin_use sasl cyrus-sasl)
- $(qca_plugin_use softstore)
- $(cmake-utils_use_build test TESTS)
- )
-
- if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
- mycmakeargs+=(-DQT4_BUILD=ON)
- fi
-
- cmake-utils_src_configure
- }
-
- multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
- mytest() {
- local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
- cmake-utils_src_test
- }
-
- multibuild_foreach_variant mytest
-}
-
-src_install() {
- multibuild_foreach_variant cmake-utils_src_install
-
- if use doc; then
- pushd "${BUILD_DIR}" >/dev/null || die
- doxygen Doxyfile.in || die
- dodoc -r apidocs/html
- popd >/dev/null || die
- fi
-
- if use examples; then
- dodoc -r "${S}"/examples
- fi
-}
diff --git a/app-crypt/qca/qca-2.1.0.3-r2.ebuild b/app-crypt/qca/qca-2.1.0.3-r2.ebuild
deleted file mode 100644
index df34a8e..0000000
--- a/app-crypt/qca/qca-2.1.0.3-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multibuild qmake-utils
-
-MY_PN="${PN}-qt5"
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-IUSE="botan debug doc examples gcrypt gpg libressl logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
- !app-crypt/qca-cyrus-sasl
- !app-crypt/qca-gnupg
- !app-crypt/qca-logger
- !app-crypt/qca-ossl
- !app-crypt/qca-pkcs11
- botan? ( dev-libs/botan )
- gcrypt? ( dev-libs/libgcrypt:= )
- gpg? ( app-crypt/gnupg )
- nss? ( dev-libs/nss )
- openssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0 )
- libressl? ( dev-libs/libressl )
- )
- pkcs11? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- dev-libs/pkcs11-helper
- )
- qt4? ( dev-qt/qtcore:4 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtconcurrent:5
- dev-qt/qtnetwork:5
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- qt4? ( dev-qt/qttest:4 )
- qt5? ( dev-qt/qttest:5 )
- )
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DOCS=( README TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${P}-qt55.patch"
- "${FILESDIR}/${P}-fix-signals-slots.patch"
-)
-
-qca_plugin_use() {
- echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-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 openssl ossl)
- $(qca_plugin_use pkcs11)
- $(qca_plugin_use sasl cyrus-sasl)
- $(qca_plugin_use softstore)
- $(cmake-utils_use_build test TESTS)
- )
-
- if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
- mycmakeargs+=(-DQT4_BUILD=ON)
- fi
-
- cmake-utils_src_configure
- }
-
- multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
- mytest() {
- local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
- cmake-utils_src_test
- }
-
- multibuild_foreach_variant mytest
-}
-
-src_install() {
- multibuild_foreach_variant cmake-utils_src_install
-
- if use doc; then
- pushd "${BUILD_DIR}" >/dev/null || die
- doxygen Doxyfile.in || die
- dodoc -r apidocs/html
- popd >/dev/null || die
- fi
-
- if use examples; then
- dodoc -r "${S}"/examples
- fi
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
@ 2015-09-24 19:14 Michael Palimaka
0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2015-09-24 19:14 UTC (permalink / raw
To: gentoo-commits
commit: 8144af61e7bb3fa892bbc5d563bc7a5b5074e2ee
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Sep 23 22:00:02 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 19:13:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8144af61
app-crypt/qca: Add upstream fix to use Q_SLOTS/Q_SIGNALS
Fixes build of kde-plasma/plasma-nm-9999 (and possibly others)
RR: https://git.reviewboard.kde.org/r/125289/
Upstream Commit: 66b9754170759d9333d5fc1e348642814d0310dd
Package-Manager: portage-2.2.20.1
.../qca/files/qca-2.1.0.3-fix-signals-slots.patch | 28 +++++
app-crypt/qca/qca-2.1.0.3-r1.ebuild | 124 +++++++++++++++++++++
2 files changed, 152 insertions(+)
diff --git a/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch b/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch
new file mode 100644
index 0000000..d03a178
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch
@@ -0,0 +1,28 @@
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Thu, 17 Sep 2015 14:14:24 +0000
+Subject: Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers from include dir
+X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=66b9754170759d9333d5fc1e348642814d0310dd
+---
+Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers from include dir
+REVIEW:125289
+---
+
+
+--- a/include/QtCrypto/qca_safetimer.h
++++ b/include/QtCrypto/qca_safetimer.h
+@@ -44,12 +44,12 @@
+ void setSingleShot(bool singleShot);
+ int timerId() const;
+
+-public slots:
++public Q_SLOTS:
+ void start(int msec);
+ void start();
+ void stop();
+
+-signals:
++Q_SIGNALS:
+ void timeout();
+
+ protected:
+
diff --git a/app-crypt/qca/qca-2.1.0.3-r1.ebuild b/app-crypt/qca/qca-2.1.0.3-r1.ebuild
new file mode 100644
index 0000000..0557851
--- /dev/null
+++ b/app-crypt/qca/qca-2.1.0.3-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multibuild qmake-utils
+
+MY_PN="${PN}-qt5"
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="http://delta.affinix.com/qca/"
+SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+IUSE="botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+ !app-crypt/qca-cyrus-sasl
+ !app-crypt/qca-gnupg
+ !app-crypt/qca-logger
+ !app-crypt/qca-ossl
+ !app-crypt/qca-pkcs11
+ botan? ( dev-libs/botan )
+ gcrypt? ( dev-libs/libgcrypt:= )
+ gpg? ( app-crypt/gnupg )
+ nss? ( dev-libs/nss )
+ openssl? ( >=dev-libs/openssl-1.0.1:0 )
+ pkcs11? (
+ dev-libs/openssl:0
+ dev-libs/pkcs11-helper
+ )
+ qt4? ( dev-qt/qtcore:4 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtnetwork:5
+ )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DOCS=( README TODO )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${P}-qt55.patch"
+ "${FILESDIR}/${P}-fix-signals-slots.patch"
+)
+
+qca_plugin_use() {
+ echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+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 openssl ossl)
+ $(qca_plugin_use pkcs11)
+ $(qca_plugin_use sasl cyrus-sasl)
+ $(qca_plugin_use softstore)
+ $(cmake-utils_use_build test TESTS)
+ )
+
+ if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
+ mycmakeargs+=(-DQT4_BUILD=ON)
+ fi
+
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ mytest() {
+ local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+ cmake-utils_src_test
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+
+ if use doc; then
+ pushd "${BUILD_DIR}" >/dev/null || die
+ doxygen Doxyfile.in || die
+ dodoc -r apidocs/html
+ popd >/dev/null || die
+ fi
+
+ if use examples; then
+ dodoc -r "${S}"/examples
+ fi
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-07-25 8:23 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-09 5:57 [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-07-25 8:23 Andreas Sturmlechner
2023-04-13 18:50 Sam James
2021-04-07 8:36 Andreas Sturmlechner
2021-03-05 10:52 Andreas Sturmlechner
2021-01-24 13:03 Andreas Sturmlechner
2018-06-06 15:11 Andreas Sturmlechner
2017-06-09 16:39 Johannes Huber
2017-03-21 10:42 Alon Bar-Lev
2016-04-19 14:21 Johannes Huber
2015-11-10 16:29 Michael Palimaka
2015-09-24 19:14 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox