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

[Jonas Witschel]

    Date: Friday, May 21, 2021 @ 21:56:22
  Author: diabonas
Revision: 941089

upgpkg: swtpm 0.5.2-2: fix directory permissions and libtasn1 compilation

- The permissions of /var/lib/swtpm-localca are changed to 0750 (like the
  upstream swtpm.spec suggests) using tmpfiles.d, but "make install" creates it
  with the default 0755 permissions, leading to spurious pacman warnings during
  upgrades:

  warning: directory permissions differ on /var/lib/swtpm-localca/
  filesystem: 750  package: 755

- libtasn1 4.17.0 deprecated some old type names, leading to compilation
  failures.

Modified:
  swtpm/trunk/PKGBUILD

----------+
 PKGBUILD |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-21 21:56:17 UTC (rev 941088)
+++ PKGBUILD	2021-05-21 21:56:22 UTC (rev 941089)
@@ -2,7 +2,7 @@
 pkgname=swtpm
 pkgver=0.5.2
 _tag=fcf618cfeb2e2d8470614a998bd536ad2bb20e4e # git rev-parse "v$pkgver"
-pkgrel=1
+pkgrel=2
 pkgdesc='Libtpms-based TPM emulator with socket, character device, and Linux CUSE interface'
 arch=('x86_64')
 url='https://github.com/stefanberger/swtpm'
@@ -29,6 +29,9 @@
 	                          samples/swtpm-localca.in src/swtpm_setup/py_swtpm_setup/swtpm_setup.py \
 	                          src/swtpm_setup/swtpm_setup.in
 
+	# Fix compilation with libtasn1 4.17.0 (https://github.com/stefanberger/swtpm/pull/443)
+	git cherry-pick --no-commit 4b825a3d9444c9ee6ed3df09531acfca8f44be3d
+
 	autoreconf --install --force
 }
 
@@ -57,4 +60,5 @@
 
 	echo 'u tss - "tss user for tpm2"' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 	echo 'z /var/lib/swtpm-localca 0750 tss root' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+	chmod 750 "$pkgdir/var/lib/swtpm-localca"
 }