commit: 22efe441fa7828eeec91ce9d69a7a2c3062fa67a Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com> AuthorDate: Tue Sep 28 19:54:42 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Oct 4 14:23:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22efe441
app-crypt/tpm2-tools: Remove old Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/22434 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> app-crypt/tpm2-tools/Manifest | 1 - .../tpm2-tools-5.1.1-fix-tpm-checkquote.patch | 34 ---------- app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild | 72 ---------------------- 3 files changed, 107 deletions(-) diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest index 158898da959..d710f2982f6 100644 --- a/app-crypt/tpm2-tools/Manifest +++ b/app-crypt/tpm2-tools/Manifest @@ -1,3 +1,2 @@ DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b SHA512 1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1 -DIST tpm2-tools-5.1.1.tar.gz 1044427 BLAKE2B 885ff61ad971c95d067bf8f9339de289f082f3103d1c382f45ac3ffbd4d5effc343ddc3c2c74b97b9d31f3f823d264991d1726c1f9c21d5c9b82ac1cdf714d3f SHA512 4e094dcffb66103773d85e866ab9ba8db5d0f205ff9658e08fe14e8e41250570a7f7274b4048934adf256ea41650fa498fc3d6da2786adc241a4bf2e8f7bf78e DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch deleted file mode 100644 index 73fb0e3f487..00000000000 --- a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3d7edb1c70cba6c34c71c9b856c07b8adcebb15c Mon Sep 17 00:00:00 2001 -From: Alberto Planas <[email protected]> -Date: Thu, 17 Jun 2021 11:07:25 +0200 -Subject: [PATCH] tpm2_checkquote: fix uninitialized variable - -The variable `temp_pcrs` is uninitialized, and later partially -uninitialized when reading the selection data from file. - -When activating lto optimizations, this bug presents itself showing an -error during the read of the quote: - -ERROR: Malformed PCR file, pcr count cannot be greater than 32, got: ... - -Fixes: #2767 - -Co-authored-by: Martin Liska <[email protected]> -Signed-off-by: Alberto Planas <[email protected]> ---- - tools/misc/tpm2_checkquote.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/misc/tpm2_checkquote.c b/tools/misc/tpm2_checkquote.c -index 531508579..8d780f111 100644 ---- a/tools/misc/tpm2_checkquote.c -+++ b/tools/misc/tpm2_checkquote.c -@@ -376,7 +376,7 @@ static tool_rc init(void) { - TPM2B_ATTEST *msg = NULL; - TPML_PCR_SELECTION pcr_select; - tpm2_pcrs *pcrs; -- tpm2_pcrs temp_pcrs; -+ tpm2_pcrs temp_pcrs = {}; - tool_rc return_value = tool_rc_general_error; - - msg = message_from_file(ctx.msg_file_path); diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild deleted file mode 100644 index 6ede7d5e055..00000000000 --- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) -inherit autotools bash-completion-r1 python-single-r1 - -DESCRIPTION="Tools for the TPM 2.0 TSS" -HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"; -SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+fapi test" - -RDEPEND=">=app-crypt/tpm2-tss-3.0.1[fapi?] - dev-libs/openssl:= - net-misc/curl - sys-libs/efivar:= - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - test? ( - app-crypt/swtpm - app-crypt/tpm2-abrmd - app-editors/vim-core - dev-tcltk/expect - dev-util/cmocka - dev-python/pyyaml - )" -BDEPEND="virtual/pkgconfig - sys-devel/autoconf-archive" - -RESTRICT="!test? ( test )" -REQUIRED_USE=" ${PYTHON_REQUIRED_USE} " - -# One of the tests fails without this patch. See -# https://github.com/tpm2-software/tpm2-tools/issues/2767 -PATCHES=( - "${FILESDIR}/${PN}-5.1.1-fix-tpm-checkquote.patch" - "${FILESDIR}/${PN}-5.1.1-no-efivar-automagic.patch" -) - -src_prepare() { - sed -i \ - "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \ - "${S}/configure.ac" || die - "${S}/scripts/utils/man_to_bashcompletion.sh" - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable fapi) \ - $(use_enable test unit) \ - --with-bashcompdir=$(get_bashcompdir) \ - --enable-hardening -} - -src_install() { - default - - mv "${D}/$(get_bashcompdir)/tpm2_completion.bash" \ - "${D}/$(get_bashcompdir)/tpm2" || die - for B in "${D}"/usr/bin/tpm2_* - do - TPM2_UTILS="${TPM2_UTILS} $(basename ${B})" - done - bashcomp_alias tpm2 ${TPM2_UTILS} -}
