From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9A6D415808B for ; Wed, 23 Feb 2022 01:16:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF0EAE0997; Wed, 23 Feb 2022 01:16:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84B11E0997 for ; Wed, 23 Feb 2022 01:16:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64989343156 for ; Wed, 23 Feb 2022 01:16:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4813F2EC for ; Wed, 23 Feb 2022 01:16:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1645578973.aec95f5d31e5e85246f4532a882d8fc4213e4465.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/tpm2-tss/tpm2-tss-3.2.0-r1.ebuild X-VCS-Directories: app-crypt/tpm2-tss/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: aec95f5d31e5e85246f4532a882d8fc4213e4465 X-VCS-Branch: master Date: Wed, 23 Feb 2022 01:16:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4b1d3554-69fb-4980-b602-e175cb4e0407 X-Archives-Hash: fd0e61ad690a331bb21919d3b29272af commit: aec95f5d31e5e85246f4532a882d8fc4213e4465 Author: Sam James gentoo org> AuthorDate: Wed Feb 23 01:16:13 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 23 01:16:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec95f5d app-crypt/tpm2-tss: add safeguard for bad .pc file version Bug: https://bugs.gentoo.org/833887 Bug: https://bugs.gentoo.org/833907 Bug: https://bugs.gentoo.org/833884 Bug: https://bugs.gentoo.org/833388 Signed-off-by: Sam James gentoo.org> app-crypt/tpm2-tss/tpm2-tss-3.2.0-r1.ebuild | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r1.ebuild index 4f8e544d9a79..bc7284c68a56 100644 --- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r1.ebuild +++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r1.ebuild @@ -49,9 +49,12 @@ pkg_setup() { src_prepare() { default + + # See bug #833887 (and similar); eautoreconf means .pc file gets wrong version. sed -i \ "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \ "configure.ac" || die + eautoreconf } @@ -77,6 +80,12 @@ src_configure() { src_install() { default + + if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then + # Safeguard for bug #833887 + die "pkg-config file version doesn't match ${PV}! Please report a bug!" + fi + find "${D}" -name '*.la' -delete || die }