[arch-commits] Commit in tpm2-tss-engine/trunk (PKGBUILD tpm2-tss-engine_check.sh)

[Jonas Witschel]

    Date: Friday, November 20, 2020 @ 14:14:25
  Author: diabonas
Revision: 757898

upgpkg: tpm2-tss-engine 1.1.0-1: upstream release

Modified:
  tpm2-tss-engine/trunk/PKGBUILD
Deleted:
  tpm2-tss-engine/trunk/tpm2-tss-engine_check.sh

--------------------------+
 PKGBUILD                 |   29 +++++++++--------------------
 tpm2-tss-engine_check.sh |    9 ---------
 2 files changed, 9 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-20 12:35:39 UTC (rev 757897)
+++ PKGBUILD	2020-11-20 14:14:25 UTC (rev 757898)
@@ -1,38 +1,27 @@
 # Maintainer: Jonas Witschel <diabonas at archlinux.org>
 pkgname=tpm2-tss-engine
-pkgver=1.0.1
-pkgrel=4
+pkgver=1.1.0
+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' 'libtss2-esys.so' 'libtss2-mu.so')
-checkdepends=('cmocka' 'expect' 'ibm-sw-tpm2' 'tpm2-tools')
-source=("$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"{,.asc}
-        'tpm2-tss-engine_check.sh'
-        'tpm2-tss-engine-1.0.1-tpm2-tools-4.0.patch')
-sha512sums=('106fc6aadf0b4b27c3b38be596356aa59b4b76ec1602e8c5564aec6b4be7e2b5d6077006ee13d41e58402255b879aadaa966c758b5b326ae32742007ce2ef238'
-            'SKIP'
-            '77d0d1789376e76b1f357edea59e5cd0953cfcf33c35069da6c4092c43e028dfb1e1593e3c85456e590f9da8252701519a06a5eb94adf8501cf4e5f21cc92cf1'
-            'bf73ef8834fc92c1a85b590e0dd69e9d0a465533e631768652fdd0e316f590fa5a16fdcc7faf9af360b6b05a508d904f3657e7c476c136b2000e3374e2a3606d')
+depends=('openssl' 'tpm2-tss' 'libtss2-esys.so' 'libtss2-mu.so' 'libtss2-tctildr.so')
+checkdepends=('cmocka' 'expect' 'ibm-sw-tpm2' 'iproute2' 'tpm2-tools')
+source=("$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"{,.asc})
+sha512sums=('5d2e08178be54350e8672245023d601a0d9d520f8c49e977af49d7c59b91d033c14b4a347b71e042fe7c5ff12af9fcc43b69fd1dc83a9f0db12d47d43e1107f4'
+            'SKIP')
 validpgpkeys=('D6B4D8BAC7E0CC97DCD4AC7272E88B53F7A95D84') # Andreas Fuchs <andreas.fuchs at sit.fraunhofer.de>
 
-prepare() {
-	cd "$pkgname-$pkgver"
-	# Use tpm2-tools 4.0 for tests (backport of GitHub PR #142)
-	patch --strip=1 --input="$srcdir/tpm2-tss-engine-1.0.1-tpm2-tools-4.0.patch"
-}
-
 build() {
 	cd "$pkgname-$pkgver"
-	(( CHECKFUNC )) && _opts=('--enable-unit' '--enable-integration')
-	./configure --prefix=/usr --enable-tctienvvar "${_opts[@]}"
+	./configure --prefix=/usr $( ((CHECKFUNC)) && echo --enable-unit --enable-integration)
 	make
 }
 
 check() {
 	cd "$pkgname-$pkgver"
-	"$srcdir/tpm2-tss-engine_check.sh"
+	make check
 }
 
 package() {

Deleted: tpm2-tss-engine_check.sh
===================================================================
--- tpm2-tss-engine_check.sh	2020-11-20 12:35:39 UTC (rev 757897)
+++ tpm2-tss-engine_check.sh	2020-11-20 14:14:25 UTC (rev 757898)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Start TPM simulator
-tpm_server >/dev/null &
-trap "kill $!" EXIT
-
-export TPM2TSSENGINE_TCTI=libtss2-tcti-mssim.so
-export TPM2TOOLS_TCTI=mssim
-make --jobs=1 check