travis-ci: update pkcs11-helper to 1.22

use pkcs11-helper from https://github.com/OpenSC/pkcs11-helper/
to match build process used in windows installer build

Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
Acked-by: Steffan Karger <steffan@karger.me>
Message-Id: <20170809081219.10367-1-chipitsine@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15187.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
(cherry picked from commit 28dba48541f5b212c7510ab3b0776dc39044502a)

diff --git a/.travis.yml b/.travis.yml
index 7d842b104df5b5c6085e41bc1d80c6e16f6cc519..0b53152904b83f8a71ebafc91e86e06b878515dd 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ env:
     - PREFIX="${HOME}/opt"
     - TAP_WINDOWS_VERSION=9.21.2
     - LZO_VERSION=2.10
-    - PKCS11_HELPER_VERSION=1.11
+    - PKCS11_HELPER_VERSION=1.22
     - MBEDTLS_VERSION="2.5.1"
     - MBEDTLS_CFLAGS="-I${PREFIX}/include"
     - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"

diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
index 9cc18584f731740eac6f7336d4324eb37bd173ff..e787ababa3f2ffbe15d9e04500ea8a9503e03aca 100755 (executable)
--- a/.travis/build-deps.sh
+++ b/.travis/build-deps.sh
@@ -35,7 +35,7 @@ build_lzo () {
 download_pkcs11_helper () {
     if [ ! -f "pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2" ]; then
         wget -P download-cache/ \
-            "http://downloads.sourceforge.net/project/opensc/pkcs11-helper/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2"
+            "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${PKCS11_HELPER_VERSION}/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2"
     fi
 }
 
@@ -46,7 +46,11 @@ build_pkcs11_helper () {
             cd "pkcs11-helper-${PKCS11_HELPER_VERSION}"
 
             ./configure --host=${CHOST} --program-prefix='' --libdir=${PREFIX}/lib \
-                 --prefix=${PREFIX} --build=x86_64-pc-linux-gnu --disable-crypto-engine-gnutls --disable-crypto-engine-nss
+                 --prefix=${PREFIX} --build=x86_64-pc-linux-gnu \
+                 --disable-crypto-engine-gnutls \
+                 --disable-crypto-engine-nss \
+                 --disable-crypto-engine-polarssl \
+                 --disable-crypto-engine-mbedtls
             make all install
          )
          echo "${PKCS11_HELPER_VERSION}" > "${PREFIX}/.pkcs11_helper-version"