commit:     baf30bc5c6cffe18b356d7a366143c8d7101eb48
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 16:02:22 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 16:02:22 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baf30bc5

dev-libs/opensc: add 0.26.1

Closes: https://bugs.gentoo.org/944991
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/opensc/Manifest                           |  1 +
 .../opensc/files/opensc-0.26.1-c23-tests.patch     | 36 +++++++++
 dev-libs/opensc/opensc-0.26.1.ebuild               | 93 ++++++++++++++++++++++
 3 files changed, 130 insertions(+)

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 9fd076cd7fbc..91cd56a8ee89 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,2 +1,3 @@
 DIST opensc-0.25.1.tar.gz 2395579 BLAKE2B 
cc7994cad78083c8eeafc947e90c06178209edc825cb14b54bc4281d37c6dae1006ab2c9b9566823ef90626a4134bce96a9806bebc455a389216d7953da6b873
 SHA512 
6277abb31f903af68b4c19f549fc881b69d7aa9a55ba39936386118eadde86b62853ba2906cd165d9b1ad9090e1aa4d2b236bf19650aa228ed776b3f4d9f8805
 DIST opensc-0.26.0.tar.gz 2415271 BLAKE2B 
c1fb4f961797291fd9d36eb7b5a58a74c1d5a71c2313813cc715115ccf7a7279f6820b99cb1490daa0287c5d45175f6164e5fc7215fa46ebe5d043556f4ebd31
 SHA512 
99d88e6f83eb8b6d349bd88d51df652bc44973ac9397d516ad503c256d664a842698093b4e50e0877ece5f05151b5575fc39220620c82c7a000c971f8c98449f
+DIST opensc-0.26.1.tar.gz 2416935 BLAKE2B 
3d869e5f0a0a031442aa91588dcf4dca99e69b9a2853f09868e45df6f96439ca0773bf2e7ce7c877cc7156bc33b12f5055269c38b59ae5db8f01f84673da78c8
 SHA512 
8555173b3727aede568290a3b288a46e74564050574b9a1e85487adc59532cb600e1f67c289b7430c8daca348fe928eb1e6e837e72c32731649403b19d53cfd8

diff --git a/dev-libs/opensc/files/opensc-0.26.1-c23-tests.patch 
b/dev-libs/opensc/files/opensc-0.26.1-c23-tests.patch
new file mode 100644
index 000000000000..c97726892be9
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.26.1-c23-tests.patch
@@ -0,0 +1,36 @@
+https://github.com/OpenSC/OpenSC/commit/2fee97b35fa8f1b51394540b259768b61e126a15
+
+From 2fee97b35fa8f1b51394540b259768b61e126a15 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Veronika=20Hanul=C3=ADkov=C3=A1?= <[email protected]>
+Date: Thu, 16 Jan 2025 10:39:57 +0100
+Subject: [PATCH] p11test: Fix compiler warning about setting 'true' variable
+
+---
+ src/tests/p11test/p11test_case_wrap.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/tests/p11test/p11test_case_wrap.c 
b/src/tests/p11test/p11test_case_wrap.c
+index ecb257b565..e9c503d7e8 100644
+--- a/src/tests/p11test/p11test_case_wrap.c
++++ b/src/tests/p11test/p11test_case_wrap.c
+@@ -390,15 +390,15 @@ test_unwrap_aes(test_cert_t *o, token_info_t *info, 
test_mech_t *mech)
+       CK_ULONG key_padded_len = sizeof(key);
+       CK_OBJECT_CLASS keyClass = CKO_SECRET_KEY;
+       CK_KEY_TYPE keyType = CKK_AES;
+-      CK_BBOOL true = CK_TRUE;
++      CK_BBOOL _true = CK_TRUE;
+       CK_BYTE new_id[] = {0x00, 0xff, 0x42};
+       CK_BYTE new_label[] = "Unwrapped key";
+       CK_ATTRIBUTE template[] = {
+                       {CKA_CLASS, &keyClass, sizeof(keyClass)},
+                       {CKA_KEY_TYPE, &keyType, sizeof(keyType)},
+-                      {CKA_ENCRYPT, &true, sizeof(true)},
+-                      {CKA_DECRYPT, &true, sizeof(true)},
+-                      {CKA_TOKEN, &true, sizeof(true)},
++                      {CKA_ENCRYPT, &_true, sizeof(_true)},
++                      {CKA_DECRYPT, &_true, sizeof(_true)},
++                      {CKA_TOKEN, &_true, sizeof(_true)},
+                       {CKA_ID, &new_id, sizeof(new_id)},
+                       {CKA_LABEL, &new_label, sizeof(new_label)},
+                       {CKA_VALUE_LEN, &key_len, sizeof(key_len)}, /* keep 
this one last! */
+

diff --git a/dev-libs/opensc/opensc-0.26.1.ebuild 
b/dev-libs/opensc/opensc-0.26.1.ebuild
new file mode 100644
index 000000000000..c110f2fff0b9
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.26.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="Libraries and applications to access smartcards"
+HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki";
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git";
+else
+       
SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz";
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1+ BSD"
+SLOT="0/11"
+IUSE="ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl 
test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+       readline? ( sys-libs/readline:0= )
+       ssl? ( dev-libs/openssl:0= )
+       openct? ( >=dev-libs/openct-0.5.0 )
+       pace? ( dev-libs/openpace:= )
+       pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+       notify? ( dev-libs/glib:2 )"
+# vim-core needed for xxd in tests
+DEPEND="${RDEPEND}
+       app-text/docbook-xsl-stylesheets
+       dev-libs/libxslt
+       test? (
+               app-editors/vim-core
+               dev-util/cmocka
+               dev-libs/softhsm
+       )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+       pcsc-lite? ( !openct !ctapi )
+       openct? ( !pcsc-lite !ctapi )
+       ctapi? ( !pcsc-lite !openct )
+       || ( pcsc-lite openct ctapi )"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-0.26.1-c23-tests.patch
+)
+
+src_prepare() {
+       # This test is known to fail, for a long time upstream has carried
+       # version-specific patches which they would update on every version 
bump.
+       # There doesn't appear to be a permanent solution yet.
+       sed -i "/test-pkcs11-tool-unwrap-wrap-test.sh/d" "tests/Makefile.am" || 
die
+       default
+       eautoreconf
+}
+
+src_configure() {
+       # don't want to run upstream's clang-tidy checks
+       export ac_cv_path_CLANGTIDY=""
+
+       econf \
+               --with-completiondir="$(get_bashcompdir)" \
+               --disable-strict \
+               --enable-man \
+               $(use_enable ctapi) \
+               $(use_enable doc) \
+               $(use_enable notify) \
+               $(use_enable openct) \
+               $(use_enable pace openpace) \
+               $(use_enable pcsc-lite pcsc) \
+               $(use_enable readline) \
+               $(use_enable secure-messaging sm) \
+               $(use_enable ssl openssl) \
+               $(use_enable test cmocka) \
+               $(use_enable zlib)
+}
+
+src_test() {
+       P11LIB="${ESYSROOT}/usr/$(get_libdir)/softhsm/libsofthsm2.so" default
+}
+
+src_install() {
+       default
+
+       insinto /etc/pkcs11/modules/
+       doins "${FILESDIR}"/opensc.module
+
+       find "${ED}" -name '*.la' -delete || die
+}

Reply via email to