From 5017c48e54de7e3dcebd1db96598cf0a07b21f16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Sep 2023 23:01:48 +0100 Subject: gentoo auto-resync : 16:09:2023 - 23:01:48 --- app-crypt/tpm2-openssl/Manifest | 3 +- ...-undefined-references-when-using-slibtool.patch | 26 +++++ .../tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild | 109 +++++++++++++++++++++ app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild | 97 ------------------ 4 files changed, 137 insertions(+), 98 deletions(-) create mode 100644 app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch create mode 100644 app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild delete mode 100644 app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild (limited to 'app-crypt/tpm2-openssl') diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest index c3e8f9b3cf70..c87b57f78b1b 100644 --- a/app-crypt/tpm2-openssl/Manifest +++ b/app-crypt/tpm2-openssl/Manifest @@ -1,4 +1,5 @@ +AUX tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch 975 BLAKE2B 6a7b744513e026cbcc916543d3aa17300a63185eb112c3f1afb1eb4ffb0a02554c18759106c0c7d82efab9bc7b8c9e9f8809f06959edf763d6b38458416d160e SHA512 a4bc43d08f4cd70ba39a3396351894454edbb4ef284344a3184c8538685b15d85a8554619077d03d694e1355dcac5ab57976531f47158f5d2575c5bf7207e966 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 +EBUILD tpm2-openssl-1.1.1-r1.ebuild 2440 BLAKE2B 10dc70497ebb0779508eda684d14ae21819a1116827159bcf7976825d7dee3ac961b90cf15d3b12c6d23ad61f8e160bf8605d1d63f7ea99d8104f04931689da9 SHA512 70d67ce9bb432a32e3fbf6968e974cc5841696cf5d79d65073fefb5c3ab20adf469cdb8e8e48030d60b63ab4ce59cf4721fbfd5ccefe95779630bd145f0bfd04 MISC metadata.xml 495 BLAKE2B 2859f35839200edede18d42a8c1e04c3eb2a8983e35a6aa73352d20f5f1a9b8e2685091ab6c121442bbc23ef232ab701cfe1e5eb2f1e2fbd8c3fa1cafd51b749 SHA512 cf93a17e4ef6cf8e9294fadd0b7a33ccf21196bf648f1239a99cb0d8675c130e7e5ab7990b9a292f0814072ee3d234085d92e250f72b86ad854d81a68a642879 diff --git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch new file mode 100644 index 000000000000..4045a940756f --- /dev/null +++ b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch @@ -0,0 +1,26 @@ +From 8c87d708a168ab090f8e5fc01f2bf1db5103427d Mon Sep 17 00:00:00 2001 +From: Christopher Byrne +Date: Fri, 15 Sep 2023 11:26:55 -0500 +Subject: [PATCH] build: Fix undefined references when using slibtool + +Signed-off-by: Christopher Byrne +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index a0ad0d5..34a751c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -50,7 +50,7 @@ tpm2_la_LIBADD = $(TSS2_ESYS_LIBS) $(TSS2_TCTILDR_LIBS) $(LIBS) $(CODE_COVERAGE_ + if TSS2_RC + tpm2_la_LIBADD += $(TSS2_RC_LIBS) + endif +-tpm2_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols-regex 'OSSL_provider_init' $(COMMON_LDFLAGS) $(CODE_COVERAGE_LDFLAGS) ++tpm2_la_LDFLAGS = -module -avoid-version -export-symbols-regex 'OSSL_provider_init' $(COMMON_LDFLAGS) $(CODE_COVERAGE_LDFLAGS) + + check_PROGRAMS = test/selftest + test_selftest_SOURCES = test/selftest.c +-- +2.41.0 + 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 new file mode 100644 index 000000000000..a420baf98c3a --- /dev/null +++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild @@ -0,0 +1,109 @@ +# 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 +} diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild deleted file mode 100644 index 54fda1a513cb..000000000000 --- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# 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 -} -- cgit v1.2.3