[ptxdist] [PATCH v3] tpm2-tools: Version bump. 4.1 -> 5.2

[ptxdist] [PATCH v3] tpm2-tools: Version bump. 4.1 -> 5.2

[Christian Melki]

Approx 2 years worth of fixes.
https://github.com/tpm2-software/tpm2-tools/releases

* Fixes CVE-2021-3565.
* Update license file hash. File moved to a new directory.
* tpm2-tools now optionally depends on EFIVAR for prettyprinting
device paths.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/tpm2-tools.in   | 14 +++++++++++++-
 rules/tpm2-tools.make |  6 +++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/rules/tpm2-tools.in b/rules/tpm2-tools.in
index 4c9cbaa92..20a3a7b7e 100644
--- a/rules/tpm2-tools.in
+++ b/rules/tpm2-tools.in
@@ -1,13 +1,25 @@
 ## SECTION=tpm
 
-config TPM2_TOOLS
+menuconfig TPM2_TOOLS
 	tristate
 	select TPM2_TSS
 	select OPENSSL
 	select LIBCURL
+	select EFIVAR		if TPM2_TOOLS_USE_EFIVAR
 	prompt "tpm2-tools"
 	help
 	  This package contains a set of tools to use with TPM 2.0
 	  chips, for common tasks and features provided by the
 	  hardware; such as for doing basic key management,
 	  attestation, encryption and signing.
+
+if TPM2_TOOLS
+
+config TPM2_TOOLS_USE_EFIVAR
+	bool
+	prompt "Use efivar"
+	help
+	  Building with efivar enables pretty-printing of
+	  the device path.
+
+endif
diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make
index ead881ffb..1c0fc190c 100644
--- a/rules/tpm2-tools.make
+++ b/rules/tpm2-tools.make
@@ -14,15 +14,15 @@ 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
+TPM2_TOOLS_LICENSE_FILES	:= file://doc/LICENSE;md5=a846608d090aa64494c45fc147cc12e3
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de