summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Witschel2020-01-22 16:54:17 +0100
committerJonas Witschel2020-01-22 16:54:17 +0100
commitfd2ae386572a43773c5c7bfc076ee3e435d0560d (patch)
tree25a83c9ef1ddb2ee2c3801f08d73246d72535d2c
parent572ec729d4c90e84fbfeae07f7accb119a690f83 (diff)
downloadaur-fd2ae386572a43773c5c7bfc076ee3e435d0560d.tar.gz
upgpkg: tpm2-pkcs11-git 1.0.1.r24.e482faa-1
Add Java checkdepends required since upstream commit 304580ef865f5487194206aa57b3f5705501c199.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD8
2 files changed, 10 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f3ea0a61897c..6e6e8016bca9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = tpm2-pkcs11-git
pkgdesc = PKCS#11 interface for Trusted Platform Module 2.0 hardware
- pkgver = 1.0.1.r11.4428b09
+ pkgver = 1.0.1.r24.e482faa
pkgrel = 1
url = https://github.com/tpm2-software/tpm2-pkcs11
arch = x86_64
@@ -9,6 +9,9 @@ pkgbase = tpm2-pkcs11-git
checkdepends = cmocka
checkdepends = ibm-sw-tpm2
checkdepends = iproute2
+ checkdepends = java-hamcrest
+ checkdepends = jdk8-openjdk
+ checkdepends = junit
checkdepends = libp11
checkdepends = opensc
checkdepends = tpm2-abrmd
diff --git a/PKGBUILD b/PKGBUILD
index c656f5b33f5e..54eff91d9648 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jonas Witschel <diabonas@archlinux.org>
# Contributor: Iwan Timmer <irtimmer@gmail.com>
pkgname=tpm2-pkcs11-git
-pkgver=1.0.1.r11.4428b09
+pkgver=1.0.1.r24.e482faa
pkgrel=1
pkgdesc='PKCS#11 interface for Trusted Platform Module 2.0 hardware'
arch=('x86_64')
@@ -9,7 +9,7 @@ url='https://github.com/tpm2-software/tpm2-pkcs11'
license=('BSD' 'custom:IPR')
depends=('openssl' 'python-cryptography' 'python-pyasn1-modules' 'python-yaml' 'sqlite' 'tpm2-tools')
makedepends=('git' 'autoconf-archive')
-checkdepends=('cmocka' 'ibm-sw-tpm2' 'iproute2' 'libp11' 'opensc' 'tpm2-abrmd' 'xxd')
+checkdepends=('cmocka' 'ibm-sw-tpm2' 'iproute2' 'java-hamcrest' 'jdk8-openjdk' 'junit' 'libp11' 'opensc' 'tpm2-abrmd' 'xxd')
source=("git+$url.git")
sha512sums=('SKIP')
@@ -25,6 +25,10 @@ prepare() {
build() {
cd "${pkgname%-git}"
+ # The integration tests can currently only be compiled with java-environment<9
+ # (https://github.com/tpm2-software/tpm2-pkcs11/issues/391)
+ export PATH="/usr/lib/jvm/java-8-openjdk/bin:$PATH"
+ export CLASSPATH="/usr/share/java/junit.jar:/usr/share/java/hamcrest-core.jar:$CLASSPATH"
./configure --prefix=/usr $( ((CHECKFUNC)) && echo --enable-unit --enable-integration)
make
cd tools