community/tpm2-tss: upgrade to 2.4.0

1 files changed, 33 insertions, 18 deletions

diff --git a/community/tpm2-tss/APKBUILD b/community/tpm2-tss/APKBUILD
index 33861b01fa..0f649809cf 100644
--- a/community/tpm2-tss/APKBUILD
+++ b/community/tpm2-tss/APKBUILD
@@ -2,14 +2,15 @@
 # Contributor: Alexander Sack <asac@pantacor.com>
 # Maintainer: Alexander Sack <asac@pantacor.com>
 pkgname=tpm2-tss
-pkgver=2.3.3
+pkgver=2.4.0
 pkgrel=0
 pkgdesc="TPM 2.0 TSS"
 url="https://github.com/tpm2-software/tpm2-tss/"
 arch="all"
 license="BSD-2-Clause"
 makedepends="automake autoconf libtool openssl-dev doxygen perl
-	linux-headers cmocka-dev autoconf-archive"
+	linux-headers cmocka-dev autoconf-archive libgcrypt-dev
+	json-c-dev curl-dev"
 subpackages="
 	$pkgname-doc
 	$pkgname-mu
@@ -19,6 +20,7 @@ subpackages="
 	$pkgname-tcti-mssim
 	$pkgname-rc
 	$pkgname-tctildr
+	$pkgname-fapi
 	$pkgname-static
 	$pkgname-dev
 	"
@@ -31,9 +33,12 @@ prepare() {
 
 build() {
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
+		--sysconfdir=/etc \
 		--without-udevrulesdir \
-		--with-tctidefaultmodule="libtss2-tcti-device.so" \
+		--with-tctidefaultmodule=libtss2-tcti-device.so \
 		--with-tctidefaultconfig=/dev/tpmrm0 \
 		--with-crypto=ossl \
 		--enable-unit
@@ -46,52 +51,62 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+	rm -rf "$pkgdir"/etc/tmpfiles.d
+	rm -rf "$pkgdir"/etc/sysusers.d
 }
 
 mu() {
 	pkgdesc="TPM 2.0 Marshaling libraries"
-	mkdir -p "$subpkgdir/usr/lib"
-	mv "$pkgdir"/usr/lib/libtss2-mu.so.* "$subpkgdir/usr/lib"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libtss2-mu.so.* "$subpkgdir"/usr/lib
 }
 
 sys() {
 	pkgdesc="TPM 2.0 System API libraries"
-	mkdir -p "$subpkgdir/usr/lib"
-	mv "$pkgdir"/usr/lib/libtss2-sys.so.* "$subpkgdir/usr/lib"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libtss2-sys.so.* "$subpkgdir"/usr/lib
 }
 
 esys() {
 	pkgdesc="TPM 2.0 Enhanced System API libraries"
-	mkdir -p "$subpkgdir/usr/lib"
-	mv "$pkgdir"/usr/lib/libtss2-esys.so.* "$subpkgdir/usr/lib"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libtss2-esys.so.* "$subpkgdir"/usr/lib
 }
 
 device() {
 	pkgdesc="TPM 2.0 Device TCTI"
 	provides="libtss2-tcti"
 	provider_priority="100"
-	mkdir -p "$subpkgdir/usr/lib"
-	mv "$pkgdir"/usr/lib/libtss2-tcti-device.so* "$subpkgdir/usr/lib"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libtss2-tcti-device.so.* "$subpkgdir"/usr/lib
 }
 
 mssim() {
 	pkgdesc="TPM 2.0 Simulator TCTI"
 	provides="libtss2-tcti"
 	provider_priority="10"
-	mkdir -p "$subpkgdir/usr/lib"
-	mv "$pkgdir"/usr/lib/libtss2-tcti-mssim.so* "$subpkgdir/usr/lib"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libtss2-tcti-mssim.so.* "$subpkgdir"/usr/lib
 }
 
 rc() {
 	pkgdesc="TPM 2.0 RC libraries"
-	mkdir -p "$subpkgdir/usr/lib"
-	mv "$pkgdir"/usr/lib/libtss2-rc.so* "$subpkgdir/usr/lib"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libtss2-rc.so.* "$subpkgdir"/usr/lib
 }
 
 tctildr() {
 	pkgdesc="TPM 2.0 TCTI loader libraries"
-	mkdir -p "$subpkgdir/usr/lib"
-	mv "$pkgdir"/usr/lib/libtss2-tctildr.so* "$subpkgdir/usr/lib"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libtss2-tctildr.so.* "$subpkgdir"/usr/lib
 }
 
-sha512sums="77fc384fb899d3c5646bde4cdcb59060c31ebeacd466e0e89901105fd0e873fb296d1d48e2f2dd214a25c1e204287738c747a8888ce0f11f759138c86e8dcda7  tpm2-tss-2.3.3.tar.gz"
+fapi() {
+	pkgdesc="TPM 2.0 FAPI libraries"
+	mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/etc/tpm2-tss
+	mv "$pkgdir"/usr/lib/libtss2-fapi.so.* "$subpkgdir"/usr/lib
+	mv "$pkgdir"/etc/tpm2-tss/fapi-config.json "$subpkgdir"/etc/tpm2-tss
+	mv "$pkgdir"/etc/tpm2-tss/fapi-profiles "$subpkgdir"/etc/tpm2-tss
+}
+
+sha512sums="33260143e661111a1d9c01351e315ed5273ed29292ad7c93a2d94f050a0f65a133163d4e199b48a7eb6d8e888cd852993cf3a9defde67a83e555e5f04c1845ff  tpm2-tss-2.4.0.tar.gz"