Hi, On 07-08-17 15:22, Ilya Shipitsin wrote: > use pkcs11-helper from https://github.com/OpenSC/pkcs11-helper/ > to match build process used in windows installer build > --- > .travis.yml | 2 +- > .travis/build-deps.sh | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index db90e03a..fc98a4d0 100644 > --- 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.4.0" > - 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 9cc18584..7d8f911b 100755 > --- 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,7 @@ 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
This line is getting really long. Let's break this up into 80-char lines again. Other than that, change looks good to me. So, please send a v2 with this line broken up, and then I think we're good to go. -Steffan ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
