diff options
author | Jonas Witschel | 2019-07-25 13:40:47 +0200 |
---|---|---|
committer | Jonas Witschel | 2019-07-25 13:40:47 +0200 |
commit | cb14045efeb3189824a611a169a8c4fea6a78a52 (patch) | |
tree | 3a5bcfe2d425d8233a11253c153831040c726130 | |
parent | 095ac64cfec2806b009c8285a1ada07abb6463d6 (diff) | |
download | aur-cb14045efeb3189824a611a169a8c4fea6a78a52.tar.gz |
upgpkg: tpm2-tss-engine 1.0.1-1
upstream release
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | Tests-Fix-for-latest-tools.patch | 56 |
3 files changed, 12 insertions, 84 deletions
@@ -1,27 +1,23 @@ pkgbase = tpm2-tss-engine pkgdesc = OpenSSL engine for Trusted Platform Module 2.0 devices - pkgver = 1.0.0 - pkgrel = 3 + pkgver = 1.0.1 + pkgrel = 1 url = https://github.com/tpm2-software/tpm2-tss-engine arch = x86_64 license = BSD checkdepends = cmocka checkdepends = expect checkdepends = ibm-sw-tpm2 - checkdepends = tpm2-tools-git + checkdepends = tpm2-tools depends = openssl depends = tpm2-tss - 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 = https://github.com/tpm2-software/tpm2-tss-engine/releases/download/v1.0.1/tpm2-tss-engine-1.0.1.tar.gz + source = https://github.com/tpm2-software/tpm2-tss-engine/releases/download/v1.0.1/tpm2-tss-engine-1.0.1.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 - source = Tests-Fix-for-latest-tools.patch validpgpkeys = D6B4D8BAC7E0CC97DCD4AC7272E88B53F7A95D84 - sha512sums = b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3 + sha512sums = 106fc6aadf0b4b27c3b38be596356aa59b4b76ec1602e8c5564aec6b4be7e2b5d6077006ee13d41e58402255b879aadaa966c758b5b326ae32742007ce2ef238 sha512sums = SKIP sha512sums = 77d0d1789376e76b1f357edea59e5cd0953cfcf33c35069da6c4092c43e028dfb1e1593e3c85456e590f9da8252701519a06a5eb94adf8501cf4e5f21cc92cf1 - sha512sums = 8441bf0eab24b0aee8b67996079f94c0fca9138dd6bc95f595e24bafe71a49923eb08120c2573789b821c63900be99e9b4be7060bb3dd1170c6725d9ba06a8e7 - sha512sums = 5cf0967cf50c889ee776b0f2e6e87622e7d89119c2c5ed02cafe86fe35ee97f6f2d6e7f7c6236b069b51e7daa970f54ba38182278bfa0ae1fe699399488034b6 pkgname = tpm2-tss-engine @@ -1,32 +1,20 @@ # Maintainer: Jonas Witschel <diabonas at gmx dot de> pkgname=tpm2-tss-engine -pkgver=1.0.0 -pkgrel=3 +pkgver=1.0.1 +pkgrel=1 pkgdesc='OpenSSL engine for Trusted Platform Module 2.0 devices' arch=('x86_64') url='https://github.com/tpm2-software/tpm2-tss-engine' license=('BSD') depends=('openssl' 'tpm2-tss') -checkdepends=('cmocka' 'expect' 'ibm-sw-tpm2' 'tpm2-tools-git') +checkdepends=('cmocka' 'expect' 'ibm-sw-tpm2' 'tpm2-tools') source=("$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"{,.asc} - 'tpm2-tss-engine_check.sh' - "test-migrate-tpm2_create-option-from-A-to-b.patch::$url/commit/4c770f836c916abe968901ff9f06bb611812cb4a.patch" - 'Tests-Fix-for-latest-tools.patch') -sha512sums=('b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3' + 'tpm2-tss-engine_check.sh') +sha512sums=('106fc6aadf0b4b27c3b38be596356aa59b4b76ec1602e8c5564aec6b4be7e2b5d6077006ee13d41e58402255b879aadaa966c758b5b326ae32742007ce2ef238' 'SKIP' - '77d0d1789376e76b1f357edea59e5cd0953cfcf33c35069da6c4092c43e028dfb1e1593e3c85456e590f9da8252701519a06a5eb94adf8501cf4e5f21cc92cf1' - '8441bf0eab24b0aee8b67996079f94c0fca9138dd6bc95f595e24bafe71a49923eb08120c2573789b821c63900be99e9b4be7060bb3dd1170c6725d9ba06a8e7' - '5cf0967cf50c889ee776b0f2e6e87622e7d89119c2c5ed02cafe86fe35ee97f6f2d6e7f7c6236b069b51e7daa970f54ba38182278bfa0ae1fe699399488034b6') + '77d0d1789376e76b1f357edea59e5cd0953cfcf33c35069da6c4092c43e028dfb1e1593e3c85456e590f9da8252701519a06a5eb94adf8501cf4e5f21cc92cf1') 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" - # https://github.com/tpm2-software/tpm2-tss-engine/issues/112 - patch --strip=1 --input="$srcdir/Tests-Fix-for-latest-tools.patch" -} - build() { cd "$pkgname-$pkgver" (( CHECKFUNC )) && _opts=('--enable-unit' '--enable-integration') diff --git a/Tests-Fix-for-latest-tools.patch b/Tests-Fix-for-latest-tools.patch deleted file mode 100644 index 1d0098187eda..000000000000 --- a/Tests-Fix-for-latest-tools.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 51b4e20dacdf12e30c506cdb7878fa2d95f4138c Mon Sep 17 00:00:00 2001 -From: Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de> -Date: Wed, 8 May 2019 10:27:43 +0200 -Subject: [PATCH] Tests: Fix for latest tools - -Latest tpm2_evictcontrol outputs a second line to stdout. - -Signed-off-by: Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de> ---- - test/rsasign_parent.sh | 2 +- - test/rsasign_persistent.sh | 2 +- - test/rsasign_persistent_emptyauth.sh | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/test/rsasign_parent.sh b/test/rsasign_parent.sh -index a4a89be..60720bb 100755 ---- a/test/rsasign_parent.sh -+++ b/test/rsasign_parent.sh -@@ -19,7 +19,7 @@ tpm2_createprimary -a o -g sha256 -G rsa -o ${PARENT_CTX} - tpm2_flushcontext -t - - # Load primary key to persistent handle --HANDLE=$(tpm2_evictcontrol -a o -c ${PARENT_CTX} | cut -d ' ' -f 2) -+HANDLE=$(tpm2_evictcontrol -a o -c ${PARENT_CTX} | cut -d ' ' -f 2 | head -n 1) - tpm2_flushcontext -t - - # Generating a key underneath the persistent parent -diff --git a/test/rsasign_persistent.sh b/test/rsasign_persistent.sh -index 293b13e..b04bccc 100755 ---- a/test/rsasign_persistent.sh -+++ b/test/rsasign_persistent.sh -@@ -30,7 +30,7 @@ RSA_CTX=${DIR}/rsakey.ctx - tpm2_load -C ${PARENT_CTX} -u ${TPM_RSA_PUBKEY} -r ${TPM_RSA_KEY} -o ${RSA_CTX} - tpm2_flushcontext -t - --HANDLE=$(tpm2_evictcontrol -a o -c ${RSA_CTX} | cut -d ' ' -f 2) -+HANDLE=$(tpm2_evictcontrol -a o -c ${RSA_CTX} | cut -d ' ' -f 2 | head -n 1) - tpm2_flushcontext -t - - # Signing Data -diff --git a/test/rsasign_persistent_emptyauth.sh b/test/rsasign_persistent_emptyauth.sh -index 71debcd..a97d14f 100755 ---- a/test/rsasign_persistent_emptyauth.sh -+++ b/test/rsasign_persistent_emptyauth.sh -@@ -30,7 +30,7 @@ RSA_CTX=${DIR}/rsakey.ctx - tpm2_load -C ${PARENT_CTX} -u ${TPM_RSA_PUBKEY} -r ${TPM_RSA_KEY} -o ${RSA_CTX} - tpm2_flushcontext -t - --HANDLE=$(tpm2_evictcontrol -a o -c ${RSA_CTX} | cut -d ' ' -f 2) -+HANDLE=$(tpm2_evictcontrol -a o -c ${RSA_CTX} | cut -d ' ' -f 2 | head -n 1) - tpm2_flushcontext -t - - # Signing Data --- -2.21.0 - |