[gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/, app-crypt/p11-kit/files/

["Sam James" <sam@gentoo.org>]

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
-}