[Openvpn-devel] [PATCH v2] travis-ci: add arm64, s390x builds.

2020-03-22 Thread chipitsine 
From: Ilya Shipitsin 

as described on https://docs.travis-ci.com/user/multi-cpu-architectures 
travis-ci
now supports amd64, ppcle, arm64, s390 architectures. Add arm64 and s390x.

travis-ci images were upgraded to bionic.

"sudo" is deprecated, let us remove it, also "matrix" is deprecated in favour 
of "jobs".

LD_LIBRARY_PATH was replaced by using "rpath" in LDFLAGS, which is more elegant 
way of linking.

also, dependencies were upgraded to the latest versions.

travis_wait was added for long openssl builds.

cmocka was added to linux and osx builds.
---
v2 resolved travis_wait output redirection issue, now it works as expected. I 
had to specify "names" for jobs, 
without names travis puts secure variable as job name

 .travis.yml   | 87 +--
 .travis/build-check.sh| 10 +
 .travis/build-deps.sh | 10 +++--
 .travis/run-build-deps.sh | 10 -
 4 files changed, 62 insertions(+), 55 deletions(-)
 delete mode 100755 .travis/run-build-deps.sh

diff --git a/.travis.yml b/.travis.yml
index 40296d87..925d09ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
-sudo: required
-dist: xenial
+dist: bionic
 
 os: linux
 
@@ -11,86 +10,111 @@ env:
 - PREFIX="${HOME}/opt"
 - TAP_WINDOWS_VERSION=9.23.3
 - LZO_VERSION=2.10
-- PKCS11_HELPER_VERSION=1.25.1
-- MBEDTLS_VERSION=2.16.1
+- PKCS11_HELPER_VERSION=1.26
+- MBEDTLS_VERSION=2.16.4
 - MBEDTLS_CFLAGS="-I${PREFIX}/include"
 - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
-- OPENSSL_VERSION=1.0.2s
+- OPENSSL_VERSION=1.0.2u
 - OPENSSL_CFLAGS="-I${PREFIX}/include"
 - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
 # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
 #   via the "travis encrypt" command using the project repo's public key
 - secure: 
"l9mSnEW4LJqjxftH5i1NdDaYfGmQB1mPXnSB3DXnsjzkCWZ+yJLfBemfQ0tx/wS7chBYxqUaUIMT0hw4zJVp/LANFJo2vfh//ymTS6h0uApRY1ofg9Pp1BFcV1laG6/u8pwSZ2EBy/GhCd3DS436oE8sYBRaFM9FU62L/oeQBfJ7r4ID/0eB1b8bqlbD4paty9MHui2P8EZJwR+KAD84prtfpZOcrSMxPh9OUhJxzxUvvVoP4s4+lZ5Kgg1bBQ3yzKGDqe8VOgK2BWCEuezqhMMc8oeKmAe7CUkoz5gsGYH++k3I9XzP9Z4xeJKoQnC/82qi4xkJmlaOxdionej9bHIcjfRt7D8j1J0U+wOj4p8VrDy7yHaxuN2fi0K5MGa/CaXQSrkna8dePniCng+xQ2MY/zxuRX2gA6xPNLUyQLU9LqIug7wj4z84Hk9iWib4L20MoPjeEo+vAUNq8FtjOPxMuHNpv4iGGx6kgJm7RXl5vC5hxfK6MprrnYe2U5Mcd8jpzagKBaKHL3zV2FxX9k0jRO9Mccz7M2WnaV0MQ6zcngzTN4+s0kCjhfGKd2F2ANT2Gkhj3Me36eNHfuE0dBbvYCMh4b3Mgd7b/OuXwQWdJ8PjJ1WHXjSOw5sHw1suaV6cEO2Meyz5j1tOkyOi0M9QF+LFenQ9vLH4sBCww8U="
 
-matrix:
+jobs:
   include:
-- env:
+- name: cl
+  env:
   - SSLLIB="openssl"
   - OPENSSL_VERSION="1.1.1d"
   - P7Z="c:\Program Files\7-Zip\7z.exe"
   - CC="cl"
   os: windows
   compiler: cl
