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

[Jonas Witschel]

    Date: Wednesday, August 5, 2020 @ 10:14:52
  Author: diabonas
Revision: 669285

upgpkg: tpm2-tss 3.0.0-2: improve reproducibility

If unit tests are enabled, the macro UNIT is defined, which affects
src/tss2-tcti/tcti-cmd.{c,h} and thus the built library libtss2-tcti-cmd.so. If
reproducers try to build the package with --nocheck to save resources, the
package contents will not match. Enable unit tests unconditionally to avoid
this issue.

make install tries to create empty directories /run/tpm2-tss/eventlog and
/var/lib/tpm2-tss/system/keystore (in case they cannot be created using the
provided tmpfiles.d configuration). Usually this fails due to insufficient
privileges, but running archlinux-repro succeeds in creating these spurious
directories. Use the !emptydirs makepkg option to remove the directories in all
cases, since they will be created with the correct permissions during package
installation using systemd-tmpfiles anyway. 

Modified:
  tpm2-tss/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-05 10:14:50 UTC (rev 669284)
+++ PKGBUILD	2020-08-05 10:14:52 UTC (rev 669285)
@@ -2,18 +2,19 @@
 # Contributor: Bruno Pagani <archange at archlinux.org>
 pkgname=tpm2-tss
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 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=('curl' 'json-c' 'openssl' 'libjson-c.so')
-makedepends=('doxygen')
-checkdepends=('cmocka' 'iproute2' 'swtpm' 'uthash')
+makedepends=('cmocka' 'doxygen')
+checkdepends=('iproute2' 'swtpm' 'uthash')
 provides=('libtss2-esys.so' 'libtss2-fapi.so' 'libtss2-mu.so' 'libtss2-rc.so' 'libtss2-sys.so' 'libtss2-tctildr.so')
 backup=('etc/tpm2-tss/fapi-config.json'
         'etc/tpm2-tss/fapi-profiles/P_ECCP256SHA256.json'
         'etc/tpm2-tss/fapi-profiles/P_RSA2048SHA256.json')
+options=('!emptydirs')
 source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc})
 sha512sums=('ba54904f2cd8cbcca85ce4d4ac5c8650da6ab076e8d8d142e1b7ee75c5e9a645520f1a5ac8ffe5269deceba84762c9074b131296e8b2d4c684ddc335a828d7a8'
             'SKIP')
@@ -26,7 +27,7 @@
 	./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)
+	            --enable-unit $( ((CHECKFUNC)) && echo --enable-integration)
 	make
 }