- Update to 2.4.1

Submitted by:	Tadeusz Struk <tadeusz.struk@intel.com> (maintainer)
Differential Revision:	https://reviews.freebsd.org/D24903

6 files changed, 28 insertions, 38 deletions

diff --git a/security/tpm2-tss/Makefile b/security/tpm2-tss/Makefile
index 141cda30e7b3..b131cd315a1e 100644
--- a/security/tpm2-tss/Makefile
+++ b/security/tpm2-tss/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tpm2-tss
-DISTVERSION=	2.3.1
+DISTVERSION=	2.4.1
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/tpm2-software/tpm2-tss/releases/download/${DISTVERSION}/
 
@@ -10,11 +10,15 @@ COMMENT=	TPM2 Software Stack core library
 
 LICENSE=	BSD2CLAUSE
 
+LIB_DEPENDS=	libjson-c.so:devel/json-c \
+		libcurl.so:ftp/curl
+
 USES=		gmake libtool pkgconfig ssl
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBCRYPTO_CFLAGS="-I${OPENSSLINC}" LIBCRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto"
+CONFIGURE_ENV=	LIBCRYPTO_CFLAGS="-I${OPENSSLINC}" LIBCRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
+		EXTRA_CFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-doxygen-doc --disable-dependency-tracking --enable-valgrind=no
 
 INSTALL_TARGET=	install-strip
diff --git a/security/tpm2-tss/distinfo b/security/tpm2-tss/distinfo
index c784943c126c..a808f593995d 100644
--- a/security/tpm2-tss/distinfo
+++ b/security/tpm2-tss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567186554
-SHA256 (tpm2-tss-2.3.1.tar.gz) = 7096576c1946b85ec9c92b39e0ed3409ec01bdb97d7863ead033243d5433dee7
-SIZE (tpm2-tss-2.3.1.tar.gz) = 1085143
+TIMESTAMP = 1589328616
+SHA256 (tpm2-tss-2.4.1.tar.gz) = 58d7afcab9ff3daaafb5316e57d2c211118334b470d5a5bc6ceace6f89a1e60d
+SIZE (tpm2-tss-2.4.1.tar.gz) = 1445103
diff --git a/security/tpm2-tss/files/patch-src-util-io.c b/security/tpm2-tss/files/patch-src-util-io.c
deleted file mode 100644
index 0aa2da334da0..000000000000
--- a/security/tpm2-tss/files/patch-src-util-io.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/util/io.c.orig	2019-08-21 19:15:04 UTC
-+++ src/util/io.c
-@@ -8,6 +8,7 @@
- #endif
- 
- #include <errno.h>
-+#include <fcntl.h>
- #include <inttypes.h>
- #include <limits.h>
- #include <string.h>
diff --git a/security/tpm2-tss/files/patch-src-util-tss2_endian.h b/security/tpm2-tss/files/patch-src-util-tss2_endian.h
deleted file mode 100644
index 9b0b4a8fd03f..000000000000
--- a/security/tpm2-tss/files/patch-src-util-tss2_endian.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/util/tss2_endian.h.orig	2019-08-21 19:14:09 UTC
-+++ src/util/tss2_endian.h
-@@ -9,7 +9,11 @@
- #define TSS2_ENDIAN_H
- 
- #if defined(__linux__) || defined(__unix__)
-+#if defined(__FreeBSD__)
-+#include <sys/endian.h>
-+#else
- #include <endian.h>
-+#endif
- 
- #define HOST_TO_BE_16(value) htobe16(value)
- #define HOST_TO_BE_32(value) htobe32(value)
diff --git a/security/tpm2-tss/pkg-descr b/security/tpm2-tss/pkg-descr
index 0b154773681b..2bb37de12a5a 100644
--- a/security/tpm2-tss/pkg-descr
+++ b/security/tpm2-tss/pkg-descr
@@ -1,20 +1,20 @@
 OSS implementation of the TCG TPM2 Software Stack (TSS2)