-- env: SSLLIB="openssl" RUN_COVERITY="1"
+- name: Coverity scan
+  env: SSLLIB="openssl" RUN_COVERITY="1"
   os: linux
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u"
+- name: gcc | openssl-1.0.1u
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u"
   os: linux
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c"
+- name: gcc | openssl-1.1.1d
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
   os: linux
+  arch: amd64
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" LABEL="linux-ppc64le"
-  os: linux-ppc64le
+- name: gcc | openssl-1.1.1d
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
+  os: linux
+  arch: ppc64le
+  compiler: gcc
+- name: gcc | openssl-1.1.1d
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
+  os: linux
+  arch: arm64
+  compiler: gcc
+- name: gcc | openssl-1.1.1d
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
+  os: linux
+  arch: s390x
   compiler: gcc
-- env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2"
+- name: gcc | openssl-1.0.2u | iproute2
+  env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2"
   os: linux
   compiler: gcc
-- env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9
+- name: clang+asan | openssl-1.0.2u
+  env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9
   os: linux
   compiler: clang
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" CC=clang-9
+- name: clang | openssl-1.1.1d
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" CC=clang-9
   os: linux
   compiler: clang
-- env: SSLLIB="mbedtls"
+- name: gcc | mbedtls
+  env: SSLLIB="mbedtls"
   os: linux
   compiler: gcc
-- env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9
+- name: clang+asan | mbedtls
+  env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9
   os: linux
   compiler: clang
-- env: SSLLIB="openssl"
+- name: clang | openssl-1.0.2u
+  env: SSLLIB="openssl"
   os: osx
   compiler: clang
-- env:

[Openvpn-devel] [PATCH v3] travis-ci: add arm64, s390x builds.

2020-03-22 Thread chipitsine 
From: Ilya Shipitsin 

as described on https://docs.travis-ci.com/user/multi-cpu-architectures 
travis-ci
now supports amd64, ppcle, arm64, s390 architectures. Add arm64 and s390x.

travis-ci images were upgraded to bionic.

"sudo" is deprecated, let us remove it, also "matrix" is deprecated in favour 
of "jobs".

LD_LIBRARY_PATH was replaced by using "rpath" in LDFLAGS, which is more elegant 
way of linking.

also, dependencies were upgraded to the latest versions.

travis_wait was added for long openssl builds.

cmocka was added to linux and osx builds.
---
v3 resolved travis_wait output redirection issue, now it works as expected. I 
had to specify "names" for jobs,
without names travis puts secure variable as job name

v2 rebased against proper commit


 .travis.yml   | 87 +--
 .travis/build-check.sh| 10 +
 .travis/build-deps.sh | 10 +++--
 .travis/run-build-deps.sh | 10 -
 4 files changed, 62 insertions(+), 55 deletions(-)
 delete mode 100755 .travis/run-build-deps.sh

diff --git a/.travis.yml b/.travis.yml
index 40296d87..925d09ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
-sudo: required
-dist: xenial
+dist: bionic
 
 os: linux
 
@@ -11,86 +10,111 @@ env:
 - PREFIX="${HOME}/opt"
 - TAP_WINDOWS_VERSION=9.23.3
 - LZO_VERSION=2.10
-- PKCS11_HELPER_VERSION=1.25.1
-- MBEDTLS_VERSION=2.16.1
+- PKCS11_HELPER_VERSION=1.26
+- MBEDTLS_VERSION=2.16.4
 - MBEDTLS_CFLAGS="-I${PREFIX}/include"
 - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
-- OPENSSL_VERSION=1.0.2s
+- OPENSSL_VERSION=1.0.2u
 - OPENSSL_CFLAGS="-I${PREFIX}/include"
 - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
 # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
 #   via the "travis encrypt" command using the project repo's public key
 - secure: 
