Browse code
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>
Ilya Shipitsin authored on 2017/08/09 17:12:19Showing 2 changed files
| ... | ... |
@@ -14,7 +14,7 @@ env: |
| 14 | 14 |
- PREFIX="${HOME}/opt"
|
| 15 | 15 |
- TAP_WINDOWS_VERSION=9.21.2 |
| 16 | 16 |
- LZO_VERSION=2.10 |
| 17 |
- - PKCS11_HELPER_VERSION=1.11 |
|
| 17 |
+ - PKCS11_HELPER_VERSION=1.22 |
|
| 18 | 18 |
- MBEDTLS_VERSION="2.5.1" |
| 19 | 19 |
- MBEDTLS_CFLAGS="-I${PREFIX}/include"
|
| 20 | 20 |
- MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
|
| ... | ... |
@@ -35,7 +35,7 @@ build_lzo () {
|
| 35 | 35 |
download_pkcs11_helper () {
|
| 36 | 36 |
if [ ! -f "pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2" ]; then
|
| 37 | 37 |
wget -P download-cache/ \ |
| 38 |
- "http://downloads.sourceforge.net/project/opensc/pkcs11-helper/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2"
|
|
| 38 |
+ "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${PKCS11_HELPER_VERSION}/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2"
|
|
| 39 | 39 |
fi |
| 40 | 40 |
} |
| 41 | 41 |
|
| ... | ... |
@@ -46,7 +46,11 @@ build_pkcs11_helper () {
|
| 46 | 46 |
cd "pkcs11-helper-${PKCS11_HELPER_VERSION}"
|
| 47 | 47 |
|
| 48 | 48 |
./configure --host=${CHOST} --program-prefix='' --libdir=${PREFIX}/lib \
|
| 49 |
- --prefix=${PREFIX} --build=x86_64-pc-linux-gnu --disable-crypto-engine-gnutls --disable-crypto-engine-nss
|
|
| 49 |
+ --prefix=${PREFIX} --build=x86_64-pc-linux-gnu \
|
|
| 50 |
+ --disable-crypto-engine-gnutls \ |
|
| 51 |
+ --disable-crypto-engine-nss \ |
|
| 52 |
+ --disable-crypto-engine-polarssl \ |
|
| 53 |
+ --disable-crypto-engine-mbedtls |
|
| 50 | 54 |
make all install |
| 51 | 55 |
) |
| 52 | 56 |
echo "${PKCS11_HELPER_VERSION}" > "${PREFIX}/.pkcs11_helper-version"
|