From f466ea34f19c87fa528916aa3f2abfbe58ee4a1f Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 30 May 2025 22:08:49 +0100 Subject: [PATCH] dev-libs/pkcs11-helper: Import from Gentoo as dep of gnupg-pkcs11-scd Signed-off-by: James Le Cuirot --- .../workflows/portage-stable-packages-list | 1 + .../dev-libs/pkcs11-helper/Manifest | 1 + ...1.29.0-incompatible-func-ptr-clang16.patch | 30 +++++++++++++ .../dev-libs/pkcs11-helper/metadata.xml | 13 ++++++ .../pkcs11-helper-1.29.0-r1.ebuild | 45 +++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/files/pkcs11-helper-1.29.0-incompatible-func-ptr-clang16.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0-r1.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 47a5cea8fa..755302b031 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -283,6 +283,7 @@ dev-libs/nspr dev-libs/oniguruma dev-libs/opensc dev-libs/openssl +dev-libs/pkcs11-helper dev-libs/popt dev-libs/protobuf dev-libs/raft diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/Manifest new file mode 100644 index 0000000000..9db4112de5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/Manifest @@ -0,0 +1 @@ +DIST pkcs11-helper-1.29.0.tar.bz2 422549 BLAKE2B fec72ac82f1545fc50f80b5b28db12906df32fa3bc65f80541d8bee7f1d1c8062f1f0516344237424022c01d4f390e8a72e3e0262250f3b6c51df92c768d81ee SHA512 c530f5a4b5826a02bfe787a1293a7595d5a0d6348daa16675bd10c6d6734b1f24a3cc73b5b89433cf1edf8815f8b7298fdfd1ed686f096bb5edfb425e9430eb2 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/files/pkcs11-helper-1.29.0-incompatible-func-ptr-clang16.patch b/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/files/pkcs11-helper-1.29.0-incompatible-func-ptr-clang16.patch new file mode 100644 index 0000000000..5b1036b999 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/files/pkcs11-helper-1.29.0-incompatible-func-ptr-clang16.patch @@ -0,0 +1,30 @@ +https://github.com/OpenSC/pkcs11-helper/commit/744001c1424b2d178272194d64e3356824ecdcdc +https://github.com/OpenSC/pkcs11-helper/issues/60 +https://bugs.gentoo.org/880975 + +From 744001c1424b2d178272194d64e3356824ecdcdc Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev +Date: Sat, 12 Nov 2022 02:24:58 +0200 +Subject: [PATCH] openssl: fix openssl_ex_data_dup prototype + +--- a/lib/pkcs11h-openssl.c ++++ b/lib/pkcs11h-openssl.c +@@ -340,7 +340,7 @@ int + __pkcs11h_openssl_ex_data_dup ( + CRYPTO_EX_DATA *to, + CRYPTO_EX_DATA *from, +- void *from_d, ++ void **from_d, + int idx, + long argl, + void *argp +@@ -350,7 +350,7 @@ int + __pkcs11h_openssl_ex_data_dup ( + CRYPTO_EX_DATA *to, + const CRYPTO_EX_DATA *from, +- void *from_d, ++ void **from_d, + int idx, + long argl, + void *argp + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/metadata.xml new file mode 100644 index 0000000000..6af095d1fc --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/metadata.xml @@ -0,0 +1,13 @@ + + + + + + Enable NSS crypto engine + + + cpe:/a:opensc-project:opensc + opensc + OpenSC/pkcs11-helper + + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0-r1.ebuild new file mode 100644 index 0000000000..350f5b24b5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="PKCS#11 helper library" +HOMEPAGE="https://github.com/OpenSC/pkcs11-helper" +SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2" + +LICENSE="|| ( BSD GPL-2 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +IUSE="doc gnutls nss test" +# Fails trying to load /usr/lib/pkcs11/provider.so? +RESTRICT="!test? ( test ) test" + +RDEPEND=">=dev-libs/openssl-0.9.7:= + gnutls? ( >=net-libs/gnutls-1.4.4:= ) + nss? ( dev-libs/nss )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + doc? ( >=app-text/doxygen-1.4.7 )" + +PATCHES=( + "${FILESDIR}/${P}-incompatible-func-ptr-clang16.patch" +) + +src_configure() { + econf \ + --disable-crypto-engine-polarssl \ + --disable-crypto-engine-mbedtls \ + $(use_enable doc) \ + $(use_enable gnutls crypto-engine-gnutls) \ + $(use_enable nss crypto-engine-nss) \ + $(use_enable test tests) +} + +src_install() { + default + + # bug #555262 + rm "${ED}"/usr/share/doc/${PF}/COPYING.{BSD,GPL} || die + + find "${ED}" -name '*.la' -delete || die +}