+* libtss2-fapi - Feature API (FAPI) as described in the TSS 2.0 Feature API
+  Specification and TSS 2.0 JSON Data Types and Policy Language Specification.
+
 * libtss2-esys - Enhanced System API (ESAPI) as described in the TSS 2.0
-  Enhanced System API   (ESAPI) Specification.
-  This API is a 1-to-1 mapping of the TPM2 commands documented in Part 3
-  of the TPM2 specification. Additionally there are asynchronous versions
-  of each command. In addition to SAPI, the ESAPI performs tracking of meta
-  data for TPM object and automatic calculation of session authorization and
-  parameters encryption.
+  This API is a 1-to-1 mapping of the TPM2 commands documented in Part 3 of the
+  TPM2 specification. Additionally there are asynchronous versions of each
+  command. In addition to SAPI, the ESAPI performs tracking of meta data for
+  TPM object and automatic calculation of session authorization and encryption.
 
 * libtss2-sys - System API (SAPI) as described in the system level API and TPM
   command transmission interface specification. This API is a 1-to-1 mapping of
   the TPM2 commands documented in Part 3 of the TPM2 specification.
-  Additionally there are asynchronous versions of each command.
 
 * libtss2-mu - Marshaling/Unmarshaling (MU) as described in the TCG TSS 2.0
   Marshaling/Unmarshaling API Specification. This API provides a set of
-  marshaling and unmarshaling functions for all data types define by the TPM
+  marshaling and unmarshaling functions for all data types define by the TPM2
   library specification.
 
 * TPM Command Transmission Interface (TCTI) that is described in the same
diff --git a/security/tpm2-tss/pkg-plist b/security/tpm2-tss/pkg-plist
index 38a20f10addc..aa2207767c39 100644
--- a/security/tpm2-tss/pkg-plist
+++ b/security/tpm2-tss/pkg-plist
@@ -1,5 +1,11 @@
+etc/sysusers.d/tpm2-tss.conf
+etc/tmpfiles.d/tpm2-tss-fapi.conf
+%%ETCDIR%%/fapi-config.json
+%%ETCDIR%%/fapi-profiles/P_ECCP256SHA256.json
+%%ETCDIR%%/fapi-profiles/P_RSA2048SHA256.json
 include/tss2/tss2_common.h
 include/tss2/tss2_esys.h
+include/tss2/tss2_fapi.h
 include/tss2/tss2_mu.h
 include/tss2/tss2_rc.h
 include/tss2/tss2_sys.h
@@ -12,6 +18,10 @@ lib/libtss2-esys.a
 lib/libtss2-esys.so
 lib/libtss2-esys.so.0
 lib/libtss2-esys.so.0.0.0
+lib/libtss2-fapi.a
+lib/libtss2-fapi.so
+lib/libtss2-fapi.so.0
+lib/libtss2-fapi.so.0.0.0
 lib/libtss2-mu.a
 lib/libtss2-mu.so
 lib/libtss2-mu.so.0
@@ -24,7 +34,6 @@ lib/libtss2-sys.a
 lib/libtss2-sys.so
 lib/libtss2-sys.so.0
 lib/libtss2-sys.so.0.0.0
-lib/libtss2-tcti-default.so
 lib/libtss2-tcti-device.a
 lib/libtss2-tcti-device.so
 lib/libtss2-tcti-device.so.0
@@ -38,6 +47,7 @@ lib/libtss2-tctildr.so
 lib/libtss2-tctildr.so.0
 lib/libtss2-tctildr.so.0.0.0
 libdata/pkgconfig/tss2-esys.pc
+libdata/pkgconfig/tss2-fapi.pc
 libdata/pkgconfig/tss2-mu.pc
 libdata/pkgconfig/tss2-rc.pc
 libdata/pkgconfig/tss2-sys.pc