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

[Jonas Witschel]

    Date: Monday, June 7, 2021 @ 15:41:06
  Author: diabonas
Revision: 957757

upgpkg: swtpm 0.6.0-1: upstream release

swtpm_setup and swtpm_localca have been rewritten in C, so the Python-related
parts of the build process can be removed.

Modified:
  swtpm/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-07 15:40:55 UTC (rev 957756)
+++ PKGBUILD	2021-06-07 15:41:06 UTC (rev 957757)
@@ -1,17 +1,15 @@
 # Maintainer: Jonas Witschel <diabonas at archlinux.org>
 pkgname=swtpm
-pkgver=0.5.2
-_tag=fcf618cfeb2e2d8470614a998bd536ad2bb20e4e # git rev-parse "v$pkgver"
-pkgrel=2
+pkgver=0.6.0
+_tag=b6782db8152ab1982be25e97611e9adcb147d041 # git rev-parse "v$pkgver"
+pkgrel=1
 pkgdesc='Libtpms-based TPM emulator with socket, character device, and Linux CUSE interface'
 arch=('x86_64')
 url='https://github.com/stefanberger/swtpm'
 license=('BSD')
-depends=('fuse2' 'glib2' 'libseccomp' 'libtpms' 'libseccomp.so')
-makedepends=('git' 'expect' 'gnutls' 'iproute2' 'libtasn1' 'python' 'python-cryptography' 'python-setuptools' 'socat')
+depends=('fuse2' 'glib2' 'gnutls' 'json-glib' 'libseccomp' 'libtpms' 'libseccomp.so')
+makedepends=('git' 'expect' 'iproute2' 'libtasn1' 'python' 'socat')
 checkdepends=('softhsm')
-optdepends=('gnutls: swtpm_cert support'
-            'python-cryptography: swtpm_setup support')
 source=("git+$url.git?signed#tag=$_tag")
 sha512sums=('SKIP')
 validpgpkeys=('B818B9CADF9089C2D5CEC66B75AD65802A0B4211') # Stefan Berger <stefanb at linux.vnet.ibm.com>
@@ -25,22 +23,15 @@
 	cd "$pkgname"
 
 	# Remove usage of /usr/bin/env to avoid PATH manipulation attacks
-	sed --in-place 's/env //' samples/swtpm-create-tpmca samples/swtpm-create-user-config-files.in \
-	                          samples/swtpm-localca.in src/swtpm_setup/py_swtpm_setup/swtpm_setup.py \
-	                          src/swtpm_setup/swtpm_setup.in
+	sed --in-place 's/env //' samples/swtpm-create-tpmca samples/swtpm-create-user-config-files.in
 
-	# Fix compilation with libtasn1 4.17.0 (https://github.com/stefanberger/swtpm/pull/443)
-	git cherry-pick --no-commit 4b825a3d9444c9ee6ed3df09531acfca8f44be3d
-
 	autoreconf --install --force
 }
 
 build() {
 	cd "$pkgname"
-	./configure --prefix=/usr --with-cuse --with-gnutls --with-seccomp --disable-python-installation
+	./configure --prefix=/usr --with-cuse --with-gnutls --with-seccomp
 	make
-
-	for _dir in samples src/swtpm_setup; do (cd "$_dir"; python setup.py build); done
 }
 
 check() {
@@ -52,12 +43,6 @@
 	cd "$pkgname"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
-
-	for _dir in samples src/swtpm_setup
-	do
-		(cd "$_dir"; python setup.py install --root="$pkgdir" --optimize=1 --skip-build)
-	done
-
 	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"