[arch-commits] Commit in tpm2-tss/trunk (PKGBUILD)

[Jonas Witschel]

    Date: Wednesday, March 11, 2020 @ 23:26:14
  Author: diabonas
Revision: 594707

upgpkg: tpm2-tss 2.4.0-1: upstream release

- Add new FAPI library (depends on curl and needs some additional system
  directories to be configured).
- Drop patch for ibm-sw-tpm2 1563 applied upstream.
- Upstream now ships a sysusers.d and tmpfiles.d configuration.
- Upstream no longer ships libtss2-tcti-default.so by default.

Modified:
  tpm2-tss/trunk/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-11 23:24:04 UTC (rev 594706)
+++ PKGBUILD	2020-03-11 23:26:14 UTC (rev 594707)
@@ -2,33 +2,31 @@
 # Contributor: Bruno Pagani <archange at archlinux.org>
 
 pkgname=tpm2-tss
-pkgver=2.3.3
+pkgver=2.4.0
 pkgrel=1
 pkgdesc="Implementation of the TCG Trusted Platform Module 2.0 Software Stack (TSS2)"
 arch=(x86_64)
 url="https://github.com/tpm2-software/tpm2-tss"
 license=(BSD)
-depends=(openssl)
+depends=(curl openssl)
 makedepends=(doxygen)
 checkdepends=(cmocka ibm-sw-tpm2 iproute2 procps-ng uthash)
-source=("${url}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}
-        "tpm2-tss-2.3.2_ibm-sw-tpm2-1563.patch::${url}/commit/6ff9ad43cafa6aeebd264c78ea56e97b2a98e14b.patch")
-sha512sums=('df83908508fc8add8ca1aaf7144bcf369f13797f7e5d39fe29654d82e2de2cddf324cd06cb3154318ef767d706d863a7781d98c7b29a90945f081a54594128e5'
-            'SKIP'
-            '62608e0bf811cb62b75b8fd458118f581b509529630fcb9eef3fca1c1d3262e3b7d48e334ebda28e712af406b8dbb23a2b87a2b4d0b1883a23d1d497b45bd86e')
+backup=('etc/tpm2-tss/fapi-config.json'
+        'etc/tpm2-tss/fapi-profiles/P_ECCP256SHA256.json'
+        'etc/tpm2-tss/fapi-profiles/P_RSA2048SHA256.json')
+source=("${url}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc})
+sha512sums=('763370381584f2124f751f0736e6a8b34428fd52134fd9966f3581e128f3b74b3f1261992f5d6162d7c866e47f7e5519ea80c1d1d39b80d5ed6e067eb2cd35a0'
+            'SKIP')
 validpgpkeys=(D760B790CCF0A41CBE7B047C316CC1FB24ABDC72  # Tadeusz Struk <tadeusz.struk at intel.com>
               D6B4D8BAC7E0CC97DCD4AC7272E88B53F7A95D84  # Andreas Fuchs <andreas.fuchs at sit.fraunhofer.de>
               5B482B8E3E19DA7C978E1D016DE2E9078E1F50C1) # William Roberts (Bill Roberts) <william.c.roberts at intel.com>
 
-prepare() {
-	cd ${pkgname}-${pkgver}
-	# Fix test failure with ibm-sw-tpm2 1563, see https://github.com/tpm2-software/tpm2-tss/pull/1585
-	patch --strip=1 --input="${srcdir}/tpm2-tss-2.3.2_ibm-sw-tpm2-1563.patch"
-}
-
 build() {
     cd ${pkgname}-${pkgver}
-    ./configure --prefix=/usr --with-udevrulesprefix=60- $( ((CHECKFUNC)) && echo --enable-unit --enable-integration)
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+                --with-runstatedir=/run --with-sysusersdir=/usr/lib/sysusers.d \
+                --with-tmpfilesdir=/usr/lib/tmpfiles.d --with-udevrulesprefix=60- \
+                $( ((CHECKFUNC)) && echo --enable-unit --enable-integration)
     make
 }
 
@@ -41,6 +39,4 @@
     cd ${pkgname}-${pkgver}
     make DESTDIR="${pkgdir}" install
     install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
-    echo 'u tss - "tss user for tpm2"' | install -Dm644 /dev/stdin "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
-    rm "${pkgdir}"/usr/lib/libtss2-tcti-default.so # https://github.com/tpm2-software/tpm2-tss/issues/1482#issuecomment-516363966
 }