* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/, app-crypt/p11-kit/files/
@ 2023-09-10 9:49 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2023-09-10 9:49 UTC (permalink / raw
To: gentoo-commits
commit: 13e0c3c3489b3b33ae9dc9f468f4723c30df8204
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 09:49:29 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 09:49:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e0c3c3
app-crypt/p11-kit: drop 0.24.1-r1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-crypt/p11-kit/Manifest | 1 -
.../files/p11-kit-0.24.1-configure-clang16.patch | 35 -------------
app-crypt/p11-kit/metadata.xml | 4 --
app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild | 59 ----------------------
4 files changed, 99 deletions(-)
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 19269a7fd9f1..b9ce676ba163 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,2 +1 @@
-DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
DIST p11-kit-0.25.0.tar.xz 958940 BLAKE2B 6ffce977f86c516a327afe50f4cc5a36e86ba7f43c6cb555db419d9e4ba7543a9f1847ba83da348cd6d7bbebe55dfa26cfe3a3aaa3e1d5420a4b8dc6cbbff088 SHA512 e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe
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
deleted file mode 100644
index 3af5da6c68ac..000000000000
--- a/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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/metadata.xml b/app-crypt/p11-kit/metadata.xml
index 206d0fae5a6e..91df1af79aaa 100644
--- a/app-crypt/p11-kit/metadata.xml
+++ b/app-crypt/p11-kit/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
- <use>
- <flag name="asn1">Enable ASN.1 certificate support</flag>
- <flag name="trust">Build the trust policy module</flag>
- </use>
<upstream>
<remote-id type="github">p11-glue/p11-kit</remote-id>
</upstream>
diff --git a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
deleted file mode 100644
index b7d9c1025d7f..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: port to meson on next release
-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"
-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="+asn1 debug +libffi systemd +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
- libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:= )
- trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-configure-clang16.patch
-)
-
-pkg_setup() {
- # disable unsafe tests, bug#502088
- export FAKED_MODE=1
-}
-
-src_prepare() {
- default
- # TODO: drop in next release (after 0.24.1), p11-kit-0.24.1-configure-clang16.patch is emrged
- eautoreconf
-}
-
-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) \
- $(multilib_native_use_with systemd)
-
- 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] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/, app-crypt/p11-kit/files/
@ 2023-12-02 5:14 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-12-02 5:14 UTC (permalink / raw
To: gentoo-commits
commit: 3c99277497bde269514e37100e531a374b481bc8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 04:50:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 04:50:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c992774
app-crypt/p11-kit: fix modern c issue (32-bit ptr truncation)
Closes: https://bugs.gentoo.org/918982
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../p11-kit/files/p11-kit-0.25.3-pointer.patch | 111 +++++++++++++++++++++
app-crypt/p11-kit/p11-kit-0.25.3-r1.ebuild | 76 ++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/app-crypt/p11-kit/files/p11-kit-0.25.3-pointer.patch b/app-crypt/p11-kit/files/p11-kit-0.25.3-pointer.patch
new file mode 100644
index 000000000000..feac3e132fce
--- /dev/null
+++ b/app-crypt/p11-kit/files/p11-kit-0.25.3-pointer.patch
@@ -0,0 +1,111 @@
+https://bugs.gentoo.org/918982
+https://github.com/p11-glue/p11-kit/pull/609
+
+From 6f05ca107d588fcedaa4ef06542760cbbda8c878 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Sat, 2 Dec 2023 09:24:01 +0900
+Subject: [PATCH] import-object: Avoid integer truncation on 32-bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The build fails when compiling for 32-bit platforms with
+-Werror=incompatible-pointer-types:
+
+ CFLAGS="-m32 -march=i686 -Werror=incompatible-pointer-types -Werror=implicit -Werror=int-conversion" setarch i686 -- meson setup _build
+ setarch i686 -- meson compile -C _build -v
+ ...
+
+ ../p11-kit/import-object.c: In function ‘add_attrs_pubkey_rsa’:
+ ../p11-kit/import-object.c:223:62: error: passing argument 3 of ‘p11_asn1_read’ from incompatible pointer type [-Werror=incompatible-pointer-types]
+ 223 | attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen);
+ | ^~~~~~~~~~~~~~~~~~~~~~~~
+ | |
+ | long unsigned int *
+
+Reported by Sam James in:
+https://github.com/p11-glue/p11-kit/issues/608
+
+Signed-off-by: Daiki Ueno <ueno@gnu.org>
+---
+ p11-kit/import-object.c | 32 ++++++++++++++++++++++++++++----
+ 1 file changed, 28 insertions(+), 4 deletions(-)
+
+diff --git a/p11-kit/import-object.c b/p11-kit/import-object.c
+index feee0765..278ad932 100644
+--- a/p11-kit/import-object.c
++++ b/p11-kit/import-object.c
+@@ -55,6 +55,7 @@
+ #endif
+
+ #include <assert.h>
++#include <limits.h>
+ #include <stdbool.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -201,6 +202,7 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs,
+ CK_ATTRIBUTE attr_encrypt = { CKA_ENCRYPT, &tval, sizeof (tval) };
+ CK_ATTRIBUTE attr_modulus = { CKA_MODULUS, };
+ CK_ATTRIBUTE attr_exponent = { CKA_PUBLIC_EXPONENT, };
++ size_t len;
+
+ pubkey = p11_asn1_read (info, "subjectPublicKey", &pubkey_len);
+ if (pubkey == NULL) {
+@@ -220,17 +222,31 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs,
+ goto cleanup;
+ }
+
+- attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen);
++ attr_modulus.pValue = p11_asn1_read (asn, "modulus", &len);
+ if (attr_modulus.pValue == NULL) {
+ p11_message (_("failed to obtain modulus"));
+ goto cleanup;
+ }
++#if ULONG_MAX < SIZE_MAX
++ if (len > ULONG_MAX) {
++ p11_message (_("failed to obtain modulus"));
++ goto cleanup;
++ }
++#endif
++ attr_modulus.ulValueLen = len;
+
+- attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &attr_exponent.ulValueLen);
+- if (attr_exponent.pValue == NULL) {
++ attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &len);
++ if (attr_exponent.pValue == NULL || len > ULONG_MAX) {
++ p11_message (_("failed to obtain exponent"));
++ goto cleanup;
++ }
++#if ULONG_MAX < SIZE_MAX
++ if (len > ULONG_MAX) {
+ p11_message (_("failed to obtain exponent"));
+ goto cleanup;
+ }
++#endif
++ attr_exponent.ulValueLen = len;
+
+ result = p11_attrs_build (attrs, &attr_key_type, &attr_encrypt, &attr_modulus, &attr_exponent, NULL);
+ if (result == NULL) {
+@@ -260,12 +276,20 @@ add_attrs_pubkey_ec (CK_ATTRIBUTE *attrs,
+ CK_ATTRIBUTE attr_key_type = { CKA_KEY_TYPE, &key_type, sizeof (key_type) };
+ CK_ATTRIBUTE attr_ec_params = { CKA_EC_PARAMS, };
+ CK_ATTRIBUTE attr_ec_point = { CKA_EC_POINT, };
++ size_t len;
+
+- attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &attr_ec_params.ulValueLen);
++ attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &len);
+ if (attr_ec_params.pValue == NULL) {
+ p11_message (_("failed to obtain EC parameters"));
+ goto cleanup;
+ }
++#if ULONG_MAX < SIZE_MAX
++ if (len > ULONG_MAX) {
++ p11_message (_("failed to obtain EC parameters"));
++ goto cleanup;
++ }
++#endif
++ attr_ec_params.ulValueLen = len;
+
+ /* subjectPublicKey is read as BIT STRING value which contains
+ * EC point data. We need to DER encode this data as OCTET STRING.
+
diff --git a/app-crypt/p11-kit/p11-kit-0.25.3-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.25.3-r1.ebuild
new file mode 100644
index 000000000000..acb110fc1090
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.25.3-r1.ebuild
@@ -0,0 +1,76 @@
+# 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 ~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="
+ ${PYTHON_DEPS}
+ app-text/docbook-xsl-stylesheets
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ "${FILESDIR}"/p11-kit-0.25.3-pointer.patch
+)
+
+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 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
+ $(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] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/, app-crypt/p11-kit/files/
@ 2023-12-06 11:42 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-12-06 11:42 UTC (permalink / raw
To: gentoo-commits
commit: b6ffe6cfad6a3a5db4067d8f3d6a6ba293002a44
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 6 11:41:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 6 11:41:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ffe6cf
app-crypt/p11-kit: update c99 patch to upstream variant
Bug: https://bugs.gentoo.org/918982
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../p11-kit/files/p11-kit-0.25.3-pointer.patch | 28 ++++++++++------------
...t-0.25.3-r1.ebuild => p11-kit-0.25.3-r2.ebuild} | 0
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/app-crypt/p11-kit/files/p11-kit-0.25.3-pointer.patch b/app-crypt/p11-kit/files/p11-kit-0.25.3-pointer.patch
index feac3e132fce..9b316ee2fad6 100644
--- a/app-crypt/p11-kit/files/p11-kit-0.25.3-pointer.patch
+++ b/app-crypt/p11-kit/files/p11-kit-0.25.3-pointer.patch
@@ -1,7 +1,7 @@
https://bugs.gentoo.org/918982
-https://github.com/p11-glue/p11-kit/pull/609
+https://github.com/p11-glue/p11-kit/commit/d49c92c8420db6ee4c88515bdb014f68f4d471d9
-From 6f05ca107d588fcedaa4ef06542760cbbda8c878 Mon Sep 17 00:00:00 2001
+From d49c92c8420db6ee4c88515bdb014f68f4d471d9 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@gnu.org>
Date: Sat, 2 Dec 2023 09:24:01 +0900
Subject: [PATCH] import-object: Avoid integer truncation on 32-bit platforms
@@ -28,11 +28,11 @@ https://github.com/p11-glue/p11-kit/issues/608
Signed-off-by: Daiki Ueno <ueno@gnu.org>
---
- p11-kit/import-object.c | 32 ++++++++++++++++++++++++++++----
- 1 file changed, 28 insertions(+), 4 deletions(-)
+ p11-kit/import-object.c | 30 +++++++++++++++++++++++++++---
+ 1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/p11-kit/import-object.c b/p11-kit/import-object.c
-index feee0765..278ad932 100644
+index feee0765..fb47b964 100644
--- a/p11-kit/import-object.c
+++ b/p11-kit/import-object.c
@@ -55,6 +55,7 @@
@@ -47,7 +47,7 @@ index feee0765..278ad932 100644
CK_ATTRIBUTE attr_encrypt = { CKA_ENCRYPT, &tval, sizeof (tval) };
CK_ATTRIBUTE attr_modulus = { CKA_MODULUS, };
CK_ATTRIBUTE attr_exponent = { CKA_PUBLIC_EXPONENT, };
-+ size_t len;
++ size_t len = 0;
pubkey = p11_asn1_read (info, "subjectPublicKey", &pubkey_len);
if (pubkey == NULL) {
@@ -70,17 +70,16 @@ index feee0765..278ad932 100644
+ attr_modulus.ulValueLen = len;
- attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &attr_exponent.ulValueLen);
-- if (attr_exponent.pValue == NULL) {
+ attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &len);
-+ if (attr_exponent.pValue == NULL || len > ULONG_MAX) {
-+ p11_message (_("failed to obtain exponent"));
-+ goto cleanup;
-+ }
-+#if ULONG_MAX < SIZE_MAX
-+ if (len > ULONG_MAX) {
+ if (attr_exponent.pValue == NULL) {
p11_message (_("failed to obtain exponent"));
goto cleanup;
}
++#if ULONG_MAX < SIZE_MAX
++ if (len > ULONG_MAX) {
++ p11_message (_("failed to obtain exponent"));
++ goto cleanup;
++ }
+#endif
+ attr_exponent.ulValueLen = len;
@@ -90,7 +89,7 @@ index feee0765..278ad932 100644
CK_ATTRIBUTE attr_key_type = { CKA_KEY_TYPE, &key_type, sizeof (key_type) };
CK_ATTRIBUTE attr_ec_params = { CKA_EC_PARAMS, };
CK_ATTRIBUTE attr_ec_point = { CKA_EC_POINT, };
-+ size_t len;
++ size_t len = 0;
- attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &attr_ec_params.ulValueLen);
+ attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &len);
@@ -108,4 +107,3 @@ index feee0765..278ad932 100644
/* subjectPublicKey is read as BIT STRING value which contains
* EC point data. We need to DER encode this data as OCTET STRING.
-
diff --git a/app-crypt/p11-kit/p11-kit-0.25.3-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild
similarity index 100%
rename from app-crypt/p11-kit/p11-kit-0.25.3-r1.ebuild
rename to app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/, app-crypt/p11-kit/files/
@ 2024-06-01 0:00 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-06-01 0:00 UTC (permalink / raw
To: gentoo-commits
commit: d116836ca40cd9a0ea2c149f3eac49123d4eb473
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 23:59:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 31 23:59:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d116836c
app-crypt/p11-kit: drop 0.25.0-r1, 0.25.1-r1, 0.25.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/p11-kit/Manifest | 2 -
.../files/p11-kit-0.25.0-fix-C_GetInterface.patch | 39 -----------
.../files/p11-kit-0.25.1-fix-tty-comparison.patch | 22 -------
app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild | 54 ---------------
app-crypt/p11-kit/p11-kit-0.25.1-r1.ebuild | 77 ----------------------
app-crypt/p11-kit/p11-kit-0.25.3.ebuild | 73 --------------------
6 files changed, 267 deletions(-)
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 2cfc2fe2bae8..1eb1dc12f8c7 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,3 +1 @@
-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
DIST p11-kit-0.25.3.tar.xz 991528 BLAKE2B 5c695c1ef95edf4bbbab001aa634076c433df0bc89cb8104deaec2ce00c6908640e467755b49c6900e5d7d5d81e1a3871f4978a212c6f6ae088386ac0b95289a SHA512 ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c
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
deleted file mode 100644
index b3b411c33bdc..000000000000
--- a/app-crypt/p11-kit/files/p11-kit-0.25.0-fix-C_GetInterface.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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/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
deleted file mode 100644
index b97a71396e26..000000000000
--- a/app-crypt/p11-kit/files/p11-kit-0.25.1-fix-tty-comparison.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.0-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild
deleted file mode 100644
index e5e1a9e6312d..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 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="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- 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
-}
diff --git a/app-crypt/p11-kit/p11-kit-0.25.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.25.1-r1.ebuild
deleted file mode 100644
index 2955ab7df936..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.25.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 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 ~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="
- ${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-tty-comparison.patch
-)
-
-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 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
- $(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
-}
diff --git a/app-crypt/p11-kit/p11-kit-0.25.3.ebuild b/app-crypt/p11-kit/p11-kit-0.25.3.ebuild
deleted file mode 100644
index 754607b9c347..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.25.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 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 ~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="
- ${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- nls? ( sys-devel/gettext )
-"
-
-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 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
- $(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] 4+ messages in thread
end of thread, other threads:[~2024-06-01 0:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-10 9:49 [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/, app-crypt/p11-kit/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2023-12-02 5:14 Sam James
2023-12-06 11:42 Sam James
2024-06-01 0:00 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox