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

[Jonas Witschel]

    Date: Sunday, July 5, 2020 @ 11:21:10
  Author: diabonas
Revision: 657811

upgpkg: tpm2-pkcs11 1.2.0-3: always enable unit tests for reproducibility

If unit tests are enabled, the macro UNIT_TESTING is defined, which changes the
code of src/lib/twist.c and thus the built library. If reproducers try to build
the package with --nocheck to save resources, the package contents will not
match. Unlike integration tests, enabling unit tests unconditionally only
requires a makedepends on cmocka, which is tiny.

Also update commit hashes of the patches to build with GCC 10 and ibm-sw-tpm2
1628 to the official merged commits that will be part of the next release.

Modified:
  tpm2-pkcs11/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-05 11:06:14 UTC (rev 657810)
+++ PKGBUILD	2020-07-05 11:21:10 UTC (rev 657811)
@@ -1,21 +1,22 @@
 # Maintainer: Jonas Witschel <diabonas at archlinux.org>
 pkgname=tpm2-pkcs11
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 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-cryptography' 'python-pyasn1-modules' 'python-yaml' 'sqlite'
+depends=('libyaml' 'openssl' 'python' 'python-cryptography' 'python-pyasn1-modules' 'python-yaml' 'sqlite'
          'tpm2-tools' 'tpm2-tss' 'libtss2-esys.so' 'libtss2-mu.so' 'libtss2-rc.so' 'libtss2-tctildr.so')
-checkdepends=('cmocka' 'ibm-sw-tpm2' 'iproute2' 'java-hamcrest' 'junit' 'libp11' 'opensc' 'tpm2-abrmd' 'wget' 'xxd')
+makedepends=('cmocka')
+checkdepends=('ibm-sw-tpm2' 'iproute2' 'java-hamcrest' 'junit' 'libp11' 'opensc' 'tpm2-abrmd' 'wget' 'xxd')
 source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc}
-        "tpm2-pkcs11-1.2.0_gcc-10-fix.patch::$url/commit/198e6035a503f1ba747ad2997cac94a27a9633ad.patch"
-        "tpm2-pkcs11-1.2.0_ibm-sw-tpm2-1628.patch::$url/commit/e4bb96cf4e6df883de8b9ab88e4768aa3d6621f0.patch")
+        "tpm2-pkcs11-1.2.0_gcc-10-fix.patch::$url/commit/13691c677e5f3af4c1ee4e26e04dbe4bcb1e5c28.patch"
+        "tpm2-pkcs11-1.2.0_ibm-sw-tpm2-1628.patch::$url/commit/7db0e907303731425b80271264cd67e8ed9c0eb4.patch")
 sha512sums=('e7de454b38388c4562fc92282855c1ed9a04c7968c358d6918137257fb5a1ca785c2297e8a34464ea04eed86acd9fc5b59c837027da9d3f195ec86ff0563feeb'
             'SKIP'
-            '52044f03027a5c3d64db2b43144d6e66aab09b3ef674fc3b65d3858154ac894eddd98473136fc3dbcba2df26cf9028c77379de0e172c7115a68200db1ae990aa'
-            '6aa7cef3e74f41fbd1f853d969c64c066df00a3065e8b2113bd92544be9a209a1feaec1078d1df8cc4cf625266d6cb88dc453887e7558d22558dbcfd936bc722')
+            '8a52ebf13e715be87f2a103765eb45051ad9c6124cd5e6826fdf20f50c69bdd5c103d1a4168653d4b6eb4cc68974d0b5adcb8b42211181d066a772c3a416cd61'
+            '4607014cee52cdedce57c5c1d53fb4c274d144c3684964673c19c12c3e4e1f7372122dacb6d4cd0db77e1287cf28a684f3e0ca9a30518c96ef13e6da630c0039')
 validpgpkeys=('5B482B8E3E19DA7C978E1D016DE2E9078E1F50C1') # William Roberts (Bill Roberts) <william.c.roberts at intel.com>
 
 prepare() {
@@ -29,7 +30,7 @@
 build() {
 	cd "$pkgname-$pkgver"
 	export CLASSPATH="/usr/share/java/junit.jar:/usr/share/java/hamcrest-core.jar:$CLASSPATH"
-	./configure --prefix=/usr $( ((CHECKFUNC)) && echo --enable-unit --enable-integration)
+	./configure --prefix=/usr --enable-unit $( ((CHECKFUNC)) && echo --enable-integration)
 	make
 	cd tools
 	python setup.py build