package/tpm2-tss: bump version to 3.0.1

- 0001-Temporary-fix-for-build-without-C.patch, AC_PROG_CXX line
  number changed.
- Makefile-fuzz-generated.am now in size zero.
- json-c, libcurl: new (FAPI) dependencies since tpm2-tss version 2.4.0

Signed-off-by: Yair Ben-Avraham <yairba@protonmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch b/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch
index b2a9cb4f789e55a3fae64674f3d76fcfd4b6ad95..812c753ffbdb98b9fab1494a4184e4c74012ede4 100644 (file)
--- a/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch
+++ b/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch
@@ -1,4 +1,4 @@
-From 158d0bc3a2a7a93090cc12c5b0dd3c27e6f44d61 Mon Sep 17 00:00:00 2001
+From 7dc753ad27a8cd14c9b00be94ca89b847cf05ce9 Mon Sep 17 00:00:00 2001
 From: Carlos Santos <unixmania@gmail.com>
 Date: Mon, 23 Dec 2019 08:02:19 -0300
 Subject: [PATCH] Temporary fix for build without C++
@@ -28,17 +28,17 @@ Signed-off-by: Carlos Santos <unixmania@gmail.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index cd50451d..a3bd7144 100644
+index ff59dd7c..3e4028fb 100755
 --- a/configure.ac
 +++ b/configure.ac
-@@ -25,7 +25,6 @@ AC_CANONICAL_HOST
- AX_IS_RELEASE(dash-version)
+@@ -26,7 +26,6 @@ AX_IS_RELEASE(dash-version)
  AX_CHECK_ENABLE_DEBUG([info])
  
--AC_PROG_CXX
  AC_PROG_CC
+-AC_PROG_CXX
  AC_PROG_LN_S
  AC_USE_SYSTEM_EXTENSIONS
+ LT_INIT()
 -- 
-2.18.1
+2.26.2
 

diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in
index 2d619750f8280a00b6e2f6c45bbf68cd09f00e86..2fc56dbd76662c857a736404edcd5fe0c9be6613 100644 (file)
--- a/package/tpm2-tss/Config.in
+++ b/package/tpm2-tss/Config.in
@@ -33,5 +33,26 @@ config BR2_PACKAGE_TPM2_TSS
 
          https://github.com/tpm2-software/tpm2-tss
 
+if BR2_PACKAGE_TPM2_TSS
+
+config BR2_PACKAGE_TPM2_TSS_FAPI
+       bool "fapi support"
+       depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
+       select BR2_PACKAGE_JSON_C
+       select BR2_PACKAGE_LIBCURL
+       help
+         This option allows to enable Feature API (FAPI).  Feature
+         API (FAPI) as described in the "TSS 2.0 Feature API
+         Specification" along with "TSS 2.0 JSON Data Types and
+         Policy Language Specification" This API is designed to be
+         very high-level API, intended to make programming with the
+         TPM as simple as possible. The API functions are exposed
+         through a single library: libtss2-fapi.
+
+         https://trustedcomputinggroup.org/wp-content/uploads/TSS_FAPI_v0.94_r04_pubrev.pdf
+         https://trustedcomputinggroup.org/wp-content/uploads/TSS_JSON_Policy_v0.7_r04_pubrev.pdf
+
+endif
+
 comment "tpm2-tss needs a toolchain w/ dynamic library"
        depends on BR2_STATIC_LIBS

diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash
index 3b778d4f1e3df983402f8ea0c44d21c0fe59c531..49432314d06b2a1c0701ee9987006a70f32190d6 100644 (file)
--- a/package/tpm2-tss/tpm2-tss.hash
+++ b/package/tpm2-tss/tpm2-tss.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 9d8c8866829e3ff5e1649ecd82498cb1329e0691139458e53b69e6061febe3d3  tpm2-tss-2.3.3.tar.gz
-sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448  LICENSE
+sha256  2432533a1cac0f0d15d0337d2f0a23591a50b36aad68ab72412ce694818b7e76  tpm2-tss-3.0.1.tar.gz
+sha256  18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448  LICENSE

diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk
index 470020857ad596e3caa49e4492fac8e24bd8e5fe..70e39bc2b3415d6cc30688cf2e7668b01fbfdcc7 100644 (file)
--- a/package/tpm2-tss/tpm2-tss.mk
+++ b/package/tpm2-tss/tpm2-tss.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TPM2_TSS_VERSION = 2.3.3
+TPM2_TSS_VERSION = 3.0.1
 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)
 TPM2_TSS_LICENSE = BSD-2-Clause
 TPM2_TSS_LICENSE_FILES = LICENSE
@@ -17,13 +17,11 @@ TPM2_TSS_AUTORECONF = YES
 # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used
 TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99"
 
-# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am
-# with content from a fuzz testing run rather than an empty file,
-# confusing autoreconf with
-# 0001-configure-Only-use-CXX-when-fuzzing.patch
-define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
-       truncate -s 0 $(@D)/Makefile-fuzz-generated.am
-endef
-TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
+ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y)
+TPM2_TSS_DEPENDENCIES += json-c libcurl
+TPM2_TSS_CONF_OPTS += --enable-fapi
+else
+TPM2_TSS_CONF_OPTS += --disable-fapi
+endif
 
 $(eval $(autotools-package))