[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: 01e8e204e37ed56d0904f79d655ee8eed3ae19d1
Author: Saki Xi riseup net>
AuthorDate: Sat Mar 9 17:09:47 2024 +
Commit: orbea riseup net>
CommitDate: Sat Mar 9 18:46:55 2024 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=01e8e204
app-crypt/qca: rm 2.3.7 - stable 2.3.8
Signed-off-by: Saki Xi riseup.net>
Closes: https://github.com/gentoo/libressl/pull/551
Signed-off-by: orbea riseup.net>
app-crypt/qca/Manifest | 1 -
app-crypt/qca/qca-2.3.7.ebuild | 119 -
app-crypt/qca/qca-2.3.8.ebuild | 2 +-
3 files changed, 1 insertion(+), 121 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 567eac9..6b18c45 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.3.7.tar.xz 745880 BLAKE2B
87a029a3cca93f14c764a105e8f0b3c2a32a39ab16ea34e60fe155712ecd351dcb8d67659228ad339db7e3b572ce8ca9c50b9cdc2a5bf8511b482329497843ee
SHA512
8932c3ea82378cacd408f787dbfd38a5ffe7a9a5e4c90a53a44b9a386c827f70b19094d4188d5ace8dc0a9c84caa4b242aa85967ef5948591e8d74d7cf3109f6
DIST qca-2.3.8.tar.xz 761340 BLAKE2B
04ec8d2fb9c2c00b04407828c549a4bb7d8bf6cda2f1071078dd446b8fc90c89872b2a4dc838bcb4eb34132545365be210c0043bde95c084901661a874600b34
SHA512
ddb410214e8264955c2bb8c68d018e3826cb8ec48f8cc7207c2aec1c36051dc0501455b5049eff927dcf354603c0646f86ca10f2cebebe87789b3fd07a993b68
diff --git a/app-crypt/qca/qca-2.3.7.ebuild b/app-crypt/qca/qca-2.3.7.ebuild
deleted file mode 100644
index bac8c53..000
--- a/app-crypt/qca/qca-2.3.7.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}/${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
-
-
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: 722314219c787d76452b4f0b220cc301bad5
Author: orbea riseup net>
AuthorDate: Sun Feb 25 02:33:08 2024 +
Commit: orbea riseup net>
CommitDate: Sun Feb 25 02:33:08 2024 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=72231421
app-crypt/qca: sync keywords with ::gentoo
Signed-off-by: orbea riseup.net>
app-crypt/qca/qca-2.3.7.ebuild | 2 +-
app-crypt/qca/qca-2.3.8.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-crypt/qca/qca-2.3.7.ebuild b/app-crypt/qca/qca-2.3.7.ebuild
index 5e965b1..bac8c53 100644
--- a/app-crypt/qca/qca-2.3.7.ebuild
+++ b/app-crypt/qca/qca-2.3.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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 )"
diff --git a/app-crypt/qca/qca-2.3.8.ebuild b/app-crypt/qca/qca-2.3.8.ebuild
index 06a67a3..67174b3 100644
--- a/app-crypt/qca/qca-2.3.8.ebuild
+++ b/app-crypt/qca/qca-2.3.8.ebuild
@@ -11,7 +11,7 @@ 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"
+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 )"
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: ec1377319ea0df9db28d9b92a0c702b3cd5d266a
Author: orbea riseup net>
AuthorDate: Sun Jan 14 20:31:36 2024 +
Commit: orbea riseup net>
CommitDate: Sun Jan 14 20:31:36 2024 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ec137731
app-crypt/qca: add 2.3.8
Signed-off-by: orbea riseup.net>
app-crypt/qca/Manifest | 1 +
app-crypt/qca/qca-2.3.8.ebuild | 119 +
2 files changed, 120 insertions(+)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 8d29745..567eac9 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1 +1,2 @@
DIST qca-2.3.7.tar.xz 745880 BLAKE2B
87a029a3cca93f14c764a105e8f0b3c2a32a39ab16ea34e60fe155712ecd351dcb8d67659228ad339db7e3b572ce8ca9c50b9cdc2a5bf8511b482329497843ee
SHA512
8932c3ea82378cacd408f787dbfd38a5ffe7a9a5e4c90a53a44b9a386c827f70b19094d4188d5ace8dc0a9c84caa4b242aa85967ef5948591e8d74d7cf3109f6
+DIST qca-2.3.8.tar.xz 761340 BLAKE2B
04ec8d2fb9c2c00b04407828c549a4bb7d8bf6cda2f1071078dd446b8fc90c89872b2a4dc838bcb4eb34132545365be210c0043bde95c084901661a874600b34
SHA512
ddb410214e8264955c2bb8c68d018e3826cb8ec48f8cc7207c2aec1c36051dc0501455b5049eff927dcf354603c0646f86ca10f2cebebe87789b3fd07a993b68
diff --git a/app-crypt/qca/qca-2.3.8.ebuild b/app-crypt/qca/qca-2.3.8.ebuild
new file mode 100644
index 000..06a67a3
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.8.ebuild
@@ -0,0 +1,119 @@
+# 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
+
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: c4fc72afb6085c1717155ecfe9a5774c6a33c3e4
Author: orbea riseup net>
AuthorDate: Sun Jan 14 20:17:59 2024 +
Commit: orbea riseup net>
CommitDate: Sun Jan 14 20:17:59 2024 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c4fc72af
app-crypt/qca: sync ::gentoo
Signed-off-by: orbea riseup.net>
app-crypt/qca/metadata.xml | 1 +
app-crypt/qca/qca-2.3.7.ebuild | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
index c8d4880..10256dd 100644
--- a/app-crypt/qca/metadata.xml
+++ b/app-crypt/qca/metadata.xml
@@ -11,6 +11,7 @@
https://bugs.kde.org/
+ libraries/qca
Enable botan plugin
diff --git a/app-crypt/qca/qca-2.3.7.ebuild b/app-crypt/qca/qca-2.3.7.ebuild
index 4f26ec6..5e965b1 100644
--- a/app-crypt/qca/qca-2.3.7.ebuild
+++ b/app-crypt/qca/qca-2.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -40,12 +40,12 @@ DEPEND="${RDEPEND}
dev-qt/qtnetwork:5
dev-qt/qttest:5
)
- qt6? ( dev-qt/qtbase:6[network,test] )
+ qt6? ( dev-qt/qtbase:6[network] )
)
"
BDEPEND="
doc? (
- app-doc/doxygen[dot]
+ app-text/doxygen[dot]
virtual/latex-base
)
"
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: e6fc8ee07fb69f9f5da03a65b046bf887b19296d
Author: orbea riseup net>
AuthorDate: Sun Aug 6 21:03:23 2023 +
Commit: orbea riseup net>
CommitDate: Sun Aug 6 21:03:23 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e6fc8ee0
app-crypt/qca: drop 2.3.6-r1, 2.3.6-r2
Signed-off-by: orbea riseup.net>
app-crypt/qca/Manifest| 1 -
app-crypt/qca/qca-2.3.6-r1.ebuild | 90 -
app-crypt/qca/qca-2.3.6-r2.ebuild | 118 --
3 files changed, 209 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index e75edf1..8d29745 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-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/qca-2.3.6-r1.ebuild
b/app-crypt/qca/qca-2.3.6-r1.ebuild
deleted file mode 100644
index a77e87f..000
--- a/app-crypt/qca/qca-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore
+ssl test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-qt/qtcore-5.14:5
- botan? ( dev-libs/botan:3= )
- gcrypt? ( dev-libs/libgcrypt:= )
- gpg? ( app-crypt/gnupg )
- nss? ( dev-libs/nss )
- pkcs11? (
- >=dev-libs/openssl-1.1
- dev-libs/pkcs11-helper
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
- ssl? ( >=dev-libs/openssl-1.1:= )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-BDEPEND="
- doc? (
- app-doc/doxygen[dot]
- virtual/latex-base
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${PN}-2.3.4-libressl.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
-}
diff --git a/app-crypt/qca/qca-2.3.6-r2.ebuild
b/app-crypt/qca/qca-2.3.6-r2.ebuild
deleted file mode 100644
index 317d18d..000
--- a/app-crypt/qca/qca-2.3.6-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: 9003606d319cdcdd57f1d9057ddf58e8e9a0e570
Author: orbea riseup net>
AuthorDate: Thu Aug 3 17:37:58 2023 +
Commit: orbea riseup net>
CommitDate: Thu Aug 3 17:37:58 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9003606d
app-crypt/qca: stabilize 2.3.7 for amd64, arm64, x86
Signed-off-by: orbea riseup.net>
app-crypt/qca/qca-2.3.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-crypt/qca/qca-2.3.7.ebuild b/app-crypt/qca/qca-2.3.7.ebuild
index b20e26a..4f26ec6 100644
--- a/app-crypt/qca/qca-2.3.7.ebuild
+++ b/app-crypt/qca/qca-2.3.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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 )"
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/files/, app-crypt/qca/
commit: 58627f1617a3f5dcb5b2f1c771a266cc5fcafe94
Author: orbea riseup net>
AuthorDate: Wed Jul 26 14:39:29 2023 +
Commit: orbea riseup net>
CommitDate: Wed Jul 26 14:39:29 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=58627f16
app-crypt/qca: add 2.3.7
Signed-off-by: orbea 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.7.ebuild | 119 +
3 files changed, 149 insertions(+)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index dab7687..e75edf1 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 000..e16fa76
--- /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
+Date: Mon, 24 Jul 2023 13:32:30 +
+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 000..b20e26a
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.7.ebuild
@@ -0,0 +1,119 @@
+# 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}-2.3.4-libressl.patch"
+ "${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
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/files/, app-crypt/qca/
commit: ec47cda8eadca7faba22bbece20b2100b2ad86a1
Author: orbea riseup net>
AuthorDate: Wed Jul 12 19:02:36 2023 +
Commit: orbea riseup net>
CommitDate: Wed Jul 12 19:02:36 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ec47cda8
app-crypt/qca: drop 2.3.5-r1
Signed-off-by: orbea riseup.net>
app-crypt/qca/Manifest | 1 -
app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch | 54 -
app-crypt/qca/qca-2.3.5-r1.ebuild | 91 --
3 files changed, 146 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 4581cb6..dab7687 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.3.5.tar.xz 741036 BLAKE2B
3948dc9b58a8ef03eec246cc14c7582d30e2513ea4b8f457a44d4a0c8f91fdb10af041f7cc342a0c8d9540a43cb47b4ca5b35641dfc3716c065fc3a1d6ff227a
SHA512
656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96
DIST qca-2.3.6.tar.xz 745864 BLAKE2B
a3a5955215504b5703db304f241ae9c0c9b243c280cacb6180f631b3259b5f9a8af1c08b233f70e8e4130ac2e957dc3d8a99817b4dec2df0fab41b39bc54f8c8
SHA512
018bde919df28cfc9e5d6c5ad30724199a1a17437022751fb92bfc1ce691d8a56c62b661526e346f5a0c5ff7ffd556499f2ee25efe9f8b1698b3f8eee480811c
diff --git a/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch
b/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch
deleted file mode 100644
index c9c581e..000
--- a/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/904234
-https://invent.kde.org/libraries/qca/-/commit/33a35a699928318032f62eab0e39e263c604ad9e
-https://invent.kde.org/libraries/qca/-/commit/714073747c4a3ccff7a8c85c72872bdf6bd3db4a
-
-From 33a35a699928318032f62eab0e39e263c604ad9e Mon Sep 17 00:00:00 2001
-From: Pino Toscano
-Date: Sat, 22 Oct 2022 13:51:17 +0200
-Subject: [PATCH] hashunittest: run sha384longtest only for providers that
- support sha384
-
-Fixes commit bdb0e9d37d78ec8e01d4008dba5243afe9029346 that accidentally
-left the wrong logic when refactoring the file, and makes the check as
-done in the other longtest tests.
a/unittest/hashunittest/hashunittest.cpp
-+++ b/unittest/hashunittest/hashunittest.cpp
-@@ -581,7 +581,7 @@ void HashUnitTest::sha384longtest()
- fillerString.fill('a', 1000);
-
- foreach (QString provider, providersToTest) {
--if (!QCA::isSupported("sha384", provider)) {
-+if (QCA::isSupported("sha384", provider)) {
- // QTime t;
- // t.start();
- QCA::Hash shaHash(QStringLiteral("sha384"), provider);
---
-GitLab
-
-From 714073747c4a3ccff7a8c85c72872bdf6bd3db4a Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid
-Date: Mon, 20 Feb 2023 00:19:19 +0100
-Subject: [PATCH] Remove test that openssl has decided it's wrong
-
a/unittest/pkits/pkits.cpp
-+++ b/unittest/pkits/pkits.cpp
-@@ -256,6 +256,9 @@ void Pkits::pkits4_1_4()
-
- void Pkits::pkits4_1_5()
- {
-+// openssl has decided that they don't want to support this ¯\_(ツ)_/¯
-+// https://github.com/openssl/openssl/issues/20233
-+#if 0
- QStringList providersToTest;
- providersToTest.append(QStringLiteral("qca-ossl"));
-
-@@ -298,6 +301,7 @@ void Pkits::pkits4_1_5()
- QCOMPARE(cert.validate(trusted, untrusted), QCA::ValidityGood);
- }
- }
-+#endif
- }
-
- void Pkits::pkits4_1_6()
---
-GitLab
diff --git a/app-crypt/qca/qca-2.3.5-r1.ebuild
b/app-crypt/qca/qca-2.3.5-r1.ebuild
deleted file mode 100644
index c15cc19..000
--- a/app-crypt/qca/qca-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore
+ssl test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-qt/qtcore-5.14:5
- botan? ( dev-libs/botan:2= )
- gcrypt? ( dev-libs/libgcrypt:= )
- gpg? ( app-crypt/gnupg )
- nss? ( dev-libs/nss )
- pkcs11? (
- >=dev-libs/openssl-1.1
- dev-libs/pkcs11-helper
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
- ssl? ( >=dev-libs/openssl-1.1:= )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-BDEPEND="
- doc? (
- app-doc/doxygen[dot]
- virtual/latex-base
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
-
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: a9c18db57bb88c67a54b317d671f8614e5a5c4be
Author: orbea riseup net>
AuthorDate: Wed Jun 28 00:22:43 2023 +
Commit: orbea riseup net>
CommitDate: Wed Jun 28 00:22:43 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a9c18db5
app-crypt/qca: stabilize 2.3.6-r1 for arm64, x86
Signed-off-by: orbea riseup.net>
app-crypt/qca/qca-2.3.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-crypt/qca/qca-2.3.6-r1.ebuild
b/app-crypt/qca/qca-2.3.6-r1.ebuild
index 3a78f78..a77e87f 100644
--- a/app-crypt/qca/qca-2.3.6-r1.ebuild
+++ b/app-crypt/qca/qca-2.3.6-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos"
IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore
+ssl test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: 8bcf17a0e99cccd54f2a7fc80efa4d585272f935
Author: orbea riseup net>
AuthorDate: Wed Jun 21 15:38:34 2023 +
Commit: orbea riseup net>
CommitDate: Wed Jun 21 15:38:34 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8bcf17a0
app-crypt/qca: sync ::gentoo
Signed-off-by: orbea riseup.net>
app-crypt/qca/qca-2.3.6-r2.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-crypt/qca/qca-2.3.6-r2.ebuild
b/app-crypt/qca/qca-2.3.6-r2.ebuild
index d2d0386..317d18d 100644
--- a/app-crypt/qca/qca-2.3.6-r2.ebuild
+++ b/app-crypt/qca/qca-2.3.6-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake kde.org multibuild qmake-utils
+inherit cmake kde.org multibuild out-of-source-utils qmake-utils
DESCRIPTION="Qt Cryptographic Architecture (QCA)"
HOMEPAGE="https://userbase.kde.org/QCA;
@@ -92,6 +92,9 @@ src_configure() {
src_compile() {
multibuild_foreach_variant cmake_src_compile
+ if use doc; then
+ multibuild_for_best_variant cmake_build doc
+ fi
}
src_test() {
@@ -106,10 +109,7 @@ src_install() {
multibuild_foreach_variant cmake_src_install
if use doc; then
- pushd "${BUILD_DIR}" >/dev/null || die
- doxygen Doxyfile || die
- dodoc -r apidocs/html
- popd >/dev/null || die
+ multibuild_for_best_variant run_in_build_dir dodoc -r
apidocs/html
fi
if use examples; then
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: 727bf1e1dad9610059a5ebe014687a8b1d622f05
Author: orbea riseup net>
AuthorDate: Wed Jun 14 14:38:01 2023 +
Commit: orbea riseup net>
CommitDate: Wed Jun 14 14:38:01 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=727bf1e1
app-crypt/qca: add 2.3.6-r2
Signed-off-by: orbea riseup.net>
app-crypt/qca/qca-2.3.6-r2.ebuild | 118 ++
1 file changed, 118 insertions(+)
diff --git a/app-crypt/qca/qca-2.3.6-r2.ebuild
b/app-crypt/qca/qca-2.3.6-r2.ebuild
new file mode 100644
index 000..d2d0386
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.6-r2.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 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}/${PN}-2.3.4-libressl.patch"
+)
+
+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
+}
+
+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
+ 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
+}
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: 0b4893b1a9a779ec223e955c92c94da22007d1ce
Author: orbea riseup net>
AuthorDate: Wed May 31 14:48:59 2023 +
Commit: orbea riseup net>
CommitDate: Wed May 31 14:48:59 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=0b4893b1
app-crypt/qca: unkeyword 2.3.5-r1 for ~sparc-solaris
Signed-off-by: orbea riseup.net>
app-crypt/qca/qca-2.3.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-crypt/qca/qca-2.3.5-r1.ebuild
b/app-crypt/qca/qca-2.3.5-r1.ebuild
index b64abeb..c15cc19 100644
--- a/app-crypt/qca/qca-2.3.5-r1.ebuild
+++ b/app-crypt/qca/qca-2.3.5-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos"
IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore
+ssl test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: 97d0e79e9e11661701e879445720a5e658717841
Author: Saki Xi riseup net>
AuthorDate: Tue May 30 12:56:43 2023 +
Commit: orbea riseup net>
CommitDate: Tue May 30 13:12:08 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=97d0e79e
app-crypt/qca: sync ::gentoo
Signed-off-by: Saki Xi riseup.net>
Closes: https://github.com/gentoo/libressl/pull/530
Signed-off-by: orbea riseup.net>
app-crypt/qca/qca-2.3.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-crypt/qca/qca-2.3.6-r1.ebuild
b/app-crypt/qca/qca-2.3.6-r1.ebuild
index 99b6f59..3a78f78 100644
--- a/app-crypt/qca/qca-2.3.6-r1.ebuild
+++ b/app-crypt/qca/qca-2.3.6-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos"
IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore
+ssl test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: 9bbe6101cecbb98b30966bebf6730a04ce1fe273
Author: orbea riseup net>
AuthorDate: Wed May 10 18:58:08 2023 +
Commit: orbea riseup net>
CommitDate: Wed May 10 18:58:08 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9bbe6101
app-crypt/qca: add 2.3.6-r1
Signed-off-by: orbea riseup.net>
app-crypt/qca/Manifest| 1 +
app-crypt/qca/qca-2.3.6-r1.ebuild | 90 +++
2 files changed, 91 insertions(+)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 64a596a..4581cb6 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1 +1,2 @@
DIST qca-2.3.5.tar.xz 741036 BLAKE2B
3948dc9b58a8ef03eec246cc14c7582d30e2513ea4b8f457a44d4a0c8f91fdb10af041f7cc342a0c8d9540a43cb47b4ca5b35641dfc3716c065fc3a1d6ff227a
SHA512
656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96
+DIST qca-2.3.6.tar.xz 745864 BLAKE2B
a3a5955215504b5703db304f241ae9c0c9b243c280cacb6180f631b3259b5f9a8af1c08b233f70e8e4130ac2e957dc3d8a99817b4dec2df0fab41b39bc54f8c8
SHA512
018bde919df28cfc9e5d6c5ad30724199a1a17437022751fb92bfc1ce691d8a56c62b661526e346f5a0c5ff7ffd556499f2ee25efe9f8b1698b3f8eee480811c
diff --git a/app-crypt/qca/qca-2.3.6-r1.ebuild
b/app-crypt/qca/qca-2.3.6-r1.ebuild
new file mode 100644
index 000..99b6f59
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.6-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake kde.org qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="https://userbase.kde.org/QCA;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore
+ssl test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-qt/qtcore-5.14:5
+ botan? ( dev-libs/botan:3= )
+ gcrypt? ( dev-libs/libgcrypt:= )
+ gpg? ( app-crypt/gnupg )
+ nss? ( dev-libs/nss )
+ pkcs11? (
+ >=dev-libs/openssl-1.1
+ dev-libs/pkcs11-helper
+ )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ ssl? ( >=dev-libs/openssl-1.1:= )
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ )
+"
+BDEPEND="
+ doc? (
+ app-doc/doxygen[dot]
+ virtual/latex-base
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${PN}-2.3.4-libressl.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
+}
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/, app-crypt/qca/files/
commit: 3744eccc05fd490fb578d26107d884e487bee283
Author: orbea riseup net>
AuthorDate: Wed May 10 18:53:46 2023 +
Commit: orbea riseup net>
CommitDate: Wed May 10 18:53:46 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3744eccc
app-crypt/qca: sync ::gentoo
Signed-off-by: orbea 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 000..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
+Date: Sat, 22 Oct 2022 13:51:17 +0200
+Subject: [PATCH] hashunittest: run sha384longtest only for providers that
+ support sha384
+
+Fixes commit bdb0e9d37d78ec8e01d4008dba5243afe9029346 that accidentally
+left the wrong logic when refactoring the file, and makes the check as
+done in the other longtest tests.
+--- a/unittest/hashunittest/hashunittest.cpp
b/unittest/hashunittest/hashunittest.cpp
+@@ -581,7 +581,7 @@ void HashUnitTest::sha384longtest()
+ fillerString.fill('a', 1000);
+
+ foreach (QString provider, providersToTest) {
+-if (!QCA::isSupported("sha384", provider)) {
++if (QCA::isSupported("sha384", provider)) {
+ // QTime t;
+ // t.start();
+ QCA::Hash shaHash(QStringLiteral("sha384"), provider);
+--
+GitLab
+
+From 714073747c4a3ccff7a8c85c72872bdf6bd3db4a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid
+Date: Mon, 20 Feb 2023 00:19:19 +0100
+Subject: [PATCH] Remove test that openssl has decided it's wrong
+
+--- a/unittest/pkits/pkits.cpp
b/unittest/pkits/pkits.cpp
+@@ -256,6 +256,9 @@ void Pkits::pkits4_1_4()
+
+ void Pkits::pkits4_1_5()
+ {
++// openssl has decided that they don't want to support this ¯\_(ツ)_/¯
++// https://github.com/openssl/openssl/issues/20233
++#if 0
+ QStringList providersToTest;
+ providersToTest.append(QStringLiteral("qca-ossl"));
+
+@@ -298,6 +301,7 @@ void Pkits::pkits4_1_5()
+ QCOMPARE(cert.validate(trusted, untrusted), QCA::ValidityGood);
+ }
+ }
++#endif
+ }
+
+ void Pkits::pkits4_1_6()
+--
+GitLab
diff --git a/app-crypt/qca/qca-2.3.5-r1.ebuild
b/app-crypt/qca/qca-2.3.5-r1.ebuild
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"
)
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: ffa42b33992b2977a7b9ea3c8d5302fc3b3c9773
Author: Saki Xi riseup net>
AuthorDate: Wed Apr 12 12:57:18 2023 +
Commit: orbea riseup net>
CommitDate: Wed Apr 12 20:23:19 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ffa42b33
app-crypt/qca: version bump, upstream sync
Signed-off-by: Saki Xi riseup.net>
Closes: https://github.com/gentoo/libressl/pull/528
Signed-off-by: orbea riseup.net>
app-crypt/qca/Manifest | 1 -
app-crypt/qca/qca-2.3.4.ebuild | 85 --
.../qca/{qca-2.3.5.ebuild => qca-2.3.5-r1.ebuild} | 6 +-
3 files changed, 3 insertions(+), 89 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 4dcbbe8..64a596a 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.3.4.tar.xz 737072 BLAKE2B
64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703
SHA512
af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8
DIST qca-2.3.5.tar.xz 741036 BLAKE2B
3948dc9b58a8ef03eec246cc14c7582d30e2513ea4b8f457a44d4a0c8f91fdb10af041f7cc342a0c8d9540a43cb47b4ca5b35641dfc3716c065fc3a1d6ff227a
SHA512
656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96
diff --git a/app-crypt/qca/qca-2.3.4.ebuild b/app-crypt/qca/qca-2.3.4.ebuild
deleted file mode 100644
index 32e9394..000
--- a/app-crypt/qca/qca-2.3.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~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 )"
-
-RDEPEND="
- >=dev-qt/qtcore-5.14: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:= )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${P}-libressl.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
-}
diff --git a/app-crypt/qca/qca-2.3.5.ebuild b/app-crypt/qca/qca-2.3.5-r1.ebuild
similarity index 93%
rename from app-crypt/qca/qca-2.3.5.ebuild
rename to app-crypt/qca/qca-2.3.5-r1.ebuild
index 2991efa..0239b62 100644
--- a/app-crypt/qca/qca-2.3.5.ebuild
+++ b/app-crypt/qca/qca-2.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,14 +11,14 @@ 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 ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~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? (
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: 7a82073c1f8e9c2f8b4a6659cf21718406e0ec2c
Author: Saki Xi riseup net>
AuthorDate: Wed Nov 30 13:03:10 2022 +
Commit: Quentin Retornaz retornaz com>
CommitDate: Thu Dec 1 18:17:27 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=7a82073c
Bump qca, use same patch
Signed-off-by: Saki Xi riseup.net>
Signed-off-by: Quentin Retornaz retornaz.com>
app-crypt/qca/Manifest | 1 +
app-crypt/qca/qca-2.3.5.ebuild | 90 ++
2 files changed, 91 insertions(+)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index aad1181..4dcbbe8 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1 +1,2 @@
DIST qca-2.3.4.tar.xz 737072 BLAKE2B
64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703
SHA512
af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8
+DIST qca-2.3.5.tar.xz 741036 BLAKE2B
3948dc9b58a8ef03eec246cc14c7582d30e2513ea4b8f457a44d4a0c8f91fdb10af041f7cc342a0c8d9540a43cb47b4ca5b35641dfc3716c065fc3a1d6ff227a
SHA512
656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96
diff --git a/app-crypt/qca/qca-2.3.5.ebuild b/app-crypt/qca/qca-2.3.5.ebuild
new file mode 100644
index 000..2991efa
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake kde.org qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="https://userbase.kde.org/QCA;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore
+ssl test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-qt/qtcore-5.14:5
+ botan? ( dev-libs/botan:= )
+ gcrypt? ( dev-libs/libgcrypt:= )
+ gpg? ( app-crypt/gnupg )
+ nss? ( dev-libs/nss )
+ pkcs11? (
+ >=dev-libs/openssl-1.1
+ dev-libs/pkcs11-helper
+ )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ ssl? ( >=dev-libs/openssl-1.1:= )
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ )
+"
+BDEPEND="
+ doc? (
+ app-doc/doxygen[dot]
+ virtual/latex-base
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${PN}-2.3.4-libressl.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
+}
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/files/, app-crypt/qca/
commit: 896edbbf9188b6770754c75abe2256a803c4fc55
Author: orbea riseup net>
AuthorDate: Sat Jun 4 04:27:18 2022 +
Commit: Quentin Retornaz retornaz com>
CommitDate: Sun Jun 5 01:45:39 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=896edbbf
app-crypt/qca: Remove old versions
Signed-off-by: orbea riseup.net>
Closes: https://github.com/gentoo/libressl/pull/416
Signed-off-by: Quentin Retornaz retornaz.com>
app-crypt/qca/Manifest | 2 -
app-crypt/qca/files/qca-2.2.0-libressl.patch | 116 ---
app-crypt/qca/files/qca-2.3.0-libressl.patch | 68
app-crypt/qca/files/qca-2.3.1-libressl.patch | 104
app-crypt/qca/qca-2.3.0.ebuild | 87
app-crypt/qca/qca-2.3.1.ebuild | 87
6 files changed, 464 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index a5a57d8..aad1181 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,3 +1 @@
-DIST qca-2.3.0.tar.xz 729504 BLAKE2B
71cf9dfae00066c14e1055da1fa1a8e1210f538b1addfde1b99a9b26b1e8f7dd61e289d0f505b5ec04d5f4745216d4fd0f8be8f8de9e9cbf74123907ba703d0e
SHA512
ca9251868e073834562fa62ffc64b3e7817c9ddadc6bc3fb99cf8b5c8d859969562170a98874be9590c617b2dd8e5590d2c83792554f54bb880c677902db22fe
-DIST qca-2.3.1.tar.xz 725984 BLAKE2B
a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052
SHA512
092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021
DIST qca-2.3.4.tar.xz 737072 BLAKE2B
64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703
SHA512
af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8
diff --git a/app-crypt/qca/files/qca-2.2.0-libressl.patch
b/app-crypt/qca/files/qca-2.2.0-libressl.patch
deleted file mode 100644
index 537dd11..000
--- a/app-crypt/qca/files/qca-2.2.0-libressl.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 3cfe5c3a7cfbf0b7351dedb64785b837667fc0b1 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin
-Date: Wed, 2 Oct 2019 17:28:44 +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
- plugins/qca-ossl/ossl110-compat.h | 35 +--
- plugins/qca-ossl/qca-ossl.cpp | 10 -
- 2 files changed, 24 insertions(+), 21 deletions(-)
-
-diff --git a/plugins/qca-ossl/ossl110-compat.h
b/plugins/qca-ossl/ossl110-compat.h
-index b320707..0a8b49b 100644
a/plugins/qca-ossl/ossl110-compat.h
-+++ b/plugins/qca-ossl/ossl110-compat.h
-@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int
(*priv_dec) (int flen, con
- return 1;
- }
-
--static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const
unsigned char *m,
--unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const
RSA *rsa))
--{
--if (!meth) return 0;
--meth->rsa_sign = sign;
--return 1;
--}
--
--static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype,
const unsigned char *m,
--unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen,
const RSA *rsa))
--{
--if (!meth) return 0;
--meth->rsa_verify = verify;
--return 1;
--}
--
- static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
- {
- if (!meth) return 0;
-@@ -272,4 +256,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
-
- #endif // OPENSSL_VERSION_NUMBER < 0x1010L
-
-+#if (OPENSSL_VERSION_NUMBER < 0x1010L) || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x300fL)
-+static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const
unsigned char *m,
-+unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const
RSA *rsa))
-+{
-+if (!meth) return 0;
-+meth->rsa_sign = sign;
-+return 1;
-+}
-+
-+static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype,
const unsigned char *m,
-+unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen,
const RSA *rsa))
-+{
-+if (!meth) return 0;
-+meth->rsa_verify = verify;
-+return 1;
-+}
-+#endif // (OPENSSL_VERSION_NUMBER < 0x1010L) ||
defined(LIBRESSL_VERSION_NUMBER)
-+
- #endif // OSSL110COMPAT_H
-diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index 11ecdc9..75c48fc 100644
a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -62,12 +62,12 @@
- #endif
-
- // OpenSSL 1.1.0
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/files/, app-crypt/qca/
commit: 5af83b8575d6b469c6fac13d87c6e8d34c87da51
Author: orbea riseup net>
AuthorDate: Sat Jun 4 04:26:09 2022 +
Commit: Quentin Retornaz retornaz com>
CommitDate: Sun Jun 5 01:45:35 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=5af83b85
app-crypt/qca: Updated for version 2.3.4
Signed-off-by: orbea riseup.net>
Signed-off-by: Quentin Retornaz retornaz.com>
app-crypt/qca/Manifest | 1 +
app-crypt/qca/files/qca-2.3.4-libressl.patch | 103 +++
app-crypt/qca/metadata.xml | 45 ++--
app-crypt/qca/qca-2.3.4.ebuild | 85 ++
4 files changed, 211 insertions(+), 23 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index df985ae..a5a57d8 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1,3 @@
DIST qca-2.3.0.tar.xz 729504 BLAKE2B
71cf9dfae00066c14e1055da1fa1a8e1210f538b1addfde1b99a9b26b1e8f7dd61e289d0f505b5ec04d5f4745216d4fd0f8be8f8de9e9cbf74123907ba703d0e
SHA512
ca9251868e073834562fa62ffc64b3e7817c9ddadc6bc3fb99cf8b5c8d859969562170a98874be9590c617b2dd8e5590d2c83792554f54bb880c677902db22fe
DIST qca-2.3.1.tar.xz 725984 BLAKE2B
a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052
SHA512
092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021
+DIST qca-2.3.4.tar.xz 737072 BLAKE2B
64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703
SHA512
af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8
diff --git a/app-crypt/qca/files/qca-2.3.4-libressl.patch
b/app-crypt/qca/files/qca-2.3.4-libressl.patch
new file mode 100644
index 000..8bee8ad
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.4-libressl.patch
@@ -0,0 +1,103 @@
+From aa07e1eacdbfeefa5ff21c5d7e45ce9e02e91dbb Mon Sep 17 00:00:00 2001
+From: Stefan Strogin
+Date: Fri, 3 Jun 2022 21:11:45 -0700
+Subject: [PATCH] LibreSSL 3.0.x support
+
+---
+ plugins/qca-ossl/qca-ossl.cpp | 25 -
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
+index b2c5d3d..79775cd 100644
+--- a/plugins/qca-ossl/qca-ossl.cpp
b/plugins/qca-ossl/qca-ossl.cpp
+@@ -44,7 +44,13 @@
+ #include
+ #endif
+
++#ifndef RSA_F_RSA_OSSL_PRIVATE_DECRYPT
++#define RSA_F_RSA_OSSL_PRIVATE_DECRYPT RSA_F_RSA_EAY_PRIVATE_DECRYPT
++#endif
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ #include
++#endif
+
+ using namespace QCA;
+
+@@ -1254,6 +1260,7 @@ public:
+ protected:
+ };
+
++#ifndef LIBRESSL_VERSION_NUMBER
+ class opensslHkdfContext : public HKDFContext
+ {
+ Q_OBJECT
+@@ -1286,6 +1293,7 @@ public:
+ return out;
+ }
+ };
++#endif // LIBRESSL_VERSION_NUMBER
+
+ class opensslHMACContext : public MACContext
+ {
+@@ -4993,7 +5001,11 @@ public:
+ case TLS::TLS_v1:
+ ctx = SSL_CTX_new(TLS_client_method());
+ SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
++#ifdef TLS1_3_VERSION
+ SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION);
++#else
++SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION);
++#endif
+ break;
+ case TLS::DTLS_v1:
+ default:
+@@ -5014,7 +5026,11 @@ public:
+ QStringList cipherList;
+ for (int i = 0; i < sk_SSL_CIPHER_num(sk); ++i) {
+ const SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i);
++#ifndef LIBRESSL_VERSION_NUMBER
+ cipherList +=
QString::fromLatin1(SSL_CIPHER_standard_name(thisCipher));
++#else
++cipherList +=
QString::fromLatin1(SSL_CIPHER_get_name(thisCipher));
++#endif
+ }
+ sk_SSL_CIPHER_free(sk);
+
+@@ -5386,8 +5402,11 @@ public:
+ qDebug("unexpected version response");
+ sessInfo.version = TLS::TLS_v1;
+ }
+-
++#ifndef LIBRESSL_VERSION_NUMBER
+ sessInfo.cipherSuite =
QString::fromLatin1(SSL_CIPHER_standard_name(SSL_get_current_cipher(ssl)));
++#else
++sessInfo.cipherSuite =
QString::fromLatin1(SSL_CIPHER_get_name(SSL_get_current_cipher(ssl)));
++#endif
+
+ sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl,
&(sessInfo.cipherBits));
+
+@@ -6687,7 +6706,9 @@ public:
+ #endif
+ list += QStringLiteral("pbkdf1(sha1)");
+ list += QStringLiteral("pbkdf2(sha1)");
++#ifndef LIBRESSL_VERSION_NUMBER
+ list += QStringLiteral("hkdf(sha256)");
++#endif // LIBRESSL_VERSION_NUMBER
+ list += QStringLiteral("pkey");
+ list += QStringLiteral("dlgroup");
+ list += QStringLiteral("rsa");
+@@ -6756,8 +6777,10 @@ public:
+ #endif
+ else if (type == QLatin1String("pbkdf2(sha1)"))
+
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/files/, app-crypt/qca/
commit: bffe57b626ad8540ac37e4569947a3b33d8032e6
Author: Stefan Strogin gentoo org>
AuthorDate: Wed Jul 8 06:05:12 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Wed Jul 8 06:05:12 2020 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=bffe57b6
app-crypt/qca: upgrade to 2.3.1
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Stefan Strogin gentoo.org>
app-crypt/qca/Manifest | 1 +
app-crypt/qca/files/qca-2.3.1-libressl.patch | 104 +++
app-crypt/qca/qca-2.3.1.ebuild | 91 +++
3 files changed, 196 insertions(+)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index b72a547..0694198 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1,3 @@
DIST qca-2.2.1.tar.xz 691676 BLAKE2B
d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379
SHA512
3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
DIST qca-2.3.0.tar.xz 729504 BLAKE2B
71cf9dfae00066c14e1055da1fa1a8e1210f538b1addfde1b99a9b26b1e8f7dd61e289d0f505b5ec04d5f4745216d4fd0f8be8f8de9e9cbf74123907ba703d0e
SHA512
ca9251868e073834562fa62ffc64b3e7817c9ddadc6bc3fb99cf8b5c8d859969562170a98874be9590c617b2dd8e5590d2c83792554f54bb880c677902db22fe
+DIST qca-2.3.1.tar.xz 725984 BLAKE2B
a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052
SHA512
092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021
diff --git a/app-crypt/qca/files/qca-2.3.1-libressl.patch
b/app-crypt/qca/files/qca-2.3.1-libressl.patch
new file mode 100644
index 000..0424378
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.1-libressl.patch
@@ -0,0 +1,104 @@
+From 56f60bc221d88e0753494c3e7ee320dc0f9de030 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin
+Date: Wed, 26 Feb 2020 04:41:28 +0200
+Subject: [PATCH] Fix build with LibreSSL
+
+Signed-off-by: Stefan Strogin
+---
+ plugins/qca-ossl/qca-ossl.cpp | 24
+ 1 file changed, 24 insertions(+)
+
+diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
+index ee872d72..4ee5d7c8 100644
+--- a/plugins/qca-ossl/qca-ossl.cpp
b/plugins/qca-ossl/qca-ossl.cpp
+@@ -41,7 +41,13 @@
+ #include
+ #include
+
++#ifndef RSA_F_RSA_OSSL_PRIVATE_DECRYPT
++#define RSA_F_RSA_OSSL_PRIVATE_DECRYPT RSA_F_RSA_EAY_PRIVATE_DECRYPT
++#endif
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ #include
++#endif
+
+ using namespace QCA;
+
+@@ -1262,6 +1268,7 @@ public:
+ protected:
+ };
+
++#ifndef LIBRESSL_VERSION_NUMBER
+ class opensslHkdfContext : public HKDFContext
+ {
+ Q_OBJECT
+@@ -1291,6 +1298,7 @@ public:
+ return out;
+ }
+ };
++#endif // LIBRESSL_VERSION_NUMBER
+
+ class opensslHMACContext : public MACContext
+ {
+@@ -4990,7 +4998,11 @@ public:
+ case TLS::TLS_v1:
+ ctx = SSL_CTX_new(TLS_client_method());
+ SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
++#ifdef TLS1_3_VERSION
+ SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION);
++#else
++ SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION);
++#endif
+ break;
+ case TLS::DTLS_v1:
+ default:
+@@ -5011,7 +5023,11 @@ public:
+ QStringList cipherList;
+ for(int i = 0; i < sk_SSL_CIPHER_num(sk); ++i) {
+ const SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk,
i);
++#ifndef LIBRESSL_VERSION_NUMBER
+ cipherList +=
QString::fromLatin1(SSL_CIPHER_standard_name(thisCipher));
++#else
++ cipherList +=
QString::fromLatin1(SSL_CIPHER_get_name(thisCipher));
++#endif
+ }
+ sk_SSL_CIPHER_free(sk);
+
+@@ -5404,7 +5420,11 @@ public:
+ sessInfo.version = TLS::TLS_v1;
+ }
+
++#ifndef LIBRESSL_VERSION_NUMBER
+ sessInfo.cipherSuite =
QString::fromLatin1(SSL_CIPHER_standard_name(SSL_get_current_cipher(ssl)));
++#else
++ sessInfo.cipherSuite =
QString::fromLatin1(SSL_CIPHER_get_name(SSL_get_current_cipher(ssl)));
++#endif
+
+ sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl,
&(sessInfo.cipherBits));
+
+@@ -6751,7 +6771,9 @@ public:
+ #endif
+ list += QStringLiteral("pbkdf1(sha1)");
+ list += QStringLiteral("pbkdf2(sha1)");
++#ifndef LIBRESSL_VERSION_NUMBER
+ list += QStringLiteral("hkdf(sha256)");
++#endif
+ list += QStringLiteral("pkey");
+ list += QStringLiteral("dlgroup");
+ list += QStringLiteral("rsa");
+@@ -6820,8 +6842,10 @@ public:
+ #endif
+
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: 8a9966d2461b9eb79d118768f11806142dc12069
Author: Stefan Strogin gentoo org>
AuthorDate: Wed Jul 8 06:06:17 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Wed Jul 8 06:06:17 2020 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8a9966d2
app-crypt/qca: drop old 2.2.1
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Stefan Strogin gentoo.org>
app-crypt/qca/Manifest | 1 -
app-crypt/qca/qca-2.2.1.ebuild | 91 --
2 files changed, 92 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 0694198..df985ae 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,3 +1,2 @@
-DIST qca-2.2.1.tar.xz 691676 BLAKE2B
d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379
SHA512
3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
DIST qca-2.3.0.tar.xz 729504 BLAKE2B
71cf9dfae00066c14e1055da1fa1a8e1210f538b1addfde1b99a9b26b1e8f7dd61e289d0f505b5ec04d5f4745216d4fd0f8be8f8de9e9cbf74123907ba703d0e
SHA512
ca9251868e073834562fa62ffc64b3e7817c9ddadc6bc3fb99cf8b5c8d859969562170a98874be9590c617b2dd8e5590d2c83792554f54bb880c677902db22fe
DIST qca-2.3.1.tar.xz 725984 BLAKE2B
a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052
SHA512
092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021
diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
deleted file mode 100644
index 48cd52e..000
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 libressl 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? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- dev-libs/pkcs11-helper
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${PN}-2.2.0-libressl.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
-}
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/files/, app-crypt/qca/
commit: d471fcc439ce9bf0e920d69de3680819a4986d89
Author: Stefan Strogin gentoo org>
AuthorDate: Wed Feb 26 03:42:41 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Wed Feb 26 03:42:49 2020 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d471fcc4
app-crypt/qca: add LibreSSL patch for 2.3.0
Bug: https://bugs.gentoo.org/657720
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Stefan Strogin gentoo.org>
app-crypt/qca/Manifest | 1 +
app-crypt/qca/files/qca-2.3.0-libressl.patch | 68 +
app-crypt/qca/qca-2.3.0.ebuild | 91
3 files changed, 160 insertions(+)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 20d0b5f..b72a547 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1 +1,2 @@
DIST qca-2.2.1.tar.xz 691676 BLAKE2B
d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379
SHA512
3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
+DIST qca-2.3.0.tar.xz 729504 BLAKE2B
71cf9dfae00066c14e1055da1fa1a8e1210f538b1addfde1b99a9b26b1e8f7dd61e289d0f505b5ec04d5f4745216d4fd0f8be8f8de9e9cbf74123907ba703d0e
SHA512
ca9251868e073834562fa62ffc64b3e7817c9ddadc6bc3fb99cf8b5c8d859969562170a98874be9590c617b2dd8e5590d2c83792554f54bb880c677902db22fe
diff --git a/app-crypt/qca/files/qca-2.3.0-libressl.patch
b/app-crypt/qca/files/qca-2.3.0-libressl.patch
new file mode 100644
index 000..c06ba60
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.0-libressl.patch
@@ -0,0 +1,68 @@
+From c3001c187f91a6eccfcb75828876f03f5310d283 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin
+Date: Wed, 26 Feb 2020 04:41:28 +0200
+Subject: [PATCH] Fix build with LibreSSL
+
+Signed-off-by: Stefan Strogin
+---
+ plugins/qca-ossl/qca-ossl.cpp | 12
+ 1 file changed, 12 insertions(+)
+
+diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
+index 559dc3f6..5ba9f1e7 100644
+--- a/plugins/qca-ossl/qca-ossl.cpp
b/plugins/qca-ossl/qca-ossl.cpp
+@@ -41,7 +41,13 @@
+ #include
+ #include
+
++#ifndef RSA_F_RSA_OSSL_PRIVATE_DECRYPT
++#define RSA_F_RSA_OSSL_PRIVATE_DECRYPT RSA_F_RSA_EAY_PRIVATE_DECRYPT
++#endif
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ #include
++#endif
+
+ using namespace QCA;
+
+@@ -1255,6 +1261,7 @@ public:
+ protected:
+ };
+
++#ifndef LIBRESSL_VERSION_NUMBER
+ class opensslHkdfContext : public HKDFContext
+ {
+ Q_OBJECT
+@@ -1284,6 +1291,7 @@ public:
+ return out;
+ }
+ };
++#endif // LIBRESSL_VERSION_NUMBER
+
+ class opensslHMACContext : public MACContext
+ {
+@@ -7268,7 +7276,9 @@ public:
+ #endif
+ list += QStringLiteral("pbkdf1(sha1)");
+ list += QStringLiteral("pbkdf2(sha1)");
++#ifndef LIBRESSL_VERSION_NUMBER
+ list += QStringLiteral("hkdf(sha256)");
++#endif
+ list += QStringLiteral("pkey");
+ list += QStringLiteral("dlgroup");
+ list += QStringLiteral("rsa");
+@@ -7337,8 +7347,10 @@ public:
+ #endif
+ else if ( type == QLatin1String("pbkdf2(sha1)") )
+ return new opensslPbkdf2Context( this, type );
++#ifndef LIBRESSL_VERSION_NUMBER
+ else if ( type == QLatin1String("hkdf(sha256)") )
+ return new opensslHkdfContext( this, type );
++#endif
+ else if ( type == QLatin1String("hmac(md5)") )
+ return new opensslHMACContext( EVP_md5(), this, type );
+ else if ( type == QLatin1String("hmac(sha1)") )
+--
+2.25.1
+
diff --git a/app-crypt/qca/qca-2.3.0.ebuild b/app-crypt/qca/qca-2.3.0.ebuild
new file mode 100644
index 000..ebe13eb
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 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 libressl 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? (
+ !libressl? ( >=dev-libs/openssl-1.1 )
+ libressl? ( dev-libs/libressl:0= )
+ dev-libs/pkcs11-helper
+ )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ ssl? (
+
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: ca50ec49c022566889fc7d4aed77e60a4f68da77
Author: Stefan Strogin gentoo org>
AuthorDate: Fri Feb 7 08:53:29 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Fri Feb 7 08:53:29 2020 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ca50ec49
app-crypt/qca: sync; 2.2.1 stable for amd64, arm64, x86
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Stefan Strogin gentoo.org>
app-crypt/qca/qca-2.2.1.ebuild | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
index dcb155a..48cd52e 100644
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ b/app-crypt/qca/qca-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
DESCRIPTION="Qt Cryptographic Architecture (QCA)"
HOMEPAGE="https://userbase.kde.org/QCA;
@@ -11,9 +11,10 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl
softstore +ssl test"
+RESTRICT="!test? ( test )"
BDEPEND="
doc? ( app-doc/doxygen )
@@ -66,16 +67,16 @@ src_configure() {
$(qca_plugin_use ssl ossl)
-DBUILD_TESTS=$(usex test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_test() {
local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
- cmake-utils_src_test
+ cmake_src_test
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
if use doc; then
pushd "${BUILD_DIR}" >/dev/null || die
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: aeee44e5ca8883a1d165ce1821d1543d07923854
Author: Stefan Strogin gentoo org>
AuthorDate: Fri Feb 7 08:54:03 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Fri Feb 7 08:54:03 2020 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=aeee44e5
app-crypt/qca: drop old 2.2.0
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Stefan Strogin gentoo.org>
app-crypt/qca/Manifest | 1 -
app-crypt/qca/qca-2.2.0.ebuild | 90 --
2 files changed, 91 deletions(-)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index d6c3d27..20d0b5f 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.2.0.tar.xz 691264 BLAKE2B
3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf
SHA512
2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
DIST qca-2.2.1.tar.xz 691676 BLAKE2B
d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379
SHA512
3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
diff --git a/app-crypt/qca/qca-2.2.0.ebuild b/app-crypt/qca/qca-2.2.0.ebuild
deleted file mode 100644
index 5810c4b..000
--- a/app-crypt/qca/qca-2.2.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris"
-
-IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl
softstore +ssl 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? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- dev-libs/pkcs11-helper
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${P}-libressl.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-utils_src_configure
-}
-
-src_test() {
- local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
- cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_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
-}
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/files/
commit: 3e69b18db758fe808a7bcdf339504c80a84cb241
Author: Stefan Strogin gentoo org>
AuthorDate: Wed Oct 2 14:33:40 2019 +
Commit: Stefan Strogin gentoo org>
CommitDate: Wed Oct 2 14:33:40 2019 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3e69b18d
app-crypt/qca: update patch for LibreSSL 3.0.x support
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Stefan Strogin gentoo.org>
app-crypt/qca/files/qca-2.2.0-libressl.patch | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/app-crypt/qca/files/qca-2.2.0-libressl.patch
b/app-crypt/qca/files/qca-2.2.0-libressl.patch
index f4c2f01..537dd11 100644
--- a/app-crypt/qca/files/qca-2.2.0-libressl.patch
+++ b/app-crypt/qca/files/qca-2.2.0-libressl.patch
@@ -1,6 +1,6 @@
-From bfc0dd038fea35f004867867935eb695b958f849 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin
-Date: Fri, 5 Apr 2019 09:17:23 +0300
+From 3cfe5c3a7cfbf0b7351dedb64785b837667fc0b1 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin
+Date: Wed, 2 Oct 2019 17:28:44 +0300
Subject: [PATCH] Fix build with LibreSSL
Provide RSA_meth_set_{sign,verify} for LibreSSL.
@@ -8,14 +8,14 @@ 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
+Signed-off-by: Stefan Strogin
---
- plugins/qca-ossl/ossl110-compat.h | 34 ---
+ plugins/qca-ossl/ossl110-compat.h | 35 +--
plugins/qca-ossl/qca-ossl.cpp | 10 -
- 2 files changed, 23 insertions(+), 21 deletions(-)
+ 2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/plugins/qca-ossl/ossl110-compat.h
b/plugins/qca-ossl/ossl110-compat.h
-index b320707..d093e50 100644
+index b320707..0a8b49b 100644
--- a/plugins/qca-ossl/ossl110-compat.h
+++ b/plugins/qca-ossl/ossl110-compat.h
@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int
(*priv_dec) (int flen, con
@@ -41,11 +41,12 @@ index b320707..d093e50 100644
static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
{
if (!meth) return 0;
-@@ -272,4 +256,22 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
+@@ -272,4 +256,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
#endif // OPENSSL_VERSION_NUMBER < 0x1010L
-+#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x1010L) || \
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x300fL)
+static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const
unsigned char *m,
+unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const
RSA *rsa))
+{
@@ -111,5 +112,5 @@ index 11ecdc9..75c48fc 100644
return new opensslHkdfContext( this, type );
#endif
--
-2.21.0
+2.23.0
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/
commit: c88f8f1da607d7e3aa902863ae8ffc1ba0bfedea
Author: Stefan Strogin gmail com>
AuthorDate: Sun May 5 05:09:57 2019 +
Commit: Stefan Strogin gmail com>
CommitDate: Sun May 5 05:09:57 2019 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c88f8f1d
app-crypt/qca: bump version to 2.2.1
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Stefan Strogin gmail.com>
app-crypt/qca/Manifest | 1 +
app-crypt/qca/qca-2.2.1.ebuild | 90 ++
2 files changed, 91 insertions(+)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 421d83e..d6c3d27 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1 +1,2 @@
DIST qca-2.2.0.tar.xz 691264 BLAKE2B
3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf
SHA512
2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
+DIST qca-2.2.1.tar.xz 691676 BLAKE2B
d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379
SHA512
3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
new file mode 100644
index 000..5cfce39
--- /dev/null
+++ b/app-crypt/qca/qca-2.2.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-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 ~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 sasl
softstore +ssl 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? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-libs/pkcs11-helper
+ )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${PN}-2.2.0-libressl.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-utils_src_configure
+}
+
+src_test() {
+ local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+ cmake-utils_src_test
+}
+
+src_install() {
+ cmake-utils_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
+}
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/, app-crypt/qca/files/
commit: 656e54a46c18a478a03b9ff1d860fa03ef1d240e
Author: Stefan Strogin gmail com>
AuthorDate: Thu Apr 11 18:42:04 2019 +
Commit: Stefan Strogin gmail com>
CommitDate: Thu Apr 11 18:42:29 2019 +
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 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
-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
---
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 < 0x1010L
@@ -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
+ #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
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/files/, app-crypt/qca/
commit: 19114816f2468b127302df95af1ba3ec1f577136
Author: Stefan Strogin gmail com>
AuthorDate: Sun Apr 7 21:15:02 2019 +
Commit: Stefan Strogin gmail com>
CommitDate: Sun Apr 7 21:15:02 2019 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=19114816
app-crypt/qca: add package from gentoo.git; patch for LibreSSL
Bug: https://bugs.gentoo.org/657720
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Stefan Strogin gmail.com>
app-crypt/qca/Manifest | 1 +
.../qca/files/qca-2.2.0_pre20180606-libressl.patch | 81 +++
app-crypt/qca/files/qca-disable-pgp-test.patch | 13
app-crypt/qca/metadata.xml | 26 +++
app-crypt/qca/qca-2.2.0_pre20180606.ebuild | 90 ++
5 files changed, 211 insertions(+)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
new file mode 100644
index 000..f525059
--- /dev/null
+++ b/app-crypt/qca/Manifest
@@ -0,0 +1 @@
+DIST qca-2.2.0_pre20180606.tar.xz 700756 BLAKE2B
0204854a664f211e9289cd4609938fd21e62de5bec5d7f5a99843a12483c960b6f8cc7392dc84bcf0676220411106bf7f23c5059d4f7031791fe9a3259d21d2c
SHA512
78f9f8ebc726e95768034c580d5ac30933f7c06e026b7daad04f11477dc623e4267895e409f7830c5149e620876dcc524278ef569956d03820b0864d629c4df8
diff --git a/app-crypt/qca/files/qca-2.2.0_pre20180606-libressl.patch
b/app-crypt/qca/files/qca-2.2.0_pre20180606-libressl.patch
new file mode 100644
index 000..2f6d461
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.2.0_pre20180606-libressl.patch
@@ -0,0 +1,81 @@
+From 32e4f55732e42103cd7ba5e84ddd086bf8103948 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin
+Date: Fri, 5 Apr 2019 09:57:14 +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.
+
+Upstream-Status: Submitted [https://phabricator.kde.org/D20259]
+Signed-off-by: Stefan Strogin
+---
+ plugins/qca-ossl/ossl110-compat.h | 34 ---
+ plugins/qca-ossl/qca-ossl.cpp | 2 +-
+ 2 files changed, 19 insertions(+), 17 deletions(-)
+
+diff --git a/plugins/qca-ossl/ossl110-compat.h
b/plugins/qca-ossl/ossl110-compat.h
+index ec15475..2d47835 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
+ return 1;
+ }
+
+-static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const
unsigned char *m,
+-unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const
RSA *rsa))
+-{
+-if (!meth) return 0;
+-meth->rsa_sign = sign;
+-return 1;
+-}
+-
+-static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype,
const unsigned char *m,
+-unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen,
const RSA *rsa))
+-{
+-if (!meth) return 0;
+-meth->rsa_verify = verify;
+-return 1;
+-}
+-
+ 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)
+
+ #endif // OPENSSL_VERSION_NUMBER < 0x1010L
+
++#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(LIBRESSL_VERSION_NUMBER)
++static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const
unsigned char *m,
++unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const
RSA *rsa))
++{
++if (!meth) return 0;
++meth->rsa_sign = sign;
++return 1;
++}
++
++static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype,
const unsigned char *m,
++unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen,
const RSA *rsa))
++{
++if (!meth) return 0;
++meth->rsa_verify = verify;
++return 1;
++}
++#endif // (OPENSSL_VERSION_NUMBER < 0x1010L) ||
defined(LIBRESSL_VERSION_NUMBER)
++
+ #endif // OSSL110COMPAT_H
+diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
+index 39dbc2b..1216bef 100644
+--- a/plugins/qca-ossl/qca-ossl.cpp
b/plugins/qca-ossl/qca-ossl.cpp
+@@ -61,7 +61,7 @@
+ #endif
+
+ // OpenSSL 1.1.0 compatibility macros
+-#ifdef OSSL_110
++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
+ #define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
+ #define RSA_F_RSA_EAY_PRIVATE_DECRYPT RSA_F_RSA_OSSL_PRIVATE_DECRYPT
+ #endif
+--
+2.21.0
+
diff --git a/app-crypt/qca/files/qca-disable-pgp-test.patch
b/app-crypt/qca/files/qca-disable-pgp-test.patch
new file mode 100644
index 000..7944e3c
--- /dev/null
+++ b/app-crypt/qca/files/qca-disable-pgp-test.patch
@@ -0,0 +1,13 @@
+diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
+index f4d9eb9..67ef281 100644
+--- a/unittest/CMakeLists.txt
b/unittest/CMakeLists.txt
+@@ -23,7 +23,7 @@ add_subdirectory(keylengthunittest)
+
