upgpkg: tpm2-tss-engine 1.0.0-2

Fix test failure resulting from upstream change in tpm2-tools-git

2 files changed, 14 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fc4894049ff..61be98e7cc5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tpm2-tss-engine
 	pkgdesc = OpenSSL engine for Trusted Platform Module 2.0 devices
 	pkgver = 1.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/tpm2-software/tpm2-tss-engine
 	arch = x86_64
 	license = BSD
@@ -14,10 +14,12 @@ pkgbase = tpm2-tss-engine
 	source = https://github.com/tpm2-software/tpm2-tss-engine/releases/download/v1.0.0/tpm2-tss-engine-1.0.0.tar.gz
 	source = https://github.com/tpm2-software/tpm2-tss-engine/releases/download/v1.0.0/tpm2-tss-engine-1.0.0.tar.gz.asc
 	source = tpm2-tss-engine_check.sh
+	source = test-migrate-tpm2_create-option-from-A-to-b.patch::https://github.com/tpm2-software/tpm2-tss-engine/commit/4c770f836c916abe968901ff9f06bb611812cb4a.patch
 	validpgpkeys = D6B4D8BAC7E0CC97DCD4AC7272E88B53F7A95D84
 	sha512sums = b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3
 	sha512sums = SKIP
 	sha512sums = 77d0d1789376e76b1f357edea59e5cd0953cfcf33c35069da6c4092c43e028dfb1e1593e3c85456e590f9da8252701519a06a5eb94adf8501cf4e5f21cc92cf1
+	sha512sums = 8441bf0eab24b0aee8b67996079f94c0fca9138dd6bc95f595e24bafe71a49923eb08120c2573789b821c63900be99e9b4be7060bb3dd1170c6725d9ba06a8e7
 
 pkgname = tpm2-tss-engine
 
diff --git a/PKGBUILD b/PKGBUILD
index 374a8e166eae..d18e6d39a2e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jonas Witschel <diabonas at gmx dot de>
 pkgname=tpm2-tss-engine
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenSSL engine for Trusted Platform Module 2.0 devices'
 arch=('x86_64')
 url='https://github.com/tpm2-software/tpm2-tss-engine'
@@ -9,12 +9,20 @@ license=('BSD')
 depends=('openssl' 'tpm2-tss')
 checkdepends=('cmocka' 'expect' 'ibm-sw-tpm2' 'tpm2-tools-git')
 source=("$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"{,.asc}
-        'tpm2-tss-engine_check.sh')
+        'tpm2-tss-engine_check.sh'
+        "test-migrate-tpm2_create-option-from-A-to-b.patch::$url/commit/4c770f836c916abe968901ff9f06bb611812cb4a.patch")
 sha512sums=('b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3'
             'SKIP'
-            '77d0d1789376e76b1f357edea59e5cd0953cfcf33c35069da6c4092c43e028dfb1e1593e3c85456e590f9da8252701519a06a5eb94adf8501cf4e5f21cc92cf1')
+            '77d0d1789376e76b1f357edea59e5cd0953cfcf33c35069da6c4092c43e028dfb1e1593e3c85456e590f9da8252701519a06a5eb94adf8501cf4e5f21cc92cf1'
+            '8441bf0eab24b0aee8b67996079f94c0fca9138dd6bc95f595e24bafe71a49923eb08120c2573789b821c63900be99e9b4be7060bb3dd1170c6725d9ba06a8e7')
 validpgpkeys=('D6B4D8BAC7E0CC97DCD4AC7272E88B53F7A95D84') # Andreas Fuchs
 
+prepare() {
+	cd "$pkgname-$pkgver"
+	# https://github.com/tpm2-software/tpm2-tss-engine/issues/106
+	patch --strip=1 --input="$srcdir/test-migrate-tpm2_create-option-from-A-to-b.patch"
+}
+
 build() {
 	cd "$pkgname-$pkgver"
 	(( CHECKFUNC )) && _opts=('--enable-unit' '--enable-integration')