From 11d4aa3149c1654953e22c50bf718b340406b158 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 20 Jan 2023 11:40:14 +0000 Subject: gentoo auto-resync : 20:01:2023 - 11:40:14 --- app-crypt/Manifest.gz | Bin 23935 -> 23935 bytes app-crypt/tpm2-tss-engine/Manifest | 6 +- ...-1.1.0-tests-Allow-compilation-under-musl.patch | 35 -------- .../tpm2-tss-engine-1.1.0-r1.ebuild | 42 ---------- .../tpm2-tss-engine-1.1.0-r2.ebuild | 47 ----------- .../tpm2-tss-engine/tpm2-tss-engine-1.2.0.ebuild | 43 ++++++++++ app-crypt/tpm2-tss/Manifest | 5 +- ...pm2-tss-4.0.0-Dont-install-files-into-run.patch | 26 ++++++ app-crypt/tpm2-tss/metadata.xml | 1 + app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild | 93 +++++++++++++++++++++ 10 files changed, 169 insertions(+), 129 deletions(-) delete mode 100644 app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch delete mode 100644 app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild delete mode 100644 app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r2.ebuild create mode 100644 app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.2.0.ebuild create mode 100644 app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch create mode 100644 app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild (limited to 'app-crypt') diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index bfbc5d69acc5..0da35ef8e061 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest index 617723eb5ead..2c1f8c521d55 100644 --- a/app-crypt/tpm2-tss-engine/Manifest +++ b/app-crypt/tpm2-tss-engine/Manifest @@ -1,5 +1,3 @@ -AUX tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch 1025 BLAKE2B 4f957dc6a7ceafe53dcf68ded61e2d75d9c09f4b8c056ab92857662e42223b83d99595d7d5c4f89547d3001427a27370d45597349be5261ebd35f30dd105a498 SHA512 6505fa8eba5ead5b75b48d6b4bd1bbf65ac5060fb1d5b77a2b3eec14420fb80d4a712ebb01c7485fc8dd36c5c9a1e9f0b1bd3d9867338858fa63a0070abfec10 -DIST tpm2-tss-engine-1.1.0.tar.gz 394448 BLAKE2B 0502907dc9ce872f31be3b980f975a02af2e3e4b369d188afa5327bd4475d93dbf43769dc7ddc11e8cbda8d1fde09f28a9aef9145e859a90225cd397f62c7a2c SHA512 5d2e08178be54350e8672245023d601a0d9d520f8c49e977af49d7c59b91d033c14b4a347b71e042fe7c5ff12af9fcc43b69fd1dc83a9f0db12d47d43e1107f4 -EBUILD tpm2-tss-engine-1.1.0-r1.ebuild 873 BLAKE2B a08a6ac9fb15bb90576eba365aa80e3c23b67df12a6186a84df4f949e2dfb7995d928ffeddfc66367f93fa62b9da9e0898f617f263aaab16e6caed237f912086 SHA512 828b2b3317317f049a00bd073c257db6b39d3aae9d902a6fc6e8206615b18a6f78e3ad26a1f93bd564ac209d2a9defea80dce849c648e6da550af9557516a823 -EBUILD tpm2-tss-engine-1.1.0-r2.ebuild 995 BLAKE2B 637e5639800057b2f132781774944431bb6bbfcf6c66ad64c08dccfa6a8c1b2a720055788db69a45907e1e1760133d82fa82b83c960ee49053aa07b5a8ef7c48 SHA512 d357f6ce46b93ef9d7d3546dec2d128ff91d5a5aa288c5f69ed18b4e436e618771005610e9d8448c9be4333148495e9101492d9725e1ac01d88f78188ce03caa +DIST tpm2-tss-engine-1.2.0.tar.gz 410605 BLAKE2B f6b88238ed780315cf23dc9caac4639220e76e8daeeb35a0e9bf2f23efb1b45497dd24f43f97d0f4018440b33e2e80de4f321254b9e58708d04a15a3bd922aae SHA512 cd0f1c3b5251ab2f21159099cdb9c0b1cc68d7ad334d4c5245bba9c07274ecea7c86a531afc9ce6250635a9d0929a5147f461cc3760b15cd6ad099342af87ad0 +EBUILD tpm2-tss-engine-1.2.0.ebuild 912 BLAKE2B 166e641ff7298fdc284dffbcd84293c5be7a8f4232321faa5d6bfe7105216bbc57b3f55ef923efffec9f101da7c4a9ef95acf55aaa8fb7ab3568e001c130b028 SHA512 01f494ce396b6407449034b5e2855bda27692719da4336106a8406eaf11272be968072c08a29079d77ef088cc5c849e2cfb95df509644d8fe0a91eafd005f0a2 MISC metadata.xml 498 BLAKE2B 00c3e4cdaaf71d33864bfdca3585e9874a6d984aa6d825e8ed2dcc00afa022c5908b37da3e391238f4c7519408d4dcaafff40ceee644312e568627c44bfdecec SHA512 459f2c5d0a6051a81cf5f3c17f65248fe8e1681db2032ccebc2a1c0de6ea427c45bb317ffd374bb141f5f06bc16305e61bc591df9d943821fe1ac0f31e4f5323 diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch deleted file mode 100644 index b8114b4c25c0..000000000000 --- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/833531 ---- a/configure.ac -+++ b/configure.ac -@@ -174,6 +174,8 @@ AC_ARG_WITH([device], - [with_device_set=no]) - AM_CONDITIONAL([TESTDEVICE],[test "x$with_device_set" = xyes]) - -+AC_CHECK_FUNC([backtrace_symbols_fd],[AC_DEFINE([HAVE_EXECINFO],[1], ['Define to 1 if you have the header file.'])]) -+ - # Integration test with simulator - AS_IF([test "x$enable_integration" = xyes && test "x$with_device_set" = xno], - [integration_args="" ---- a/test/error_tpm2-tss-engine-common.c -+++ b/test/error_tpm2-tss-engine-common.c -@@ -7,7 +7,9 @@ - #include "tpm2-tss-engine.h" - #include "tpm2-tss-engine-common.h" - -+#ifdef HAVE_EXECINFO - #include -+#endif - #include - #include - #include -@@ -17,8 +19,10 @@ TSS2_RC - __wrap_Esys_Initialize() - { - printf("Esys_Initialize called\n"); -+#ifdef HAVE_EXECINFO - void* b[128]; - backtrace_symbols_fd(b, backtrace(b, sizeof(b)/sizeof(b[0])), STDOUT_FILENO); -+#endif - return -1; - } - diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild deleted file mode 100644 index a737e7269f55..000000000000 --- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 - -DESCRIPTION="OpenSSL Engine for TPM2 devices" -HOMEPAGE="https://github.com/tpm2-software/tpm2-tss-engine" -SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="app-crypt/tpm2-tss:= - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND="sys-devel/autoconf-archive - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable test unit) \ - --disable-defaultflags \ - --disable-static \ - --with-completionsdir="$(get_bashcompdir)" -} - -src_install () { - default - find "${ED}" -name '*.la' -delete || die - dobashcomp bash-completion/* -} diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r2.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r2.ebuild deleted file mode 100644 index c320b9d81d6f..000000000000 --- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 - -DESCRIPTION="OpenSSL Engine for TPM2 devices" -HOMEPAGE="https://github.com/tpm2-software/tpm2-tss-engine" -SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="app-crypt/tpm2-tss:= - >=dev-libs/openssl-1.1.1:= - Enable feature API (requires openssl as crypto backend) Use net-libs/mbedtls as crypto engine Use dev-libs/openssl as crypto engine + Enable policy library (requires openssl as crypto backend) tpm2-software/tpm2-tss diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild new file mode 100644 index 000000000000..ba650e60ee44 --- /dev/null +++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev + +DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack" +HOMEPAGE="https://github.com/tpm2-software/tpm2-tss" +SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/4" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="doc +fapi +openssl mbedtls +policy static-libs test" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="^^ ( mbedtls openssl ) + fapi? ( openssl !mbedtls ) + policy? ( openssl !mbedtls )" + +RDEPEND="acct-group/tss + acct-user/tss + fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}] + >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) + openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )" + +DEPEND="${RDEPEND} + test? ( app-crypt/swtpm + dev-libs/uthash + dev-util/cmocka + fapi? ( >=net-misc/curl-7.80.0 ) )" +BDEPEND="sys-apps/acl + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch" + ) + +pkg_setup() { + local CONFIG_CHECK=" \ + ~TCG_TPM + " + linux-info_pkg_setup + kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required" +} + +src_prepare() { + eautoreconf + default +} + +multilib_src_configure() { + # tests fail with LTO enabbled. See bug 865275 and 865279 + filter-lto + + ECONF_SOURCE=${S} econf \ + --localstatedir=/var \ + $(multilib_native_use_enable doc doxygen-doc) \ + $(use_enable fapi) \ + $(use_enable policy) \ + $(use_enable static-libs static) \ + $(multilib_native_use_enable test unit) \ + $(multilib_native_use_enable test integration) \ + $(multilib_native_use_enable test self-generated-certificate) \ + --disable-tcti-libtpms \ + --disable-defaultflags \ + --disable-weakcrypto \ + --with-crypto="$(usex mbedtls mbed ossl)" \ + --with-runstatedir=/run \ + --with-udevrulesdir="$(get_udevdir)/rules.d" \ + --with-udevrulesprefix=60- \ + --without-sysusersdir \ + --with-tmpfilesdir="/usr/lib/tmpfiles.d" +} + +multilib_src_install() { + default + keepdir /var/lib/tpm2-tss/system/keystore + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + tmpfiles_process tpm2-tss-fapi.conf + udev_reload +} + +pkg_postrm() { + udev_reload +} -- cgit v1.2.3