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

[Jonas Witschel]

    Date: Monday, November 23, 2020 @ 18:05:32
  Author: diabonas
Revision: 760060

upgpkg: tpm2-pkcs11 1.5.0-3: fix compatibility with tpm2-tss-engine 1.1.0

Modified:
  tpm2-pkcs11/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-23 17:52:51 UTC (rev 760059)
+++ PKGBUILD	2020-11-23 18:05:32 UTC (rev 760060)
@@ -1,7 +1,7 @@
 # Maintainer: Jonas Witschel <diabonas at archlinux.org>
 pkgname=tpm2-pkcs11
 pkgver=1.5.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'
@@ -11,11 +11,19 @@
 makedepends=('cmocka')
 checkdepends=('expect' 'iproute2' 'java-hamcrest' 'junit' 'libp11' 'opensc'
               'python-python-pkcs11' 'swtpm' 'tpm2-abrmd' 'tpm2-tss-engine' 'wget' 'xxd')
-source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc})
+source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc}
+        "tpm2-pkcs11-1.5.0_compatibility_tpm2-tss-engine-1.1.0.patch::$url/commit/969408022d1f61bd9a32388f842dae567beb407b.patch")
 sha512sums=('999adf3ea031dfbb0eadefbd6b2c5457bff738bad231efa70218032f851fe5ba466e37bdf47b5bce380c378b97e88b2a76c9b59a264db5c5f380a9ba3cce58a0'
-            'SKIP')
+            'SKIP'
+            '35e2f77079d362ffb5318844e9df3fc2dc2a4791ad146629800efa94226932949893735c019b897eb342277bdf2bc572307b75f0d5812b81b44aa12899abb7b5')
 validpgpkeys=('5B482B8E3E19DA7C978E1D016DE2E9078E1F50C1') # William Roberts (Bill Roberts) <william.c.roberts at intel.com>
 
+prepare() {
+	cd "$pkgname-$pkgver"
+	# Fix compatibility with tpm2-tss-engine 1.1.0 (https://github.com/tpm2-software/tpm2-pkcs11/pull/630)
+	patch --forward --strip=1 --input="$srcdir/tpm2-pkcs11-1.5.0_compatibility_tpm2-tss-engine-1.1.0.patch"
+}
+
 build() {
 	cd "$pkgname-$pkgver"
 	export CLASSPATH="/usr/share/java/junit.jar:/usr/share/java/hamcrest-core.jar:$CLASSPATH"