[arch-commits] Commit in swtpm/repos/community-x86_64 (PKGBUILD PKGBUILD)

Jonas Witschel diabonas at archlinux.org
Mon Sep 28 21:25:58 UTC 2020


    Date: Monday, September 28, 2020 @ 21:25:57
  Author: diabonas
Revision: 713387

archrelease: copy trunk to community-x86_64

Added:
  swtpm/repos/community-x86_64/PKGBUILD
    (from rev 713386, swtpm/trunk/PKGBUILD)
Deleted:
  swtpm/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |  125 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 66 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-28 21:25:50 UTC (rev 713386)
+++ PKGBUILD	2020-09-28 21:25:57 UTC (rev 713387)
@@ -1,59 +0,0 @@
-# Maintainer: Jonas Witschel <diabonas at archlinux.org>
-pkgname=swtpm
-pkgver=0.4.0
-_tag=72ee136b1b3aa4c8f9b431ba11253352f4783808 # 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' 'gnutls' 'libtasn1' 'python' 'python-cryptography' 'python-setuptools' 'socat')
-checkdepends=('net-tools' 'softhsm')
-optdepends=('gnutls: swtpm_cert support'
-            'python-cryptography: swtpm_setup.sh support') 
-source=("git+$url.git?signed#tag=$_tag")
-sha512sums=('SKIP')
-validpgpkeys=('B818B9CADF9089C2D5CEC66B75AD65802A0B4211') # Stefan Berger <stefanb at linux.vnet.ibm.com>
-
-pkgver() {
-	cd "$pkgname"
-	git describe | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-	cd "$pkgname"
-
-	# Build Python module according to the Python package guidelines
-	sed -i 's/--install-layout deb/--optimize=1 --skip-build/' src/swtpm_setup/Makefile.am
-
-	# Remove usage of /usr/bin/env to avoid PATH manipulation attacks
-	sed -i '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.sh
-
-	autoreconf --install --force
-}
-
-build() {
-	cd "$pkgname"
-	./configure --prefix=/usr --with-cuse --with-gnutls --with-seccomp \
-	            EXPECT=/usr/bin/false PIP3=/usr/bin/false # pass checks for unused dependencies 
-	make
-
-	cd src/swtpm_setup
-	python setup.py build
-}
-
-check() {
-	cd "$pkgname"
-	make check
-}
-
-package() {
-	cd "$pkgname"
-	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"
-	echo 'z /var/lib/swtpm-localca 0750 tss root' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-}

Copied: swtpm/repos/community-x86_64/PKGBUILD (from rev 713386, swtpm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-09-28 21:25:57 UTC (rev 713387)
@@ -0,0 +1,66 @@
+# Maintainer: Jonas Witschel <diabonas at archlinux.org>
+pkgname=swtpm
+pkgver=0.4.1
+_tag=899693a1f6f44146c135a2fe10b9096e96afd86a # 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' 'libtasn1' 'python' 'python-cryptography' 'python-setuptools' 'socat')
+checkdepends=('net-tools' 'softhsm')
+optdepends=('gnutls: swtpm_cert support'
+            'python-cryptography: swtpm_setup.sh support') 
+source=("git+$url.git?signed#tag=$_tag")
+sha512sums=('SKIP')
+validpgpkeys=('B818B9CADF9089C2D5CEC66B75AD65802A0B4211') # Stefan Berger <stefanb at linux.vnet.ibm.com>
+
+pkgver() {
+	cd "$pkgname"
+	git describe | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+	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.sh
+
+	# Remove superflous dependency check for python-pip (https://github.com/stefanberger/swtpm/pull/317)
+	git cherry-pick --no-commit fdaa6f1f1ce188af8d9ba8c1e25a6a25d9f4f792 
+
+	# Disable automatic installation of Python module to be able to follow the Python package guidelines
+	# (https://github.com/stefanberger/swtpm/pull/318)
+	git cherry-pick --no-commit --strategy-option=theirs 3dafa38eb7a041add94194f8b9d310e62b6551c9
+
+	autoreconf --install --force
+}
+
+build() {
+	cd "$pkgname"
+	./configure --prefix=/usr --with-cuse --with-gnutls --with-seccomp --disable-python-installation
+	make
+
+	cd src/swtpm_setup
+	python setup.py build
+}
+
+check() {
+	cd "$pkgname"
+	make check
+}
+
+package() {
+	cd "$pkgname"
+	make DESTDIR="$pkgdir" install
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+
+	cd src/swtpm_setup
+	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+
+	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"
+}



More information about the arch-commits mailing list