From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 28 Jan 2022 15:57:09 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nDSgX-00G8Dk-HU for lore@lore.pengutronix.de; Fri, 28 Jan 2022 15:57:09 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nDSgW-0000YT-PC; Fri, 28 Jan 2022 15:57:08 +0100 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nDSfz-0000YH-Qx; Fri, 28 Jan 2022 15:56:35 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1nDSfy-0004CX-Ja; Fri, 28 Jan 2022 15:56:34 +0100 Date: Fri, 28 Jan 2022 15:56:34 +0100 From: Michael Olbrich To: Christian Melki Message-ID: <20220128145634.GB11273@pengutronix.de> Mail-Followup-To: Christian Melki , ptxdist@pengutronix.de, Bruno Thomsen References: <20220127143532.2212796-1-christian.melki@t2data.com> <20220127143532.2212796-12-christian.melki@t2data.com> <15e01361-df23-88a5-87aa-70acc2db36ab@t2data.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <15e01361-df23-88a5-87aa-70acc2db36ab@t2data.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 15:53:16 up 48 days, 23:38, 78 users, load average: 0.11, 0.11, 0.09 User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [ptxdist] [PATCH] tpm2-tools: Version bump. 4.1 -> 5.2 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Bruno Thomsen , ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On Fri, Jan 28, 2022 at 02:33:29PM +0100, Christian Melki wrote: > > > On 1/28/22 10:31 AM, Michael Olbrich wrote: > > On Thu, Jan 27, 2022 at 04:54:31PM +0100, Bruno Thomsen wrote: > > > Hi > > > > > > Den tor. 27. jan. 2022 kl. 15.36 skrev Christian Melki > > > : > > > > > > > > Approx 2 years worth of fixes. > > > > https://github.com/tpm2-software/tpm2-tools/releases > > > > > > > > Fixes CVE-2021-3565. > > > > Update license file hash. > > > > tpm2-tools now depend on EFIVAR. > > > > > > > > Signed-off-by: Christian Melki > > > > --- > > > > rules/tpm2-tools.in | 1 + > > > > rules/tpm2-tools.make | 5 ++--- > > > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > > > > > diff --git a/rules/tpm2-tools.in b/rules/tpm2-tools.in > > > > index 4c9cbaa92..99482845b 100644 > > > > --- a/rules/tpm2-tools.in > > > > +++ b/rules/tpm2-tools.in > > > > @@ -5,6 +5,7 @@ config TPM2_TOOLS > > > > select TPM2_TSS > > > > select OPENSSL > > > > select LIBCURL > > > > + select EFIVAR > > > > It's optional and TPMs are used on !EFI platforms, so please add an option > > for this. > > > > Hmm. There is a bit of a pitfall here. > tpm2-tools seems to detect the efivar header and library a bit separately. > So if someone installs efivar on dependency and does not select adding > efivar it will find the headers but ptxdist will block the pkgconfig. > Which will result in a failed build. > > There is no "add this if someone else selected the dependency already" ? :) No, need. You just need an autoconf expert :-) TPM2_TOOLS_CONF_ENV := \ $(CROSS_ENV) \ $(call ptx/ifdef, PTXCONF_TPM2_TOOLS_EFI,,ac_cv_header_efivar_efivar_h=no) or something like that. If that variable is set to 'no' then the check will be skipped. Michael > > > > prompt "tpm2-tools" > > > > help > > > > This package contains a set of tools to use with TPM 2.0 > > > > diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make > > > > index ead881ffb..16cedff74 100644 > > > > --- a/rules/tpm2-tools.make > > > > +++ b/rules/tpm2-tools.make > > > > @@ -14,15 +14,14 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools > > > > # > > > > # Paths and names > > > > # > > > > -TPM2_TOOLS_VERSION := 4.1 > > > > -TPM2_TOOLS_MD5 := aecec22668233776922909f2ebf55e65 > > > > +TPM2_TOOLS_VERSION := 5.2 > > > > +TPM2_TOOLS_MD5 := 0057615ef43b9322d4577fc3bde0e8d6 > > > > TPM2_TOOLS := tpm2-tools-$(TPM2_TOOLS_VERSION) > > > > TPM2_TOOLS_SUFFIX := tar.gz > > > > TPM2_TOOLS_URL := https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) > > > > TPM2_TOOLS_SOURCE := $(SRCDIR)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) > > > > TPM2_TOOLS_DIR := $(BUILDDIR)/$(TPM2_TOOLS) > > > > TPM2_TOOLS_LICENSE := BSD-3-Clause > > > > -TPM2_TOOLS_LICENSE_FILES := file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc > > > > > > You forgot to add the new license file hash as stated in the commit message. > > > > Indeed. Please add it again. > > > > Michael > > > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de