From 97f40b36b1afa9726e32962d11f3ac2d0bc5792e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Feb 2023 08:04:03 +0000 Subject: gentoo auto-resync : 16:02:2023 - 08:04:02 --- app-crypt/tpm2-tools/Manifest | 8 ++-- app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild | 10 +++- app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild | 54 ---------------------- app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild | 10 +++- app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild | 66 +++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 60 deletions(-) delete mode 100644 app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild create mode 100644 app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild (limited to 'app-crypt/tpm2-tools') diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest index 08c7db61d05d..95efe4daf769 100644 --- a/app-crypt/tpm2-tools/Manifest +++ b/app-crypt/tpm2-tools/Manifest @@ -1,9 +1,9 @@ AUX tpm2-tools-5.1.1-no-efivar-automagic.patch 1083 BLAKE2B 10a8299a28ee54339ac73692dc54475da3044d3afcfe570d6c72f5d8ace2bbf3faf5242002be02c4a765ba9b9c37ba9777d9b4b8bac416e6721d9b8660d19bf2 SHA512 4622e235ef5202cc3448fbc67f362ce36396ca04892c340f275f67c93d5bb2857a14094329ec499c4f7215ac10002b70d18cfc2bdef1474d93f556c5759383ae AUX tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch 1380 BLAKE2B ffbbe59cbfd4a411544ef7f03ed04c73afc774edebaa2da8deb11e7fe4f321b88b686d3138fd5524b2279407518dda32de0e1cb96a5517ba87f8cc8c9ddb2be5 SHA512 557ad07048e288a9611222b920e8c82fab9852dde04da2b57981cb04ce3bb9d4ea40c57ba24fb2b3dc09cacc16ef731d11428d0603d757f7f7adc2023c5ca779 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b -DIST tpm2-tools-5.3.tar.gz 1118934 BLAKE2B 7efb43180c23cee30ea860fb697049d5c4444594bff66404d0fe805ef1783b70859c04563ed946fe38bac329fe0c849ba30fe0dff9fc10f0d6942210862d96d6 SHA512 224a5ea3448a877362abb35ac06b115c559c09b44b30d74c8326211be66d24e0e130c285b1e285be1842e7203ab488629b0f4e451cbd782c83ed72023d146675 DIST tpm2-tools-5.4.tar.gz 1241132 BLAKE2B 21406ec61de19db49f1dd1ff9648e1b0a9ae2647df2ce290acca40c2fc54464e3c8a744afdbc9314ca731869ac974a7863e2bea3c70df844a972501a5b7973f2 SHA512 8d7802b85bd26b6efa0ed6be73b917b907bb7b424ff7d07e46e5574dfdd9d46ea2d7727904ebaba4651c8d1249cd52a7dc6dff8e9635666c8d97ca7c337a0396 -EBUILD tpm2-tools-5.2-r1.ebuild 1602 BLAKE2B 30520fa7f60f376bc7da6550c29d20fd1661f4f3980acf2878117001b62d21a1be043d3d0293306e31214a0da6f17ecbcfd35ced6f73aa87284d0ef8eebfb53a SHA512 dccbfbd77dd97b03bb33ce92f0195bfbbb6dc98c635c368e745360fbde89c1a17385bdfe04f2ad7a9ab0a0a8583779801e2ea8cef1e13e11533e9dcfd8b460e4 -EBUILD tpm2-tools-5.3.ebuild 1273 BLAKE2B 3ba587f7a79436932c4def8067fbc849d62409fb5089911231df32d649891b7c2ef871d0c3de52f78bd52c796ca2d038418951576995740096d480f5dbe3ffdf SHA512 245aad5ff5d568258e3b28cb4cf5c8e915f6f6171c5f0b180b092e14fc4642eca0107141aced4b19c41a84cdabec398c7fd445e4b1e5e1079cb6ce5042e8d8aa -EBUILD tpm2-tools-5.4.ebuild 1263 BLAKE2B 85b4d229836ede250a038d17ce81682dc40f9cc246257761cad73c601e16c30ccc9d2525245c9d6fbc1ced545aa71fe2bc36b39017811348225516b185178db1 SHA512 34207687bf3c3f96d530886571ea71673014c58cba753e5a548a5d3731f00d692496395dd0c6f4f5b304a40077ad8f15391d29e97018cc8d8dbc547681bd1a83 +DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26 SHA512 24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470 +EBUILD tpm2-tools-5.2-r1.ebuild 1739 BLAKE2B a866142cfee255878eeca763d5a8d5cd0405d93fd6a7d5ffeac578bc82bfeb8344dce79090acd5442c2358949f7bb15317f4a9c490761bdd5494b71978f5cfbb SHA512 603d4afddfb7c39efd4347f05586650c8d04631980a946e4f381960e009cb3e62895715ec1f28c037c8f1e3600e064dbc059a4b80ae7a8cee6b5736ab81fa3f0 +EBUILD tpm2-tools-5.4.ebuild 1407 BLAKE2B b5da6fa996e147afea6226a9905012b339ed9576b13323266a758b49965cf6d35f56b652c17ffacbec4e567c4b60447add826cd354f686f7dc57a6b939c48888 SHA512 8ac513c66d98d7a7a853c4de03f563fcddf5ba4d65612e3cb32cba4a31108817a2d7b07bac72d9f2270d7743268308740c09c33bf121e88c56bcd10a6d0f4e3d +EBUILD tpm2-tools-5.5.ebuild 1647 BLAKE2B 94eb5782206b11405f5e821240a6c27938aa5e6bf27e34fb6f997cb59757f1b81053d1753e76314a87204b846af98082c6e7ba7ee773097674fc1fe5fe50ebb7 SHA512 e46bba1241c8f0d325489d00076e85f400dc48946ff06bba58d0d1bd54c0beaf6c787fbca5cb2e818996082027982667670594ba03c081571ea0fb59624511f2 MISC metadata.xml 560 BLAKE2B fe8daaba2a7586247537f8ed7b92769676b20f2c1377f7bb582dff49e06cf3f9beba4f79e28f10ea76d67d089eb152b060b091414dd9b47c5694ca153211421f SHA512 a744fcc50c7e44b1939190150404aee9054eab8e921e6f63cafa58dc80be5f20692632509de85399b6a9633701da72fd951e8bcfbe9e5177f315fa1dcbcc9ee5 diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild index 3ab7ad1a2fbe..b51e5b4b83e0 100644 --- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild +++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools bash-completion-r1 flag-o-matic python-any-r1 DESCRIPTION="Tools for the TPM 2.0 TSS" @@ -41,6 +41,14 @@ PATCHES=( "${FILESDIR}/${PN}-5.2-testparms-fix-condition-for-negative-test.patch" ) +python_check_deps() { + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_prepare() { default sed -i \ diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild deleted file mode 100644 index b2293c046c2c..000000000000 --- a/app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -inherit autotools bash-completion-r1 flag-o-matic python-any-r1 - -DESCRIPTION="Tools for the TPM 2.0 TSS" -HOMEPAGE="https://github.com/tpm2-software/tpm2-tools" -SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+fapi test" - -RESTRICT="!test? ( test )" - -RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?] - dev-libs/openssl:= - net-misc/curl - sys-libs/efivar:=" -DEPEND="${RDEPEND} - test? ( - app-crypt/swtpm - app-crypt/tpm2-abrmd - dev-util/cmocka - )" -BDEPEND="virtual/pkgconfig - sys-devel/autoconf-archive - test? ( - app-editors/vim-core - dev-tcltk/expect - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - ) - ${PYTHON_DEPS}" - -src_configure() { - # tests fail with LTO enabbled. See bug 865275 and 865277 - filter-lto - econf \ - $(use_enable fapi) \ - $(use_enable test unit) \ - --with-bashcompdir=$(get_bashcompdir) \ - --enable-hardening -} - -src_install() { - default - mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die - local utils=( "${ED}"/usr/bin/tpm2_* ) - bashcomp_alias tpm2 "${utils[@]##*/}" -} diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild index 6b996f725753..9a0ccfad1d4a 100644 --- a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild +++ b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,6 +36,14 @@ BDEPEND="virtual/pkgconfig ) ${PYTHON_DEPS}" +python_check_deps() { + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_configure() { # tests fail with LTO enabbled. See bug 865275 and 865277 filter-lto diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild new file mode 100644 index 000000000000..e463582021ec --- /dev/null +++ b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit bash-completion-r1 flag-o-matic python-any-r1 + +DESCRIPTION="Tools for the TPM 2.0 TSS" +HOMEPAGE="https://github.com/tpm2-software/tpm2-tools" +SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+fapi test" + +RESTRICT="!test? ( test )" + +RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?] + dev-libs/openssl:= + net-misc/curl + sys-libs/efivar:=" +DEPEND="${RDEPEND} + test? ( + app-crypt/swtpm + app-crypt/tpm2-abrmd + dev-util/cmocka + )" +BDEPEND="virtual/pkgconfig + sys-devel/autoconf-archive + test? ( + app-editors/vim-core + dev-tcltk/expect + $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + ) + ${PYTHON_DEPS}" + +python_check_deps() { + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + # tests fail with LTO enabbled. See bug 865275 and 865277 + filter-lto + econf \ + $(use_enable fapi) \ + $(use_enable test unit) \ + --with-bashcompdir=$(get_bashcompdir) \ + --enable-hardening +} + +src_install() { + default + mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die + local utils=( "${ED}"/usr/bin/tpm2_* ) + utils=("${utils[@]##*/}") + # these utiltites don't have bash completions + local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest tpm2_sessionconfig ) + mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw "${nobashcomp[@]/#/-e}") + bashcomp_alias tpm2 "${utils[@]}" +} -- cgit v1.2.3