"l9mSnEW4LJqjxftH5i1NdDaYfGmQB1mPXnSB3DXnsjzkCWZ+yJLfBemfQ0tx/wS7chBYxqUaUIMT0hw4zJVp/LANFJo2vfh//ymTS6h0uApRY1ofg9Pp1BFcV1laG6/u8pwSZ2EBy/GhCd3DS436oE8sYBRaFM9FU62L/oeQBfJ7r4ID/0eB1b8bqlbD4paty9MHui2P8EZJwR+KAD84prtfpZOcrSMxPh9OUhJxzxUvvVoP4s4+lZ5Kgg1bBQ3yzKGDqe8VOgK2BWCEuezqhMMc8oeKmAe7CUkoz5gsGYH++k3I9XzP9Z4xeJKoQnC/82qi4xkJmlaOxdionej9bHIcjfRt7D8j1J0U+wOj4p8VrDy7yHaxuN2fi0K5MGa/CaXQSrkna8dePniCng+xQ2MY/zxuRX2gA6xPNLUyQLU9LqIug7wj4z84Hk9iWib4L20MoPjeEo+vAUNq8FtjOPxMuHNpv4iGGx6kgJm7RXl5vC5hxfK6MprrnYe2U5Mcd8jpzagKBaKHL3zV2FxX9k0jRO9Mccz7M2WnaV0MQ6zcngzTN4+s0kCjhfGKd2F2ANT2Gkhj3Me36eNHfuE0dBbvYCMh4b3Mgd7b/OuXwQWdJ8PjJ1WHXjSOw5sHw1suaV6cEO2Meyz5j1tOkyOi0M9QF+LFenQ9vLH4sBCww8U="
 
-matrix:
+jobs:
   include:
-- env:
+- name: cl
+  env:
   - SSLLIB="openssl"
   - OPENSSL_VERSION="1.1.1d"
   - P7Z="c:\Program Files\7-Zip\7z.exe"
   - CC="cl"
   os: windows
   compiler: cl
-- env: SSLLIB="openssl" RUN_COVERITY="1"
+- name: Coverity scan
+  env: SSLLIB="openssl" RUN_COVERITY="1"
   os: linux
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u"
+- name: gcc | openssl-1.0.1u
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u"
   os: linux
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c"
+- name: gcc | openssl-1.1.1d
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
   os: linux
+  arch: amd64
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" LABEL="linux-ppc64le"
-  os: linux-ppc64le
+- name: gcc | openssl-1.1.1d
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
+  os: linux
+  arch: ppc64le
+  compiler: gcc
+- name: gcc | openssl-1.1.1d
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
+  os: linux
+  arch: arm64
+  compiler: gcc
+- name: gcc | openssl-1.1.1d
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
+  os: linux
+  arch: s390x
   compiler: gcc
-- env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2"
+- name: gcc | openssl-1.0.2u | iproute2
+  env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2"
   os: linux
   compiler: gcc
-- env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9
+- name: clang+asan | openssl-1.0.2u
+  env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9
   os: linux
   compiler: clang
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" CC=clang-9
+- name: clang | openssl-1.1.1d
+  env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" CC=clang-9
   os: linux
   compiler: clang
-- env: SSLLIB="mbedtls"
+- name: gcc | mbedtls
+  env: SSLLIB="mbedtls"
   os: linux
   compiler: gcc
-- env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9
+- name: clang+asan | mbedtls
+  env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9
   os: linux
   compiler: clang
-- env: SSLLIB="openssl"
+- name: clang | openssl-1.0.2u
+  env: SSLLIB="openssl"
   os: osx
   compiler:

[Openvpn-devel] [PATCH v2] travis-ci: add arm64, s390x builds.

2020-02-01 Thread chipitsine 
From: Ilya Shipitsin 

as described on https://docs.travis-ci.com/user/multi-cpu-architectures 
travis-ci
now supports amd64, ppcle, arm64, s390 architectures. Add arm64 and s390x.

travis-ci images were upgraded to bionic.

"sudo" is deprecated, let us remove it, also "matrix" is deprecated in favour 
of "jobs".

LD_LIBRARY_PATH was replaced by using "rpath" in LDFLAGS, which is more elegant 
way of linking.

also, dependencies were upgraded to the latest versions.

travis_wait was added for long openssl builds.

cmocka was added to linux and osx builds.
---

v2 rebased against proper commit

 .travis.yml   | 42 +--
 .travis/build-check.sh| 10 +-
 .travis/build-deps.sh | 10 ++
 .travis/run-build-deps.sh | 10 --
 4 files changed, 30 insertions(+), 42 deletions(-)
 delete mode 100755 .travis/run-build-deps.sh

diff --git a/.travis.yml b/.travis.yml
index 40296d87..9f9db954 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
-sudo: required
-dist: xenial
+dist: bionic
 
 os: linux
 
@@ -11,18 +10,18 @@ env:
 - PREFIX="${HOME}/opt"
 - TAP_WINDOWS_VERSION=9.23.3
 - LZO_VERSION=2.10
-- PKCS11_HELPER_VERSION=1.25.1
-- MBEDTLS_VERSION=2.16.1
+- PKCS11_HELPER_VERSION=1.26
+- MBEDTLS_VERSION=2.16.4
 - MBEDTLS_CFLAGS="-I${PREFIX}/include"
 - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
-- OPENSSL_VERSION=1.0.2s
+- OPENSSL_VERSION=1.0.2u
 - OPENSSL_CFLAGS="-I${PREFIX}/include"
 - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
 # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
 #   via the "travis encrypt" command using the project repo's public key
 - secure: 
"l9mSnEW4LJqjxftH5i1NdDaYfGmQB1mPXnSB3DXnsjzkCWZ+yJLfBemfQ0tx/wS7chBYxqUaUIMT0hw4zJVp/LANFJo2vfh//ymTS6h0uApRY1ofg9Pp1BFcV1laG6/u8pwSZ2EBy/GhCd3DS436oE8sYBRaFM9FU62L/oeQBfJ7r4ID/0eB1b8bqlbD4paty9MHui2P8EZJwR+KAD84prtfpZOcrSMxPh9OUhJxzxUvvVoP4s4+lZ5Kgg1bBQ3yzKGDqe8VOgK2BWCEuezqhMMc8oeKmAe7CUkoz5gsGYH++k3I9XzP9Z4xeJKoQnC/82qi4xkJmlaOxdionej9bHIcjfRt7D8j1J0U+wOj4p8VrDy7yHaxuN2fi0K5MGa/CaXQSrkna8dePniCng+xQ2MY/zxuRX2gA6xPNLUyQLU9LqIug7wj4z84Hk9iWib4L20MoPjeEo+vAUNq8FtjOPxMuHNpv4iGGx6kgJm7RXl5vC5hxfK6MprrnYe2U5Mcd8jpzagKBaKHL3zV2FxX9k0jRO9Mccz7M2WnaV0MQ6zcngzTN4+s0kCjhfGKd2F2ANT2Gkhj3Me36eNHfuE0dBbvYCMh4b3Mgd7b/OuXwQWdJ8PjJ1WHXjSOw5sHw1suaV6cEO2Meyz5j1tOkyOi0M9QF+LFenQ9vLH4sBCww8U="
 
-matrix:
+jobs:
   include:
 - env:
   - SSLLIB="openssl"
@@ -37,11 +36,21 @@ matrix:
 - env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u"
   os: linux
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c"
+- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
   os: linux
+  arch: amd64
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" LABEL="linux-ppc64le"
-  os: linux-ppc64le
+- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
+  os: linux
+  arch: ppc64le
+  compiler: gcc
+- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
+  os: linux
+  arch: arm64
+  compiler: gcc
+- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
+  os: linux
+  arch: s390x
   compiler: gcc
 - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2"
   os: linux
@@ -49,7 +58,7 @@ matrix:
 - env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9
   os: linux
   compiler: clang
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" CC=clang-9
+- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" CC=clang-9
   os: linux
   compiler: clang
 - env: SSLLIB="mbedtls"
@@ -67,7 +76,7 @@ matrix:
 - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u"
   os: linux
   compiler: ": Win64 build only"
-- env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.1c"
+- env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.1d"
   os: linux
   compiler: ": Win64 build only"
 - env: SSLLIB="openssl" CHOST=i686-w64-mingw32
@@ -82,15 +91,11 @@ matrix:
 
 addons:
   apt:
-sources:
-  - ubuntu-toolchain-r-test
-  - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 
main'
-key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
 update: true
-packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, 
man2html, mingw-w64 ]
+packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, 
man2html, mingw-w64, clang-9, libcmocka-dev ]
   homebrew:
 update: true
-packages: [ lzo ]
+packages: [ lzo, lz4, cmocka ]
 
 cache:
   directories:
@@ -99,9 +104,8 @@ cache:
   - ${HOME}/Library/Caches/Homebrew
 
 install:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_CPU_ARCH" != "ppc64le" ]; 
then sudo apt-get install clang-9; fi
   - if [ ! -z "${CHOST}" ]; then unset CC; fi
-  - .travis/run-build-deps.sh
+  - travis_wait 30 .travis/build-deps.sh >

[Openvpn-devel] [PATCH] travis-ci: add arm64, s390x builds.

2020-02-01 Thread chipitsine 
From: Ilya Shipitsin 

as described on https://docs.travis-ci.com/user/multi-cpu-architectures 
travis-ci
now supports amd64, ppcle, arm64, s390 architectures. Add arm64 and s390x.

"sudo" is deprecated, let us remove it, also "matrix" is deprecated in favour 
of "jobs".

LD_LIBRARY_PATH was replaced by using "rpath" in LDFLAGS, which is more elegant 
way of linking.

also, dependencies were upgraded to the latest versions.

travis_wait was added for long openssl builds.

https://docs.travis-ci.com/user/multi-cpu-architectures
---
 .travis.yml   | 24 ++--
 .travis/build-check.sh| 10 +-
 .travis/build-deps.sh | 10 ++
 .travis/run-build-deps.sh | 10 --
 4 files changed, 17 insertions(+), 37 deletions(-)
 delete mode 100755 .travis/run-build-deps.sh

diff --git a/.travis.yml b/.travis.yml
index 057fbb91..9f9db954 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
-sudo: required
-dist: xenial
+dist: bionic
 
 os: linux
 
@@ -10,9 +9,9 @@ env:
 - JOBS=3
 - PREFIX="${HOME}/opt"
 - TAP_WINDOWS_VERSION=9.23.3
-- LZO_VERSION=2.11
-- PKCS11_HELPER_VERSION=1.25.1
-- MBEDTLS_VERSION=2.16.1
+- LZO_VERSION=2.10
+- PKCS11_HELPER_VERSION=1.26
+- MBEDTLS_VERSION=2.16.4
 - MBEDTLS_CFLAGS="-I${PREFIX}/include"
 - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
 - OPENSSL_VERSION=1.0.2u
@@ -22,7 +21,7 @@ env:
 #   via the "travis encrypt" command using the project repo's public key
 - secure: 
"l9mSnEW4LJqjxftH5i1NdDaYfGmQB1mPXnSB3DXnsjzkCWZ+yJLfBemfQ0tx/wS7chBYxqUaUIMT0hw4zJVp/LANFJo2vfh//ymTS6h0uApRY1ofg9Pp1BFcV1laG6/u8pwSZ2EBy/GhCd3DS436oE8sYBRaFM9FU62L/oeQBfJ7r4ID/0eB1b8bqlbD4paty9MHui2P8EZJwR+KAD84prtfpZOcrSMxPh9OUhJxzxUvvVoP4s4+lZ5Kgg1bBQ3yzKGDqe8VOgK2BWCEuezqhMMc8oeKmAe7CUkoz5gsGYH++k3I9XzP9Z4xeJKoQnC/82qi4xkJmlaOxdionej9bHIcjfRt7D8j1J0U+wOj4p8VrDy7yHaxuN2fi0K5MGa/CaXQSrkna8dePniCng+xQ2MY/zxuRX2gA6xPNLUyQLU9LqIug7wj4z84Hk9iWib4L20MoPjeEo+vAUNq8FtjOPxMuHNpv4iGGx6kgJm7RXl5vC5hxfK6MprrnYe2U5Mcd8jpzagKBaKHL3zV2FxX9k0jRO9Mccz7M2WnaV0MQ6zcngzTN4+s0kCjhfGKd2F2ANT2Gkhj3Me36eNHfuE0dBbvYCMh4b3Mgd7b/OuXwQWdJ8PjJ1WHXjSOw5sHw1suaV6cEO2Meyz5j1tOkyOi0M9QF+LFenQ9vLH4sBCww8U="
 
-matrix:
+jobs:
   include:
 - env:
   - SSLLIB="openssl"
@@ -39,12 +38,13 @@ matrix:
   compiler: gcc
 - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
   os: linux
+  arch: amd64
   compiler: gcc
 - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
   os: linux
   arch: ppc64le
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" 
+- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
   os: linux
   arch: arm64
   compiler: gcc
@@ -91,15 +91,11 @@ matrix:
 
 addons:
   apt:
-sources:
-  - ubuntu-toolchain-r-test
-  - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 
main'
-key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
 update: true
-packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, 
man2html, mingw-w64, clang-9 ]
+packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, 
man2html, mingw-w64, clang-9, libcmocka-dev ]
   homebrew:
 update: true
-packages: [ lzo ]
+packages: [ lzo, lz4, cmocka ]
 
 cache:
   directories:
@@ -109,7 +105,7 @@ cache:
 
 install:
   - if [ ! -z "${CHOST}" ]; then unset CC; fi
-  - .travis/run-build-deps.sh
+  - travis_wait 30 .travis/build-deps.sh > build-deps.log 2>&1 || (cat 
build-deps.log && exit 1)
 
 before_script:
   - .travis/coverity.sh
diff --git a/.travis/build-check.sh b/.travis/build-check.sh
index f794704c..4e1b7243 100755
--- a/.travis/build-check.sh
+++ b/.travis/build-check.sh
@@ -6,14 +6,6 @@ if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
MSBuild.exe openvpn.sln //p:Platform=x64 && exit 0
 fi
 
-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
 
 if [ -z ${CHOST+x} ]; then
@@ -21,7 +13,7 @@ if [ -z ${CHOST+x} ]; then
export EXTRA_CONFIG="${EXTRA_CONFIG:-} --enable-werror"
fi
./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG:-} || (cat 
config.log && exit 1)
-   make -j$JOBS
+   make LDFLAGS="-Wl,-rpath,${PREFIX}/lib" -j$JOBS
src/openvpn/openvpn --version || true
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
ldd src/openvpn/openvpn;
diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
index 4c5cb05e..0c8d69b8 100755
--- a/.travis/build-deps.sh
+++ b/.travis/build-deps.sh
@@ -44,17 +44,19 @@ build_lzo () {
 }
 
 download_pkcs11_helper () {
-if [ ! -f "pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2" ]; then
+if [ ! -f "pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz" ]; then
 wget -P download-cache/

[Openvpn-devel] [PATCH 1/2] travis-ci: fix osx builds

2019-06-28 Thread chipitsine 
From: Ilya Shipitsin 

cached homebrew required update, so lzo was not installed.
enforce updating homebrew

Signed-off-by: Ilya Shipitsin 
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a8ec3a18..7a074d34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,6 +78,7 @@ addons:
 update: true
 packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, 
man2html, mingw-w64]
   homebrew:
+update: true
 packages: [ lzo ]
 
 cache:
-- 
2.20.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH 0/2] travis-ci osx fix and components update

2019-06-28 Thread chipitsine 
From: Ilya Shipitsin 

enabled homebrew update that fixes osx builds.
update components to the most recent versions

Ilya Shipitsin (2):
  travis-ci: fix osx builds
  travis-ci: update components versions

 .travis.yml | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

-- 
2.20.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH 2/2] travis-ci: update components versions

2019-06-28 Thread chipitsine 
From: Ilya Shipitsin 

tap windows, pkcs11 helper, mbedtls, openssl were updated to the most recent 
versions

Signed-off-by: Ilya Shipitsin 
---
 .travis.yml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7a074d34..2d07cdc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,13 @@ env:
   global:
 - JOBS=3
 - PREFIX="${HOME}/opt"
-- TAP_WINDOWS_VERSION=9.21.2
+- TAP_WINDOWS_VERSION=9.23.3
 - LZO_VERSION=2.10
-- PKCS11_HELPER_VERSION=1.22
-- MBEDTLS_VERSION="2.8.0"
+- PKCS11_HELPER_VERSION=1.25.1
+- MBEDTLS_VERSION=2.16.1
 - MBEDTLS_CFLAGS="-I${PREFIX}/include"
 - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
-- OPENSSL_VERSION="1.0.2o"
+- OPENSSL_VERSION=1.0.2s
 - OPENSSL_CFLAGS="-I${PREFIX}/include"
 - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
 # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
@@ -30,10 +30,10 @@ matrix:
 - env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u"
   os: linux
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
+- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c"
   os: linux
   compiler: gcc
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h" LABEL="linux-ppc64le"
+- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" LABEL="linux-ppc64le"
   os: linux-ppc64le
   compiler: gcc
 - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2"
@@ -42,7 +42,7 @@ matrix:
 - env: SSLLIB="openssl" CFLAGS="-fsanitize=address"
   os: linux
   compiler: clang
-- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
+- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c"
   os: linux
   compiler: clang
 - env: SSLLIB="mbedtls"
@@ -60,7 +60,7 @@ matrix:
 - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u"
   os: linux
   compiler: ": Win64 build only"
-- env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.0h"
+- env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.1c"
   os: linux
   compiler: ": Win64 build only"
 - env: SSLLIB="openssl" CHOST=i686-w64-mingw32
-- 
2.20.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH 1/1] initial cirrus-ci support

2019-04-11 Thread chipitsine 
From: Ilya Shipitsin 

enabled FreeBSD 12.0 builds

Signed-off-by: Ilya Shipitsin 
---
 .cirrus.yml | 24 
 1 file changed, 24 insertions(+)
 create mode 100644 .cirrus.yml

diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index ..955b8de0
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,24 @@
+FreeBSD_task:
+  freebsd_instance:
+image: freebsd-12-0-release-amd64
+  env:
+ASSUME_ALWAYS_YES: TRUE # required for unattended "pkg" invocation
+LZO_CFLAGS: '-I/usr/local/include'
+LZO_LIBS: '-llzo2 -L/usr/local/lib'
+LZ4_CFLAGS: '-I/usr/local/include'
+LZ4_LIBS: '-llz4 -L/usr/local/lib'
+MBEDTLS_CFLAGS: '-I/usr/local/include'
+MBEDTLS_LIBS: '-lmbedtls -lmbedx509 -lmbedcrypto -L/usr/local/lib'
+matrix:
+  - SSLLIB: openssl
+  - SSLLIB: mbedtls
+  install_script:
+- pkg install cmake gmake openssl111 mbedtls git autoconf automake libtool
+- git submodule update --init --recursive
+  script:
+- autoreconf -iv
+- ./configure --with-crypto-library=${SSLLIB}
+- make
+- src/openvpn/openvpn --version || true
+- ldd src/openvpn/openvpn
+- make check
-- 
2.20.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH 0/1] cirrus-ci support

2019-04-11 Thread chipitsine 
From: Ilya Shipitsin 

Added initial support for FreeBSD builds

Ilya Shipitsin (1):
  initial cirrus-ci support

 .cirrus.yml | 24 
 1 file changed, 24 insertions(+)
 create mode 100644 .cirrus.yml

-- 
2.20.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH 0/1] fix unit tests build when LZO installed to custom folder

2019-04-11 Thread chipitsine 
From: Ilya Shipitsin 

Under FreeBSD default folder is /usr/local/lib, all 3rd parties software is 
installed
to it. I added LZO directories to unit tests search path

Ilya Shipitsin (1):
  configure.ac: fix compile-time error in argv_testdriver

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH 1/1] configure.ac: fix compile-time error in argv_testdriver

2019-04-11 Thread chipitsine 
From: Ilya Shipitsin 

allow run tests when lzo is installed to non default directory
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index dfb268ca..bcc74c32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1360,8 +1360,8 @@ AC_SUBST([VENDOR_SRC_ROOT])
 AC_SUBST([VENDOR_BUILD_ROOT])
 AC_SUBST([VENDOR_DIST_ROOT])
 
-TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_LIBS} -lcmocka 
-L\$(abs_top_builddir)/vendor/dist/lib 
-Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib"
-TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_CFLAGS} 
-I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include"
+TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_LIBS} 
${OPTIONAL_LZO_LIBS} -lcmocka -L\$(abs_top_builddir)/vendor/dist/lib 
-Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib"
+TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_CFLAGS} 
${OPTIONAL_LZO_CFLAGS} -I\$(top_srcdir)/include 
-I\$(abs_top_builddir)/vendor/dist/include"
 
 AC_SUBST([TEST_LDFLAGS])
 AC_SUBST([TEST_CFLAGS])
-- 
2.20.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH 2/3] travis-ci: change trusty image to xenial

2019-03-11 Thread chipitsine 
From: Ilya Shipitsin 

Ubuntu Trusty reaches End of Life on April 30, 2019
Let us switch to xenial. Also, it simplifies mingw builds.
We do not need to add xenial mingw manually anymore

Signed-off-by: Ilya Shipitsin 
---
 .travis.yml   | 9 ++---
 .travis/build-deps.sh | 9 -
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 428131ec..bf46b14c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 
 os: linux
 
@@ -75,12 +75,7 @@ matrix:
 addons:
   apt:
 update: true
-packages:
-  - liblzo2-dev
-  - libpam0g-dev
-  - liblz4-dev
-  - linux-libc-dev
-  - man2html
+packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, 
man2html, mingw-w64]
 
 cache:
   directories:
diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
index 96a030cc..391b35ef 100755
--- a/.travis/build-deps.sh
+++ b/.travis/build-deps.sh
@@ -130,15 +130,6 @@ build_openssl () {
 fi
 }
 
-if [ ! -z ${CHOST+x} ]; then
-  #
-  # openvpn requires at least mingw-gcc-4.9, which is available at xenial 
repo
-  #
-  sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu xenial 
main universe"
-  sudo apt-get update
-  sudo apt-get -y install dpkg mingw-w64
-fi
-
 # Download and build crypto lib
 if [ "${SSLLIB}" = "openssl" ]; then
 download_openssl
-- 
2.20.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH 3/3] travis-ci: update osx to xcode9.4 and modernize brew management

2019-03-11 Thread chipitsine 
From: Ilya Shipitsin 

osx image used for builds, i.e. xcode7.3 is outdated, we
can switch to "default" xcode9.4 and use more fast brew
travis-ci plugin

Signed-off-by: Ilya Shipitsin 
---
 .travis.yml | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bf46b14c..e61a8d38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,11 +50,9 @@ matrix:
   compiler: clang
 - env: SSLLIB="openssl"
   os: osx
-  osx_image: xcode7.3
   compiler: clang
 - env: SSLLIB="mbedtls"
   os: osx
-  osx_image: xcode7.3
   compiler: clang
 - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u"
   os: linux
@@ -76,6 +74,8 @@ addons:
   apt:
 update: true
 packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, 
man2html, mingw-w64]
+  homebrew:
+packages: [ lzo ]
 
 cache:
   directories:
@@ -83,10 +83,6 @@ cache:
   - ${HOME}/opt
   - ${HOME}/Library/Caches/Homebrew
 
-before_install:
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update ; fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install lzo; fi
-
 install:
   - if [ ! -z "${CHOST}" ]; then unset CC; fi
   - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 
1)
-- 
2.20.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH 1/3] travis-ci: add "linux-ppc64le" to build matrix

2019-03-11 Thread chipitsine 
From: Ilya Shipitsin 

Signed-off-by: Ilya Shipitsin 
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index ede2aaa6..428131ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,9 @@ matrix:
 - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
   os: linux
   compiler: gcc
+- env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h" LABEL="linux-ppc64le"
+  os: linux-ppc64le
+  compiler: gcc
 - env: SSLLIB="openssl" CFLAGS="-fsanitize=address"
   os: linux
   compiler: clang
-- 
2.20.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] modernize travis-ci builds

2019-03-11 Thread chipitsine 
Ubuntu Trusty reaches EOL soon, so it is good time to
upgrade travis-ci machinery to use Xenial image.

Also, some improvements are made in Linux and OSX builds.




___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel