4 files changed, 101 insertions, 0 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0382a7dcaf9f..9dc1ce0529da 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index a2e6cdcb14bd..6c71b625e856 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,4 +1,7 @@
 AUX p11-kit-0.25.0-fix-C_GetInterface.patch 1410 BLAKE2B c15a8950a73cd9b0a656df2e00c8068abacb14dc9c9b30e67fb777b9987a4419a215904828554a0269699319725d90aab4996895231d325be825a431e99ad4e4 SHA512 69c31b5f2c5dbfb5504281c2518a1cb555973e0a80c5317dc8605d793740c8f2fca0506c2f9baa88de181bab9455a16efdf9649a5a08c35214f2bc46e9dc265a
+AUX p11-kit-0.25.1-fix-tty-comparison.patch 753 BLAKE2B 0ee0fd52076526853394c1f2a353c95d60c2166645da3bdeefbe1ea878fff7c125ffa76eae4e8949440ccd8aaabde035331a32b1dc7b040c56d41fc26f74eac7 SHA512 1f7b3730aa157dc113ee98c82ab2ce06beed0c5745454857246249f8f15c35fd2c90b5368f966cd4b155cff3e44bdb59d7942ea71689b5eb7bd9efb97df9021e
 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
 EBUILD p11-kit-0.25.0-r1.ebuild 1425 BLAKE2B 9e9b0b01a2befbfebb2e6c9bc3be306478b730174f42b9a057c497e45bc7944994b292ba6ccc2e4e3b7e62b7e081507ee7e578f708facd3de9d5d1c63a34943d SHA512 444036cc4a421b8567ec3a2b4d08484dd8484249d7c4bfda4fd567f261c6387a3ab87d32e7de4c1347cfea3c57d44d85c4387f25b9fce067eb053b5de0cd687f
+EBUILD p11-kit-0.25.1-r1.ebuild 1951 BLAKE2B 7f0443710afc200177288f6b0561d5515fe313bc95e6959c8658b219c133d8ac826ef01de1c176c67789ef598ee3cce92736ef1bd168affa08fb700be849b478 SHA512 d15f7538c09eeeb7e93a361322738b2f111da89583a8897ae40009a7a55b6431719195f61e50b826e40a8bc1e16428fea76c31d1b18c087288f31e8dad39f5cd
 MISC metadata.xml 249 BLAKE2B 689b2967578682135e3f7d619c2b733bb4e50cd74215a0fa17d3bae7b4f59495c7f8d316ef5340d14cf32de956162fa890186f19346d95f212d18a643b55bee1 SHA512 f3f0b79d325cd001c8cf1c9d6ca14d3c09149aefab7862bd04801cafdc2efad9fe7e456e4fac55c6233413f645188188643f6e8f8dfb54deffe5fa30768831b0
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-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.25.1-r1.ebuild
new file mode 100644
index 000000000000..ed2b437d4844
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.25.1-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 ~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
+	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
+}