[ptxdist] [PATCH v2] tpm2-tss: Version bump. 2.3.1 -> 3.1.0

[ptxdist] [PATCH v2] tpm2-tss: Version bump. 2.3.1 -> 3.1.0

[Christian Melki]

* Approx. 2,5 year worth of fixes.
https://github.com/tpm2-software/tpm2-tss/releases
* Fixes CVE-2020-24455.
* tpm2-tss now depends on JSON_C and LIBCURL.
* Remove changed configuration options.
* Add CONF_ENV to avoid configure getting stuck on
searching for binaries for group and user modifications.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/tpm2-tss.in   |  2 ++
 rules/tpm2-tss.make | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
index dbb310072..75d32188c 100644
--- a/rules/tpm2-tss.in
+++ b/rules/tpm2-tss.in
@@ -4,6 +4,8 @@ config TPM2_TSS
 	tristate
 	select HOST_AUTOTOOLS_AUTOCONF_ARCHIVE
 	select OPENSSL
+	select JSON_C
+	select LIBCURL
 	prompt "tpm2-tss"
 	help
 	  TPM2 Software stack library - TSS and TCTI libraries
diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
index 768c64426..6e68441f8 100644
--- a/rules/tpm2-tss.make
+++ b/rules/tpm2-tss.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
 #
 # Paths and names
 #
-TPM2_TSS_VERSION	:= 2.3.1
-TPM2_TSS_MD5		:= 5744b10e3cef56df5d65b50f51fb3fe9
+TPM2_TSS_VERSION	:= 3.1.0
+TPM2_TSS_MD5		:= 4d04cf52fff4ee061bb3f7b4f4ea03b7
 TPM2_TSS		:= tpm2-tss-$(TPM2_TSS_VERSION)
 TPM2_TSS_SUFFIX		:= tar.gz
 TPM2_TSS_URL		:= https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
@@ -32,13 +32,15 @@ TPM2_TSS_LICENSE_FILES	:= file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da
 # autoconf
 #
 TPM2_TSS_CONF_TOOL	:= autoconf
+TPM2_TSS_CONF_ENV := \
+	$(CROSS_ENV) \
+	ac_cv_prog_result_groupadd=yes \
+	ac_cv_prog_result_useradd=yes
+
 TPM2_TSS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--enable-debug=info \
 	--disable-unit \
-	--enable-esapi \
-	--disable-tcti-device-async \
-	--disable-tcti-partial-reads \
 	--enable-tcti-device \
 	--enable-tcti-mssim \
 	--disable-tcti-fuzzing \
-- 
2.30.2


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

Re: [ptxdist] [APPLIED] tpm2-tss: Version bump. 2.3.1 -> 3.1.0

[Michael Olbrich]

Thanks, applied as c7d629719a277a60f109feae3a963ed52b0ca5d4.

Michael

[sent from post-receive hook]

On Sun, 30 Jan 2022 16:49:53 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> * Approx. 2,5 year worth of fixes.
> https://github.com/tpm2-software/tpm2-tss/releases
> * Fixes CVE-2020-24455.
> * tpm2-tss now depends on JSON_C and LIBCURL.
> * Remove changed configuration options.
> * Add CONF_ENV to avoid configure getting stuck on
> searching for binaries for group and user modifications.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220129181923.2626568-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
> index dbb31007276b..75d32188ca59 100644
> --- a/rules/tpm2-tss.in
> +++ b/rules/tpm2-tss.in
> @@ -4,6 +4,8 @@ config TPM2_TSS
>  	tristate
>  	select HOST_AUTOTOOLS_AUTOCONF_ARCHIVE
>  	select OPENSSL
> +	select JSON_C
> +	select LIBCURL
>  	prompt "tpm2-tss"
>  	help
>  	  TPM2 Software stack library - TSS and TCTI libraries
> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
> index 768c64426cbb..6e68441f855c 100644
> --- a/rules/tpm2-tss.make
> +++ b/rules/tpm2-tss.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
>  #
>  # Paths and names
>  #
> -TPM2_TSS_VERSION	:= 2.3.1
> -TPM2_TSS_MD5		:= 5744b10e3cef56df5d65b50f51fb3fe9
> +TPM2_TSS_VERSION	:= 3.1.0
> +TPM2_TSS_MD5		:= 4d04cf52fff4ee061bb3f7b4f4ea03b7
>  TPM2_TSS		:= tpm2-tss-$(TPM2_TSS_VERSION)
>  TPM2_TSS_SUFFIX		:= tar.gz
>  TPM2_TSS_URL		:= https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
> @@ -32,13 +32,15 @@ TPM2_TSS_LICENSE_FILES	:= file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da
>  # autoconf
>  #
>  TPM2_TSS_CONF_TOOL	:= autoconf
> +TPM2_TSS_CONF_ENV := \
> +	$(CROSS_ENV) \
> +	ac_cv_prog_result_groupadd=yes \
> +	ac_cv_prog_result_useradd=yes
> +
>  TPM2_TSS_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--enable-debug=info \
>  	--disable-unit \
> -	--enable-esapi \
> -	--disable-tcti-device-async \
> -	--disable-tcti-partial-reads \
>  	--enable-tcti-device \
>  	--enable-tcti-mssim \
>  	--disable-tcti-fuzzing \

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