Skip to contentSkip to conversation

v2 travis-ci: update pkcs11-helper to 1.22

PATCH In review Ilya Shipitsin 3 participants 3 messages Aug 9, 2017 – Aug 11, 2017

lore
Share & tools
lore

Ilya Shipitsin

author
#0 lore raw

PATCH 1/1 v2 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 <[email protected]...>

---
v2: break lines up into 80-char, thanks Steffan Karger

 .travis.yml           | 2 +-
 .travis/build-deps.sh | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
.travis.yml +1 -1
index db90e03a..fc98a4d0 100644
@@ -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"
.travis/build-deps.sh +6 -2
index 9cc18584..e787abab 100755
@@ -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"
Signature · 1 line
2.13.3
#1 lore raw

Hi,

Very minor comment for next time: please put the 'v2' in the subject inside the [PATCH] bracket, i.e. [PATCH v2].

Quoted 41 lines · Ilya Shipitsin

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

Signed-off-by Ilya Shipitsin <[email protected]...>

---
v2: break lines up into 80-char, thanks Steffan Karger

 .travis.yml           | 2 +-
 .travis/build-deps.sh | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
.travis.yml +1 -1
index db90e03a..fc98a4d0 100644
@@ -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"
.travis/build-deps.sh +1 -1
index 9cc18584..e787abab 100755
@@ -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}"

.travis/build-deps.sh build_pkcs11_helper () { · line 56

Quoted 10 lines
.travis/build-deps.sh +5 -1
             ./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"

Patch itself looks good, so ACK.

-Steffan

#2 lore raw

Re: [Openvpn-devel] [PATCH applied] travis-ci: update pkcs11-helper to 1.22

In reply to Ilya Shipitsin

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Your patch has been applied to the following branches

commit 28dba48541f5b212c7510ab3b0776dc39044502a (master) commit 9fffbfd094203126d2c7b8039762cd258c36631e (release/2.4)

Author: Ilya Shipitsin
Date:   Wed Aug 9 13:12:19 2017 +0500
     travis-ci: update pkcs11-helper to 1.22

     Signed-off-by: Ilya Shipitsin <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg15187.html
     Signed-off-by: David Sommerseth <[email protected]...>

- --
kind regards,

David Sommerseth

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBCgAGBQJZjg+/AAoJEIbPlEyWcf3ybecP/0L9hhRQ6nK6sPaTaGrlzTwl 3ae/F+td5Ve8vTKuGn3P93LAiA15KR2E4BxQ6yJh8nJnTPrGIdM4a9l48TkaTME5 kxeWc/K7dArOuIzooOvacPHeR359bMYkBHmqdDcP5R8HBTDVxay+2teyKzy5P7/y nryjmnOR5ZXdFHYy+8sXj+vthcwEJM9lZSoJzUk7d6syfsNYyBqx5xXrgey5dKON EdB8q0n/Ea7yI+KNpPq3zZ01II6Kn4fcKZRN3as4XCru7a+YJGVFWll3fw//VQIE pmguUad6kAAFiAvaltB0FCdAgRmAVQYVl1g6HdP7Fq4Slov7LwklNwXyEfGUJvmf PXTmqbcjBlavGpf9uMSNHZVWwfBn3DNAEx244N3fthK0IabPi6sf9wCb4ssaYAiy Zajn2H9gTiEBQxU9Akqt6iZS86MfqtKMb06KKZWTjCzXgCJr0KScABxVVDI2/7i1 9KdwkXPg0b9LhN3myVZFNXrTRKObQKjs0E+FUIYO4XQoFtYFFxTS+iT7qM6abYKq Xl2Yl0nfv7j7Oqd5xvSysnt8zJCBTUY/nsVHxOp6lhDpF29U41YwgGs1eHk0slVU iBmCAR4/3WlvYWphfZoG/LQtcvNR3y5LJxYFHLmhOTG2LtfL/y4McIdJ1TXoQQCa re+OGjU9/v16ZfzuP6m1
=URQP
-----END PGP SIGNATURE-----