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

[Jonas Witschel]

    Date: Tuesday, September 28, 2021 @ 09:36:24
  Author: diabonas
Revision: 1025857

upgpkg: tpm2-pkcs11 1.7.0-1: upstream release, temporarily disable tests

The test suite currently only works with the yet unreleased tpm2-tools 5.2, cf.
https://github.com/tpm2-software/tpm2-pkcs11/pull/715. This only affects a new
feature of tpm2-pkcs11 1.7.0 (importing HMAC keys using "tpm2_ptool import",
see the release notes at
https://github.com/tpm2-software/tpm2-pkcs11/blob/master/CHANGELOG.md#170---2021-09-27),
existing functionality is unaffected.

Therefore we temporarily disable the test suite until tpm2-tools 5.2 is
released in order to be able to release tpm2-pkcs11 1.7.0 now.

Modified:
  tpm2-pkcs11/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-28 07:30:14 UTC (rev 1025856)
+++ PKGBUILD	2021-09-28 09:36:24 UTC (rev 1025857)
@@ -1,32 +1,22 @@
 # Maintainer: Jonas Witschel <diabonas at archlinux.org>
 pkgname=tpm2-pkcs11
-pkgver=1.6.0
+pkgver=1.7.0
 pkgrel=1
 pkgdesc='PKCS#11 interface for Trusted Platform Module 2.0 hardware'
 arch=('x86_64')
 url='https://github.com/tpm2-software/tpm2-pkcs11'
 license=('BSD')
-depends=('libyaml' 'openssl' 'python' 'python-cryptography' 'python-pyasn1-modules' 'python-yaml' 'sqlite'
+depends=('libyaml' 'openssl' 'python' 'python-bcrypt' 'python-cryptography' 'python-pyasn1-modules' 'python-yaml' 'sqlite'
          'tpm2-tools' 'tpm2-tss' 'libtss2-esys.so' 'libtss2-fapi.so' 'libtss2-mu.so' 'libtss2-rc.so' 'libtss2-tctildr.so')
 makedepends=('cmocka' 'python-setuptools')
-checkdepends=('expect' 'iproute2' 'java-hamcrest' 'junit' 'libp11' 'opensc'
+checkdepends=('expect' 'iproute2' 'java-hamcrest' 'junit' 'libp11' 'opensc' 'openssh'
               'python-python-pkcs11' 'swtpm' 'tpm2-abrmd' 'tpm2-tss-engine' 'wget' 'xxd')
-source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc}
-        "tpm2-pkcs11-1.6.0_test-fix-build-for-gcc11.patch::$url/commit/83c484d0b40fac4a6320cf0a16456da1764849bf.patch"
-        "tpm2-pkcs11-1.6.0_fix-stringop-overread-in-str_padded_copy.patch::$url/commit/9af101b54035f25c0b03685bc34f22a4c5e934b7.patch")
-sha512sums=('db94b2194837564fa330ac7cc15a5185258d5d632f033a60fa82a2b3246e046dac29b6dfece19b4e075383e999ac157286c7f18f6c5ab6a98dd01c8e810065ea'
-            'SKIP'
-            '538894af5f6aa713a9b73db8afe3a0de023c4337dc96d299b9a8368e51f0eb55883850e717abd1027f35cdd67989bfde4e1f90b85d8cb7069494d40a27616468'
-            '8983f1046e72f0ebeced4004d91e27d12cd635889c6514afc07bd75749597ac6d9828ec0c7f4f47b16893c622fd7e54f3d2c8d05e4c07965ba0529daa458ecef')
+source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc})
+sha512sums=('eb2736a7ef00fefa91bb70cc96d94d1c7b6ce3701ab12301658b7b076d8fca93bc590c7cdba5a84934b6bd09dad252b13670804c686e76a65b03c7ef6d96427d'
+            'SKIP')
 validpgpkeys=('5B482B8E3E19DA7C978E1D016DE2E9078E1F50C1') # William Roberts (Bill Roberts) <william.c.roberts at intel.com>
+BUILDENV+=('!check') # TODO re-enable tests once tpm2-tools 5.2 is released
 
-prepare() {
-	cd "$pkgname-$pkgver"
-	# Fix compilation with GCC 11
-	patch --forward --strip=1 --input="$srcdir/tpm2-pkcs11-1.6.0_test-fix-build-for-gcc11.patch"
-	patch --forward --strip=1 --input="$srcdir/tpm2-pkcs11-1.6.0_fix-stringop-overread-in-str_padded_copy.patch"
-}
-
 build() {
 	cd "$pkgname-$pkgver"
 	export CLASSPATH="/usr/share/java/junit.jar:/usr/share/java/hamcrest-core.jar:$CLASSPATH"