gentoo auto-resync : 14:09:2023 - 22:48:30

9 files changed, 153 insertions, 6 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 488b0970f7db..89acb49122ff 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 92d8f061e7b4..29020ad251a8 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -3,6 +3,6 @@ AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2e
 AUX swtpm-0.7.2-Conditionalize-test-dependencies.patch 1065 BLAKE2B 359cf6e692691317255d8c456abee7fe59a5370bf94f0bdd37ee6bb16ceb80340939f3f0a348398c6c93177690f4e2dc141d2b6c9f12319586c5a850dec2cd5c SHA512 8a2731b9d9c49fa2a8ea2732b20dbbd7264b1c93b00848e67f83e5d54f8ed150e97ff940422ccf46de21ae8d81fbf951314b3908ef0377d8548adebc4872474f
 DIST swtpm-0.8.0.tar.gz 363951 BLAKE2B 8ec91961c5ac145dc5d1c3c4a609d18bc425caef0efb4d2b18c08c76acacefa619617b6e7b6e8e4e707117a29e3ff3c0198b63d81d24fc747435c6e06e48e8e9 SHA512 7f70c19f732404061be6168c96c0dd3ec91ed8b50dddcafcb50d810062ce0e83ad85360191f97db5db9dc034e01d91cebe3912449d896d2cde68fe060a0adb09
 DIST swtpm-0.8.1.tar.gz 364169 BLAKE2B 4b364ed581ea97d78c5c6248870503b1612d7d164b05b76c1f02644aade6fd09f204396f0a2d0db4e0ecec2792dc512f7c4393c44bf7ce447a3a7fbb8754594f SHA512 07276519b0e20c9c4167ce78e789d2072eb90172ed9bcba2a11eef46ee03a77860f7a2218f4dc013a2ddb8471079e3cbe43f8ab02174bd704a78aea8eee3d2fc
-EBUILD swtpm-0.8.0.ebuild 1423 BLAKE2B a136fec1ca90e331569b9d8e0c8735fca8efba749dc27939d7d821cb9a00df8fb4bb34a352a94b087288758ad07f04d40ad7944c698841a429ac3994c547b370 SHA512 72bf70275da3c31c087db9498572685b0d052b82510311341aeff16ccc2df1f286e379aa4fca7beb624b0f99da27871993a9191ae931069b34ad2cb9234bc80d
-EBUILD swtpm-0.8.1.ebuild 1339 BLAKE2B c2fe347092a6d68980b8a88d27b21f5de0ef17682f4125ed9259de851a6879b9a70b8e8e9b305c3bdea8d6506678b234e186d307a7432660cc447c9f79809c6d SHA512 73628fb233229d092645c1da283a793a55d50862c94cab9934e35549aa643b6316149a973eaed7983a20067508a1e68d8c6db57868f8d890440c7e821e6c5989
-MISC metadata.xml 794 BLAKE2B dba4f05f021693e7404cf11c978290f95002956abe33e4a1296ea485854fa8f3bbbb66ef10f11393c68a9a4ef06218b379e250ef9c3e764d0460e7fcd8121014 SHA512 e7f0800df5a146f216ead60faabaf6b590fb02a0518895714a6b7666798588a3301bb86225296ac4fc65ea8c1d243dfcab97cf6eca9962ae40ce566add3af542
+EBUILD swtpm-0.8.0-r1.ebuild 1443 BLAKE2B 928289a394af381ff6fad6db31d985f31eb8644512aa35c26c8a30eb8fe721088c8e2b28572ffcddbe687b323457164838df3ef4077c6c7864068cb44919557f SHA512 f1bdc4a0d0f1cafb9a55f2428169f10c2dd1edbea3454469a676e77b666ca9787002b246671e1aeb106162f542f51455643c27015b6d7d1f324e0fff72cc0ebb
+EBUILD swtpm-0.8.1-r1.ebuild 1448 BLAKE2B 9ce4ee50718d422f0760ef78567016e478d8423c1f1df15591e745e7e8ad11ee973f5d73d8524882cd650ade80e32c98ce360e43665ac2f3a4e367d595bf434b SHA512 adc1245a18253f34ef063491fece9a3431615ebda0016976c930204253db51c21f4c3cb3bc2613f3b2126854960bbc6f4705d0da13c7934140c1fcc6f74eaea2
+MISC metadata.xml 818 BLAKE2B a76597f339726e233429c815bbf9a4dce2fb4805c76e870c9e3f71671e158bc0d3fac817f9dd48c524f9a0fd804496a19c697253bb28291fa22ba879aa26ff64 SHA512 aa14715b755387e9d0616cba12550778e60c27d25463211a785b28c9a955447b3a707b6230be94a1160c9e7515d75afa472aff825cdee74d53cb049b2645e955
diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml
index f93b188345c2..0cef26f8515d 100644
--- a/app-crypt/swtpm/metadata.xml
+++ b/app-crypt/swtpm/metadata.xml
@@ -15,7 +15,7 @@
 	</maintainer>
 	<use>
 		<flag name="fuse">Support <pkg>sys-fs/fuse</pkg> based /dev/tpm interface</flag>
-		<flag name="gnutls">Use <pkg>net-libs/gnutls</pkg> as crypto engine</flag>
+		<flag name="gnutls">Build the swtpm_cert binary which depends on <pkg>net-libs/gnutls</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">stefanberger/swtpm</remote-id>
diff --git a/app-crypt/swtpm/swtpm-0.8.0.ebuild b/app-crypt/swtpm/swtpm-0.8.0-r1.ebuild
index 3ecf2ac06a0d..fa93580b5b34 100644
--- a/app-crypt/swtpm/swtpm-0.8.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools python-any-r1
 
@@ -26,6 +26,7 @@ RDEPEND="fuse? (
 		>=net-libs/gnutls-3.4.0:=[tools,pkcs11]
 	)
 	seccomp? ( sys-libs/libseccomp )
+	dev-libs/libtasn1:=
 	acct-group/tss
 	acct-user/tss
 	dev-libs/openssl:0=
diff --git a/app-crypt/swtpm/swtpm-0.8.1.ebuild b/app-crypt/swtpm/swtpm-0.8.1-r1.ebuild
index b7d305979779..96cec582841b 100644
--- a/app-crypt/swtpm/swtpm-0.8.1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.8.1-r1.ebuild
@@ -14,13 +14,17 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="fuse seccomp test"
+IUSE="fuse +gnutls seccomp test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="fuse? (
 		dev-libs/glib:2
 		sys-fs/fuse:0
 	)
+	gnutls? (
+		dev-libs/libtasn1:=
+		>=net-libs/gnutls-3.4.0:=[tools,pkcs11]
+	)
 	seccomp? ( sys-libs/libseccomp )
 	dev-libs/libtasn1:=
 	acct-group/tss
@@ -53,6 +57,7 @@ src_configure() {
 		--with-openssl \
 		--without-selinux \
 		$(use_with fuse cuse) \
+		$(use_with gnutls) \
 		$(use_with seccomp) \
 		$(use_enable test)
 }
diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
new file mode 100644
index 000000000000..c3e8f9b3cf70
--- /dev/null
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -0,0 +1,4 @@
+AUX tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch 892 BLAKE2B 25314711ddf35721fb3b8c3c0b077d29f4a097df226dd986f48411bbb79f9e6a30c7bab9a2d19daad85498d5c648833c918c41060fae3f5e22d91d45e7f546ef SHA512 ad5ad95f3fa91a876032472dcaad55384421daf6d9f7b80381dcf0284471006b58a4c0b1bcad2f0ed3df132e6e8da3eec44e9a20413d3685fe1f69b7de150c5b
+DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1 SHA512 be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812
+EBUILD tpm2-openssl-1.1.1.ebuild 2269 BLAKE2B 2b3cadf7e1a5452ca39a7a720e0ebc7ebfe6ad70b8de366c1f2fed0d7bc0b638f6b9e5f359d16aafe2791adca74b39510dc0aadc292e1dd5ee727dcfbddd8c6a SHA512 6c419a5394d6d8cace118b8362c2ce7e8bfd7dcda3d417a72e7bbe96681c13cf1cef0f99d5ba4332bb1bf54d4678e74ca188966bff72c6035e061117ff6c1bb3
+MISC metadata.xml 495 BLAKE2B 2859f35839200edede18d42a8c1e04c3eb2a8983e35a6aa73352d20f5f1a9b8e2685091ab6c121442bbc23ef232ab701cfe1e5eb2f1e2fbd8c3fa1cafd51b749 SHA512 cf93a17e4ef6cf8e9294fadd0b7a33ccf21196bf648f1239a99cb0d8675c130e7e5ab7990b9a292f0814072ee3d234085d92e250f72b86ad854d81a68a642879
diff --git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
new file mode 100644
index 000000000000..5a5554628600
--- /dev/null
+++ b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
@@ -0,0 +1,25 @@
+From 483030d85563e26a62e4baeac3b0fdca0e314199 Mon Sep 17 00:00:00 2001
+From: Petr Gotthard <petr.gotthard@advantech.cz>
+Date: Fri, 23 Dec 2022 10:46:40 +0100
+Subject: [PATCH] tests: include base provider required to load ecparam
+
+---
+ test/ec_genpkey_parameters.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/ec_genpkey_parameters.sh b/test/ec_genpkey_parameters.sh
+index 406b558..a4f68d7 100755
+--- a/test/ec_genpkey_parameters.sh
++++ b/test/ec_genpkey_parameters.sh
+@@ -6,7 +6,7 @@ set -eufx
+ openssl ecparam -name prime256v1 -out testparam.pem
+ 
+ # generate private key as PEM
+-openssl genpkey -provider tpm2 -paramfile testparam.pem -out testkey.pem
++openssl genpkey -provider tpm2 -provider base -paramfile testparam.pem -out testkey.pem
+ 
+ # display private key info
+ openssl ec -provider tpm2 -provider base -in testkey.pem -check -text -noout
+-- 
+2.39.2
+
diff --git a/app-crypt/tpm2-openssl/metadata.xml b/app-crypt/tpm2-openssl/metadata.xml
new file mode 100644
index 000000000000..f02af2f290cf
--- /dev/null
+++ b/app-crypt/tpm2-openssl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>salah.coronya@gmail.com</email>
+		<name>Christopher Byrne</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-openssl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
new file mode 100644
index 000000000000..54fda1a513cb
--- /dev/null
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenSSL Provider for TPM2 integration"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-openssl"
+SRC_URI="https://github.com/tpm2-software/tpm2-openssl/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-crypt/tpm2-tss-3.2.0:=
+	>=dev-libs/openssl-3:="
+DEPEND="${RDEPEND}
+	test? (
+		app-crypt/swtpm[gnutls]
+		app-crypt/tpm2-abrmd
+		app-crypt/tpm2-tools
+	)"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-tests-include-base-provider-required-to-load-ecparam.patch )
+
+src_test() {
+	dbus_run() {
+		(
+			# start isolated dbus session bus
+			local dbus_data=$(dbus-launch --sh-syntax) || exit
+			eval "${dbus_data}"
+
+			$@
+			ret=${?}
+
+			kill "${DBUS_SESSION_BUS_PID}"
+			exit "${ret}"
+		) || die
+	}
+
+	tpm2_run_with_emulator() {
+		local -x XDG_CONFIG_HOME="${T}"/.config/swtpm
+		"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
+
+		mkdir -p "${XDG_CONFIG_HOME}"/mytpm1 || die
+		local swtpm_setup_args=(
+			--tpm2
+			--tpmstate "${XDG_CONFIG_HOME}"/mytpm1
+			--createek
+			--allow-signing
+			--decryption
+			--create-ek-cert
+			--create-platform-cert
+			--lock-nvram
+			--overwrite
+			--display
+		)
+		swtpm_setup "${swtpm_setup_args[@]}" || die
+
+		local swtpm_socket_args=(
+			--tpm2
+			--tpmstate dir="${XDG_CONFIG_HOME}"/mytpm1
+			--flags startup-clear
+			--ctrl type=unixio,path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket.ctrl
+			--server type=unixio,path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket
+			--pid file="${XDG_CONFIG_HOME}"/mytpm1/swtpm.pid
+			--daemon
+		)
+		swtpm socket "${swtpm_socket_args[@]}" || die
+
+		local tpm2_abrmd_args=(
+			--logger=stdout
+			--tcti=swtpm:path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket
+			--session
+			--flush-all
+		)
+		tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+
+		local -x TPM2OPENSSL_TCTI="tabrmd:bus_type=session"
+		local -x TPM2TOOLS_TCTI="tabrmd:bus_type=session"
+
+		$@ || die
+
+		# When swtpm dies, tmp2-abrmd will exit
+		kill $(< "${XDG_CONFIG_HOME}"/mytpm1/swtpm.pid) || die
+	}
+
+	dbus_run tpm2_run_with_emulator make check
+}
+
+src_install() {
+	default
+	find "${ED}" -iname '*.la' -delete || die
+}