Resolve several travis-ci issues

MBEDTLS_VERSION, OPENSSL_VERSION were defined twice - in both .travis.yml and .travis/build-deps.sh files, the last one defined OPENSSL_VERSION via nonexistent OPENSSL_VERION variable, which lead us to use openssl-1.0.1 instead of openssl-1.0.2, I removed variable definition from build-deps.sh

"cache: [ apt: true ]" is not a travis supported option, it was introduced by mistake, I removed it

LD_LIBRARY_PATH was defined for the entire test run, it includes custom openssl build, which was picked by "wget", so "wget" could not verify SSL cert at https://www.openssl.org sometimes. We do not want wget to pick our custom LD_LIBRARY_PATH, so I moved that variable to "script" section

LD_LIBRARY_PATH was defined for both linux and osx environments, for the second DYLD_LIBRARY_PATH must be defined instead

v2: Upgrade openssl, mbedtls to the most recent versions

v3: DYLD_LIBRARY_PATH was defined via LD_LIBRARY_PATH by mistake

---
 .travis.yml           | 8 ++++----
 .travis/build-deps.sh | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

index 369db97..a68374a 100644
@@ -12,13 +12,12 @@ env:
   global:
     - JOBS=3
     - PREFIX="${HOME}/opt"
-    - MBEDTLS_VERSION="2.2.1"
+    - MBEDTLS_VERSION="2.4.0"
     - MBEDTLS_CFLAGS="-I${PREFIX}/include"
     - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
-    - OPENSSL_VERSION="1.0.1t"
+    - OPENSSL_VERSION="1.0.2k"
     - OPENSSL_CFLAGS="-I${PREFIX}/include"
     - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
-    - LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}"
 
 matrix:
   include:

@@ -63,7 +62,6 @@ addons:
       - linux-libc-dev
 
 cache:
-  apt: true
   ccache: true
   directories:
   - download-cache

@@ -77,6 +75,8 @@ install:
   - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1)
 
 script:
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}"; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx"   ]; then export DYLD_LIBRARY_PATH="${PREFIX}/lib:${DYLD_LIBRARY_PATH}"; fi
   - autoreconf -vi
   - ./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG} || (cat config.log && exit 1)
   - make -j$JOBS

index bda54ee..3ffba0b 100755
@@ -2,8 +2,6 @@
 set -eux
 
 # Set defaults
-MBEDTLS_VERSION="${MBEDTLS_VERSION:-2.2.1}"
-OPENSSL_VERSION="${OPENSSL_VERION:-1.0.2h}"
 PREFIX="${PREFIX:-${HOME}/opt}"
 
 download_mbedtls () {

2.5.5

Hi Ilya,

my 2-meta-cents here: when sending multiple versions of the same patch to the mailing list, I'd recommend to change the subject to "[PATCHvX]" where X is the patch version.

This way it is easier to identify which patch comes before and which after.

Not sure what the maintainers think about this, but I stumbled on the wrong version a couple of times today before realizing that the newer was another one.

Git can do this for you by specifying "-v X" (i.e. -v 2" to the git format-patch command.

Cheers!

Antonio Quartulli

Hi,

Either "[PATCH v2]" or at least mention "v2: <this is new>" in the commit message.

I've learned something new today :-) (but I shouldn't be surprised: git is known to do everything to ease lazy committers' work :-) )

gert

USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             [email protected]...
fax: +49-89-35655025                        [email protected]...

Weee! I realize I will need to read the man pages again ... I was neither aware of -v :) Thanks for the hint, Antonio!

Recently updated to git-2.11 (from v1.8) ... and discover new things the whole time now ...

kind regards,

David Sommerseth
OpenVPN Technologies, Inc

Same here, so another thanks to Antonio! I used to do it the hard way by manually editing the message subject.

Samuli Seppänen
Community Manager
OpenVPN Technologies, Inc

irc freenode net: mattock

I had a good master .. :D

/me is too lazy to read the man too

Cheers!

Antonio Quartulli

This should take care of travis builds so ACK from me.

For completeness I will copy what I wrote before:
While this patch is good enough for travis builds, there is a more general issue here. I think its the job of libtool to set -rpath properly (and/or use a wrapper) so that uninstalled test programs pick up the library it was linked with.

Selva

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Your patch has been applied to the following branches

commit 208c03ea145ed89083c43267733487c99a805069 (master) commit 31af45abfad7e3f0fbafc82b2daef3400a93359c (release/2.4)

Author: Ilya Shipitsin
Date:   Sun Jan 29 11:58:11 2017 +0500

     Resolve several travis-ci issues

     Acked-by: Selva Nair <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg13983.html
     Signed-off-by: David Sommerseth <[email protected]...>

- --
kind regards,

David Sommerseth

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

iQIcBAEBAgAGBQJYjkfQAAoJEIbPlEyWcf3yQ1oQALphWU4R8fzs/Nwy5YjUQVhL 8wlpQxvaBnYh1z3j5Iow1OSxgqNh9ee1oNio/v2gBCHLIu5WxbmwcbiDFy7sB3F4 vX19BpqgHSxf7P+RFvET5wQFdE+cV0FoTG/XoaqH8+fPmDqR6xROUh4HeQzdHBEi k/+VxnefMrLCPZckFcVOd862jgtVwFumE5B8EscfsliPgn8ylEoBPoS1e+akNP/u Bs1qp3jqDAAKOOuchA6hTlPudCMI+LLI3a7rGuYjgy/GhFATQTBQPJ1gsKdnjXKe JzOMhhVsjiN56dFVRQNw22NRyg/MoklwNzxwGu081B1Awy55ruVjvb8II9SIcNNJ 0B3Co0FQWTITpYDNuJnM/RT46zWTfn3zoDEfI5587792ta/Esu00etXn/jeud928 D/08bqW3reIs/AsOTHX5QtlucWOY1zTptk/vpzs9I6Rwi2VKOKqqiVXUBl4vrUtt wys/11OJsOcm2unovEHboNQ2eGRHFdEz9Yma9jpEtCQhi0gk5wyd2FNC/21one4a lfPzITmQv2bdoF+HHY0V7N+kFxsITELpV/Mrx0jrHAc9G2JOZyUoMGTsULd18r8F bhd73BuDWoqSBzFmMtZAtFL15Nan9rvWQrfif4Ieqyk0DlP7xMcY7Zs4D7eVbXzN jwhd9k6NtNNVUFId6VeL
=fLaR
-----END PGP SIGNATURE-----