commit: f591da722da994c5bbc9ae3431bfffbfa65b7fe1 Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com> AuthorDate: Sat Oct 14 20:42:30 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Thu Jan 11 16:07:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f591da72
app-crypt/tpm2-openssl: drop 1.1.1-r1 Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33336 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> app-crypt/tpm2-openssl/Manifest | 1 - ...de-base-provider-required-to-load-ecparam.patch | 25 ----- .../tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild | 109 --------------------- 3 files changed, 135 deletions(-) diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest index 22745e950b20..9086c8e08327 100644 --- a/app-crypt/tpm2-openssl/Manifest +++ b/app-crypt/tpm2-openssl/Manifest @@ -1,2 +1 @@ -DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1 SHA512 be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812 DIST tpm2-openssl-1.2.0.tar.gz 424967 BLAKE2B 9bcdc47b2eb94329caace24f10e8c234cdd92250ee7fdd4f6156c278328c0103a2285234e64f48f951f5e1b77e72341eb129ee996e628641a4032849fe5a62ce SHA512 4a12c83a0687768cd972a8d7e544f4bba2debcd24d7da2d2ee9adb097d1565bb1d69d1c448edff05f040b95700847293a8e33bfe92f43e536d13bc734ded1e1d 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 deleted file mode 100644 index 5a5554628600..000000000000 --- a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 483030d85563e26a62e4baeac3b0fdca0e314199 Mon Sep 17 00:00:00 2001 -From: Petr Gotthard <[email protected]> -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/tpm2-openssl-1.1.1-r1.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild deleted file mode 100644 index a420baf98c3a..000000000000 --- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -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=" - sys-devel/autoconf-archive - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-tests-include-base-provider-required-to-load-ecparam.patch" - "${FILESDIR}/${P}-build-Fix-undefined-references-when-using-slibtool.patch" -) - -src_prepare() { - eautoreconf - default -} - -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 -}
