* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/files/, app-crypt/p11-kit/
@ 2019-07-02 5:51 Alon Bar-Lev
0 siblings, 0 replies; 7+ messages in thread
From: Alon Bar-Lev @ 2019-07-02 5:51 UTC (permalink / raw
To: gentoo-commits
commit: a252cace3c34490668017794a229f6ddf6a3f7d8
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 05:50:20 2019 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 05:50:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a252cace
app-crypt/p11-kit: fix date handling
Closes: https://bugs.gentoo.org/show_bug.cgi?id=688460
Thanks: Alexey
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --force
.../p11-kit/files/p11-kit-0.23.12-mktime.patch | 26 ++++++++++++++++++++++
...it-0.23.12.ebuild => p11-kit-0.23.12-r1.ebuild} | 4 ++++
....23.16.1.ebuild => p11-kit-0.23.16.1-r1.ebuild} | 4 ++++
3 files changed, 34 insertions(+)
diff --git a/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch b/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch
new file mode 100644
index 00000000000..7cc0baada97
--- /dev/null
+++ b/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch
@@ -0,0 +1,26 @@
+From 3d009fda4cb39157d6876e7d16cbc57f7b59bc86 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Mon, 1 Jul 2019 13:38:25 +0300
+Subject: [PATCH] trust: do not allow daylight to invalidate date validation
+
+Issue: 235
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ trust/builder.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/trust/builder.c b/trust/builder.c
+index d819dc8..2fc0c40 100644
+--- a/trust/builder.c
++++ b/trust/builder.c
+@@ -261,6 +261,7 @@ type_date (p11_builder *builder,
+ return false;
+
+ memcpy (&two, &tm, sizeof (tm));
++ two.tm_isdst = -1; // do not perform tz fixup
+ if (mktime (&two) < 0)
+ return false;
+
+--
+2.21.0
+
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild
similarity index 97%
rename from app-crypt/p11-kit/p11-kit-0.23.12.ebuild
rename to app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild
index 1e38188fa1a..acd2250428b 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild
@@ -21,6 +21,10 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/${P}-mktime.patch"
+)
+
pkg_setup() {
# disable unsafe tests, bug#502088
export FAKED_MODE=1
diff --git a/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
similarity index 97%
rename from app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild
rename to app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
index ec7c6c32971..6b1c88e6912 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
@@ -21,6 +21,10 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.23.12-mktime.patch"
+)
+
pkg_setup() {
# disable unsafe tests, bug#502088
export FAKED_MODE=1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/files/, app-crypt/p11-kit/
@ 2020-02-25 11:45 Mikle Kolyada
0 siblings, 0 replies; 7+ messages in thread
From: Mikle Kolyada @ 2020-02-25 11:45 UTC (permalink / raw
To: gentoo-commits
commit: 76d756918124ac019e8d1a801a082e9fdcc252b0
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 11:45:04 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 11:45:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d75691
app-crypt/p11-kit: Drop old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-crypt/p11-kit/Manifest | 2 -
.../p11-kit/files/p11-kit-0.23.12-mktime.patch | 26 ---------
app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild | 64 ----------------------
app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild | 60 --------------------
4 files changed, 152 deletions(-)
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 426b269a7dc..fe72990c699 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,4 +1,2 @@
-DIST p11-kit-0.23.16.1.tar.gz 1292783 BLAKE2B 60be56656156c86d6f0f3285bd691ed85ec1a992e8a789f0f21f9ada172a8cab0581cc42f89c3079a1bd7b3493f0d38cd952711fda50c2e80bf96e94fcd9ff87 SHA512 7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7
-DIST p11-kit-0.23.18.1.tar.gz 1305755 BLAKE2B 6d453fad0f4b42e3ae583e76bd206377fd30dd32d98dda94ba3b2fe505cde4c3e05410e685ebe9e8e2f6cae7da3cbd2b78203cae64b8c000b1a2f2ec2a902c4c SHA512 941996aea75025dad5dfc6f9b4609bc92bc0888d5b2b58de0d498d6cf75d059421405d9c3bad51122108b6ad1e41e434609ead23404efe635cdb806836ccadbd
DIST p11-kit-0.23.19.tar.xz 822652 BLAKE2B c1750e2d0b8ebdfcf70695259401a029b2d5739d8222c37f128f94f8a4313321956e120dcba5c7cb882d16e1a6b12398f9dfa88ef601e826f0dfec5acbf438c8 SHA512 1a7feb2c14381f2ca87386b6a81f46cfb27ccce70ad87a2fc86726e2827b49971958e40c4fc54df01df7570d82058afe82d21c5b3c59fb8310aa641d3b370da2
DIST p11-kit-0.23.20.tar.xz 822588 BLAKE2B adda58acc121d38d3520d20daf8f59c3c46f81afe807d9277fae70e836d194d08cfea0405d2186d548ea91be56eee63d576a318c330fa844a0cf1889960db384 SHA512 1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57
diff --git a/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch b/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch
deleted file mode 100644
index 7cc0baada97..00000000000
--- a/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3d009fda4cb39157d6876e7d16cbc57f7b59bc86 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 1 Jul 2019 13:38:25 +0300
-Subject: [PATCH] trust: do not allow daylight to invalidate date validation
-
-Issue: 235
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- trust/builder.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/trust/builder.c b/trust/builder.c
-index d819dc8..2fc0c40 100644
---- a/trust/builder.c
-+++ b/trust/builder.c
-@@ -261,6 +261,7 @@ type_date (p11_builder *builder,
- return false;
-
- memcpy (&two, &tm, sizeof (tm));
-+ two.tm_isdst = -1; // do not perform tz fixup
- if (mktime (&two) < 0)
- return false;
-
---
-2.21.0
-
diff --git a/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
deleted file mode 100644
index 3b3fbdb534d..00000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asn1 debug +libffi +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
- libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
- trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.23.12-mktime.patch"
-)
-
-pkg_setup() {
- # disable unsafe tests, bug#502088
- export FAKED_MODE=1
-}
-
-src_prepare() {
- if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
- # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
- # drop to XPG6 to make feature_tests.h happy
- sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
- # paths.h isn't available, oddly enough also not used albeit included
- sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
- # we don't have SUN_LEN here
- sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
- p11-kit/server.c || die
- fi
- default
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable trust trust-module) \
- $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
- $(use_enable debug) \
- $(use_with libffi) \
- $(use_with asn1 libtasn1)
-
- if multilib_is_native_abi; then
- # re-use provided documentation
- ln -s "${S}"/doc/manual/html doc/manual/html || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild
deleted file mode 100644
index 3a5ba72d93a..00000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asn1 debug +libffi +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
- libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
- trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
- # disable unsafe tests, bug#502088
- export FAKED_MODE=1
-}
-
-src_prepare() {
- if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
- # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
- # drop to XPG6 to make feature_tests.h happy
- sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
- # paths.h isn't available, oddly enough also not used albeit included
- sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
- # we don't have SUN_LEN here
- sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
- p11-kit/server.c || die
- fi
- default
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable trust trust-module) \
- $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
- $(use_enable debug) \
- $(use_with libffi) \
- $(use_with asn1 libtasn1)
-
- if multilib_is_native_abi; then
- # re-use provided documentation
- ln -s "${S}"/doc/manual/html doc/manual/html || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/files/, app-crypt/p11-kit/
@ 2023-01-04 4:32 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-01-04 4:32 UTC (permalink / raw
To: gentoo-commits
commit: 45599c2be55766dd3b748308d22cf3e4378d4890
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 04:17:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 04:32:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45599c2b
app-crypt/p11-kit: fix configure w/ clang 16
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/p11-kit-0.24.1-configure-clang16.patch | 35 ++++++++++++++++++++++
...-kit-0.24.1.ebuild => p11-kit-0.24.1-r1.ebuild} | 11 +++++--
2 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch b/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch
new file mode 100644
index 000000000000..3af5da6c68ac
--- /dev/null
+++ b/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch
@@ -0,0 +1,35 @@
+https://github.com/p11-glue/p11-kit/commit/d39043f7c6e44247b5b1a237888e80b2a4d9c2b2
+
+From d39043f7c6e44247b5b1a237888e80b2a4d9c2b2 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Mon, 12 Dec 2022 19:40:25 +0100
+Subject: [PATCH] Fix meson/configure _Thread_local checks for C99
+ compatibility
+
+The type was missing from the definition, which happens to work
+in current compilers for historic reasons. Implicit ints were
+actually removed from C in 1999.
+--- a/configure.ac
++++ b/configure.ac
+@@ -148,7 +148,7 @@ if test "$os_unix" = "yes"; then
+ [ac_cv_tls_keyword=
+ for keyword in _Thread_local __thread; do
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],
+- [[static ]$keyword[ foo;]])],
++ [[static ]$keyword[ int foo;]])],
+ [ac_cv_tls_keyword=$keyword])
+ done])
+ if test -n "$ac_cv_tls_keyword"; then
+--- a/meson.build
++++ b/meson.build
+@@ -200,7 +200,7 @@ if host_system != 'windows'
+ tls_test_code_template = '''
+ #include <stdlib.h>
+ int main (void) {
+-static @0@ foo;
++static @0@ int foo;
+ return 0;
+ }
+ '''
+
+
diff --git a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
similarity index 89%
rename from app-crypt/p11-kit/p11-kit-0.24.1.ebuild
rename to app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
index 91ee0171c43a..e5ecd181f2ff 100644
--- a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit multilib-minimal
+inherit autotools multilib-minimal
DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
@@ -22,6 +22,10 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${P}-configure-clang16.patch
+)
+
pkg_setup() {
# disable unsafe tests, bug#502088
export FAKED_MODE=1
@@ -38,7 +42,10 @@ src_prepare() {
sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
p11-kit/server.c || die
fi
+
default
+ # TODO: drop in next release (after 0.24.1), p11-kit-0.24.1-configure-clang16.patch is emrged
+ eautoreconf
}
multilib_src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/files/, app-crypt/p11-kit/
@ 2023-08-03 22:16 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-08-03 22:16 UTC (permalink / raw
To: gentoo-commits
commit: c3bea56a071e2f1a45a62dfff85b2322e9bbd153
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 3 22:16:06 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 3 22:16:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3bea56a
app-crypt/p11-kit: backport dlsym fix
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/p11-kit-0.25.0-fix-C_GetInterface.patch | 39 ++++++++++++++++
app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild | 52 ++++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/app-crypt/p11-kit/files/p11-kit-0.25.0-fix-C_GetInterface.patch b/app-crypt/p11-kit/files/p11-kit-0.25.0-fix-C_GetInterface.patch
new file mode 100644
index 000000000000..b3b411c33bdc
--- /dev/null
+++ b/app-crypt/p11-kit/files/p11-kit-0.25.0-fix-C_GetInterface.patch
@@ -0,0 +1,39 @@
+https://github.com/p11-glue/p11-kit/commit/d1d4b0ac316a27c739ff91e6c4153f1154e96e5a
+
+From d1d4b0ac316a27c739ff91e6c4153f1154e96e5a Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Thu, 27 Jul 2023 12:18:15 +0800
+Subject: [PATCH] Fix probing of C_GetInterface
+
+`p11_dl_symbol (dl, "C_GetInterface")` uses dlsym() to find
+C_GetInterface in the loaded pkcs11 module. For legacy (pre-3.0) pkcs11
+modules, C_GetInterface is not defined in the module. But according to
+the documentation of dlsym():
+
+ The search performed by dlsym() is breadth first through the
+ dependency tree of these shared objects.
+
+So if a pkcs11 module links to libp11-kit.so, the C_GetInterface
+implementation in libp11-kit.so itself will be found. This
+C_GetInterface will return the metadata of p11-kit-proxy.so, causing
+"Refuse to load the p11-kit-proxy.so as a registered module".
+
+To solve the issue, if p11_dl_symbol() returns the C_GetInterface in
+libp11-kit.so itself, we should ignore it and continue trying
+C_GetFunctionList.
+--- a/p11-kit/modules.c
++++ b/p11-kit/modules.c
+@@ -383,6 +383,12 @@ dlopen_and_get_function_list (Module *mod,
+ mod->loaded_module = dl;
+
+ gi = p11_dl_symbol (dl, "C_GetInterface");
++
++#ifndef OS_WIN32
++ if (gi == C_GetInterface)
++ gi = NULL;
++#endif
++
+ if (gi) {
+ /* Get the default standard interface */
+ rv = gi ((unsigned char *)"PKCS 11", NULL, &interface, 0);
+
diff --git a/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild
new file mode 100644
index 000000000000..b2c897076931
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 meson-multilib
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
+SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+libffi gtk-doc nls systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}]
+ libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-C_GetInterface.patch
+)
+
+multilib_src_configure() {
+ # Disable unsafe tests, bug#502088
+ export FAKED_MODE=1
+
+ local emesonargs=(
+ -Dbashcompdir="$(get_bashcompdir)"
+ -Dtrust_module=enabled
+ -Dtrust_paths="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+ $(meson_feature libffi)
+ $(meson_use nls)
+ $(meson_use test)
+ $(meson_native_use_bool gtk-doc gtk_doc)
+ $(meson_native_true man)
+ $(meson_native_use_feature systemd)
+ )
+
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/files/, app-crypt/p11-kit/
@ 2023-10-27 23:28 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-10-27 23:28 UTC (permalink / raw
To: gentoo-commits
commit: 3fa119230469fdd809118a7136b4938abf0147dc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 23:27:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 23:28:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fa11923
app-crypt/p11-kit: add 0.25.1
Closes: https://bugs.gentoo.org/913971
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/p11-kit/Manifest | 1 +
.../files/p11-kit-0.25.1-skip-test-server.sh | 14 +++++
app-crypt/p11-kit/p11-kit-0.25.1.ebuild | 66 ++++++++++++++++++++++
3 files changed, 81 insertions(+)
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index b9ce676ba163..a0b0b6d61de0 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1 +1,2 @@
DIST p11-kit-0.25.0.tar.xz 958940 BLAKE2B 6ffce977f86c516a327afe50f4cc5a36e86ba7f43c6cb555db419d9e4ba7543a9f1847ba83da348cd6d7bbebe55dfa26cfe3a3aaa3e1d5420a4b8dc6cbbff088 SHA512 e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe
+DIST p11-kit-0.25.1.tar.xz 990460 BLAKE2B 6704ef2ada20765bfbbbfc6f92ec2e934be34b482e1b6a94a7a15ab4718efcaecf943ce06b6c352b8c638fe2b1f0bc7c953c6b0dcf0590e5695c1d6724272ebb SHA512 e12e32148e0924ac7dca4c6a4399cff0934df4f002a31e7ffc5c3cfd14a4c0a47225eb84abd73b7f36c8dfcc32f92756e90699335b830414e8f5eddeaa42c532
diff --git a/app-crypt/p11-kit/files/p11-kit-0.25.1-skip-test-server.sh b/app-crypt/p11-kit/files/p11-kit-0.25.1-skip-test-server.sh
new file mode 100644
index 000000000000..db51edcd497c
--- /dev/null
+++ b/app-crypt/p11-kit/files/p11-kit-0.25.1-skip-test-server.sh
@@ -0,0 +1,14 @@
+diff --git a/p11-kit/test-server.sh b/p11-kit/test-server.sh
+index dcea45d..d6a9bfc 100755
+--- a/p11-kit/test-server.sh
++++ b/p11-kit/test-server.sh
+@@ -33,6 +33,9 @@ teardown() {
+ }
+
+ test_server_access() {
++ exit 77
++ return
++
+ "$abs_top_builddir"/p11-kit/p11-kit-server-testable -s --provider "$P11_MODULE_PATH"/mock-one.so pkcs11: > start.env 2> start.err
+ if test $? -ne 0; then
+ sed 's/^/# /' start.err
diff --git a/app-crypt/p11-kit/p11-kit-0.25.1.ebuild b/app-crypt/p11-kit/p11-kit-0.25.1.ebuild
new file mode 100644
index 000000000000..fe80f1e4c35b
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.25.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 meson-multilib python-any-r1
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
+SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~m68k ~mips ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+libffi gtk-doc nls systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}]
+ libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/castxml
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.25.1-skip-test-server.sh
+)
+
+src_prepare() {
+ default
+
+ # Relies on dlopen which won't work for multilib tests (bug #913971)
+ cat <<-EOF > "${S}"/p11-kit/test-server.sh || die
+ #!/bin/sh
+ exit 77
+ EOF
+}
+
+multilib_src_configure() {
+ # Disable unsafe tests, bug#502088
+ export FAKED_MODE=1
+
+ local emesonargs=(
+ -Dbashcompdir="$(get_bashcompdir)"
+ -Dtrust_module=enabled
+ -Dtrust_paths="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+ $(meson_feature libffi)
+ $(meson_use nls)
+ $(meson_use test)
+ $(meson_native_use_bool gtk-doc gtk_doc)
+ $(meson_native_true man)
+ $(meson_native_use_feature systemd)
+ )
+
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/files/, app-crypt/p11-kit/
@ 2023-10-27 23:33 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-10-27 23:33 UTC (permalink / raw
To: gentoo-commits
commit: fe9cd4a6fc32db54a9e85411f356e722655e07db
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 23:32:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 23:32:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9cd4a6
app-crypt/p11-kit: drop obsolete patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/p11-kit/files/p11-kit-0.25.1-skip-test-server.sh | 14 --------------
app-crypt/p11-kit/p11-kit-0.25.1.ebuild | 4 ----
2 files changed, 18 deletions(-)
diff --git a/app-crypt/p11-kit/files/p11-kit-0.25.1-skip-test-server.sh b/app-crypt/p11-kit/files/p11-kit-0.25.1-skip-test-server.sh
deleted file mode 100644
index db51edcd497c..000000000000
--- a/app-crypt/p11-kit/files/p11-kit-0.25.1-skip-test-server.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/p11-kit/test-server.sh b/p11-kit/test-server.sh
-index dcea45d..d6a9bfc 100755
---- a/p11-kit/test-server.sh
-+++ b/p11-kit/test-server.sh
-@@ -33,6 +33,9 @@ teardown() {
- }
-
- test_server_access() {
-+ exit 77
-+ return
-+
- "$abs_top_builddir"/p11-kit/p11-kit-server-testable -s --provider "$P11_MODULE_PATH"/mock-one.so pkcs11: > start.env 2> start.err
- if test $? -ne 0; then
- sed 's/^/# /' start.err
diff --git a/app-crypt/p11-kit/p11-kit-0.25.1.ebuild b/app-crypt/p11-kit/p11-kit-0.25.1.ebuild
index fe80f1e4c35b..be3e638e329e 100644
--- a/app-crypt/p11-kit/p11-kit-0.25.1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.25.1.ebuild
@@ -32,10 +32,6 @@ BDEPEND="
nls? ( sys-devel/gettext )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.25.1-skip-test-server.sh
-)
-
src_prepare() {
default
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/files/, app-crypt/p11-kit/
@ 2023-10-27 23:51 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-10-27 23:51 UTC (permalink / raw
To: gentoo-commits
commit: 4798ad6134c3978c821512fc7850c64514b1f373
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 23:50:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 23:50:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4798ad61
app-crypt/p11-kit: backport tty fix; drop castxml dep
* Backport tty fix
* Drop castxml dep, as it's not required, and castxml needs Clang. If we used it
only if installed, we'd get a non-deterministic build.
Closes: https://bugs.gentoo.org/916376
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/p11-kit-0.25.1-fix-tty-comparison.patch | 22 ++++++++++++++++++++++
...-kit-0.25.1.ebuild => p11-kit-0.25.1-r1.ebuild} | 16 +++++++++++++++-
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/app-crypt/p11-kit/files/p11-kit-0.25.1-fix-tty-comparison.patch b/app-crypt/p11-kit/files/p11-kit-0.25.1-fix-tty-comparison.patch
new file mode 100644
index 000000000000..b97a71396e26
--- /dev/null
+++ b/app-crypt/p11-kit/files/p11-kit-0.25.1-fix-tty-comparison.patch
@@ -0,0 +1,22 @@
+https://github.com/p11-glue/p11-kit/commit/cdc4720d29466e717aa694a85a7aee86ebb94172
+
+From cdc4720d29466e717aa694a85a7aee86ebb94172 Mon Sep 17 00:00:00 2001
+From: Erdem Meydanli <meydanli@amazon.com>
+Date: Thu, 26 Oct 2023 15:18:24 +0000
+Subject: [PATCH] fix: improper comparison
+
+Compare the return value of the readpassphrase function to NULL.
+
+Signed-off-by: Erdem Meydanli <meydanli@amazon.com>
+--- a/p11-kit/tty.c
++++ b/p11-kit/tty.c
+@@ -66,7 +66,7 @@ p11_pin_tty_callback (const char *pin_source,
+ if (asprintf (&prompt, "%s: ", pin_description) < 0)
+ return NULL;
+
+- if (readpassphrase (prompt, buf, sizeof(buf), 0) < 0)
++ if (readpassphrase (prompt, buf, sizeof(buf), 0) == NULL)
+ goto cleanup;
+
+ pin = p11_kit_pin_new_for_string (buf);
+
diff --git a/app-crypt/p11-kit/p11-kit-0.25.1.ebuild b/app-crypt/p11-kit/p11-kit-0.25.1-r1.ebuild
similarity index 80%
rename from app-crypt/p11-kit/p11-kit-0.25.1.ebuild
rename to app-crypt/p11-kit/p11-kit-0.25.1-r1.ebuild
index be3e638e329e..ed2b437d4844 100644
--- a/app-crypt/p11-kit/p11-kit-0.25.1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.25.1-r1.ebuild
@@ -26,12 +26,15 @@ DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
app-text/docbook-xsl-stylesheets
- dev-libs/castxml
virtual/pkgconfig
gtk-doc? ( dev-util/gtk-doc )
nls? ( sys-devel/gettext )
"
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-tty-comparison.patch
+)
+
src_prepare() {
default
@@ -46,7 +49,18 @@ multilib_src_configure() {
# Disable unsafe tests, bug#502088
export FAKED_MODE=1
+ local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+
+ # p11-kit doesn't need this to build and castxml needs Clang. To get
+ # a deterministic non-automagic build, always disable the search for
+ # castxml.
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ castxml='castxml-falseified'
+ EOF
+
local emesonargs=(
+ --native-file "${native_file}"
-Dbashcompdir="$(get_bashcompdir)"
-Dtrust_module=enabled
-Dtrust_paths="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-10-27 23:51 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-27 23:51 [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/files/, app-crypt/p11-kit/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-10-27 23:33 Sam James
2023-10-27 23:28 Sam James
2023-08-03 22:16 Sam James
2023-01-04 4:32 Sam James
2020-02-25 11:45 Mikle Kolyada
2019-07-02 5:51 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox