Skip to contentSkip to conversation

travis-ci osx fix and components update

PATCH In review [email protected]... 2 participants 8 messages Jun 28, 2019 – Jul 2, 2019

lore
Share & tools
lore
#0 lore raw

cover travis-ci osx fix and components update

From: Ilya Shipitsin <[email protected]...>

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(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/2 travis-ci: fix osx builds

From: Ilya Shipitsin <[email protected]...>

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

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)
.travis.yml +1 -0
index a8ec3a18..7a074d34 100644
@@ -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:
Signature · 1 line
2.20.1
#6 lore raw

PATCH 2/2 travis-ci: update components versions

In reply to [email protected]...

From: Ilya Shipitsin <[email protected]...>

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

---
 .travis.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
.travis.yml +8 -8
index 7a074d34..2d07cdc3 100644
@@ -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
Signature · 1 line
2.20.1
Acked-by on v1 1/2
#2 lore raw

[Openvpn-devel] [PATCH applied] Re: travis-ci: fix osx builds

In reply to [email protected]...

(I have no idea what this does, specifically, but it is not a code change and if it fixes our Travis builds, I'm happy - and the explanation given says "it will fix things")

Your patch has been applied to the master branch.

commit afeb9c4f30d23082eb2c6a5a3cd93844e48a5bc7

Author: Ilya Shipitsin
Date:   Sat Jun 29 00:46:36 2019 +0500
     travis-ci: fix osx builds

     Signed-off-by: Ilya Shipitsin <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg18620.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

Acked-by on v1 2/2
#7 lore raw

[Openvpn-devel] [PATCH applied] Re: travis-ci: update components versions

In reply to [email protected]...

Seems like a good idea to move to the most current library versions (let's see what will explode :) ).

Your patch has been applied to the master branch.

commit 9f04bf189981517162d82549886f7496497b69a8

Author: Ilya Shipitsin
Date:   Sat Jun 29 00:46:37 2019 +0500
     travis-ci: update components versions

     Signed-off-by: Ilya Shipitsin <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg18619.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#3 lore raw

Re: [Openvpn-devel] [PATCH applied] Re: travis-ci: fix osx builds

In reply to Gert Doering

вт, 2 июл. 2019 г. в 12:07, Gert Doering <[email protected]...>:

Quoted 8 lines

(I have no idea what this does, specifically, but it is not a code change and if it fixes our Travis builds, I'm happy - and the explanation given says "it will fix things")

Your patch has been applied to the master branch.

should we apply to 2.4 as well ?

Quoted 21 lines

commit afeb9c4f30d23082eb2c6a5a3cd93844e48a5bc7

Author: Ilya Shipitsin
Date:   Sat Jun 29 00:46:36 2019 +0500
     travis-ci: fix osx builds

     Signed-off-by: Ilya Shipitsin <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL:
https://www.mail-archive.com/[email protected]/msg18620.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#4 lore raw

Re: [Openvpn-devel] [PATCH applied] Re: travis-ci: fix osx builds

Hi,

Quoted 11 lines · ???????? ??????????????

????, 2 ??????. 2019 ??. ?? 12:07, Gert Doering <[email protected]...>:

Quoted 7 lines

(I have no idea what this does, specifically, but it is not a code change and if it fixes our Travis builds, I'm happy - and the explanation given says "it will fix things")

Your patch has been applied to the master branch.

should we apply to 2.4 as well ?

Good point. Should have the same brokenness & needs the same fix - so here we go

commit 5e695c7786259049ea2eb4ac78101e3d7edd8280 (HEAD -> release/2.4)

Author: Ilya Shipitsin <[email protected]...>
Date:   Sat Jun 29 00:46:36 2019 +0500

travis-ci: fix osx builds

gert

Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             [email protected]...
#5 lore raw

Re: [Openvpn-devel] [PATCH applied] Re: travis-ci: fix osx builds

вт, 2 июл. 2019 г. в 12:11, Gert Doering <[email protected]...>:

Quoted 10 lines

Hi,

Quoted 6 lines · ???????? ??????????????

????, 2 ??????. 2019 ??. ?? 12:07, Gert Doering <[email protected]...>:

Quoted 4 lines

(I have no idea what this does, specifically, but it is not a code change and if it fixes our Travis builds, I'm happy - and the

explanation

Quoted 10 lines
Quoted 5 lines
Quoted 3 lines

given says "it will fix things")

Your patch has been applied to the master branch.

should we apply to 2.4 as well ?

Good point. Should have the same brokenness & needs the same fix - so here we go

thank you!

Quoted 18 lines

commit 5e695c7786259049ea2eb4ac78101e3d7edd8280 (HEAD -> release/2.4)

Author: Ilya Shipitsin <[email protected]...>
Date:   Sat Jun 29 00:46:36 2019 +0500

travis-ci: fix osx builds

gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never
doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh
Mistress

Gert Doering - Munich, Germany
[email protected]...