Skip to contentSkip to conversation

travis-ci: added gcc and clang openssl-1.1.0 builds

PATCH In review Ilya Shipitsin 3 participants 5 messages Jun 19, 2017 – Jun 27, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 travis-ci: added gcc and clang openssl-1.1.0 builds

openssl build script was modified according to official openssl manual:
https://wiki.openssl.org/index.php/Compilation_and_Installation

---
 .travis.yml           | 6 ++++++
 .travis/build-deps.sh | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)
.travis.yml +6 -0
index bb44222..db90e03 100644
@@ -27,9 +27,15 @@ matrix:
     - env: SSLLIB="openssl"
       os: linux
       compiler: gcc
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
+      os: linux
+      compiler: gcc
     - env: SSLLIB="openssl"
       os: linux
       compiler: clang
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
+      os: linux
+      compiler: clang
     - env: SSLLIB="mbedtls"
       os: linux
       compiler: gcc
.travis/build-deps.sh +3 -3
index c5c1188..9cc1858 100755
@@ -82,7 +82,7 @@ download_openssl () {
 build_openssl_linux () {
     (
         cd "openssl-${OPENSSL_VERSION}/"
-        ./config shared --openssldir="${PREFIX}" -DPURIFY
+        ./config shared --prefix="${PREFIX}" --openssldir="${PREFIX}" -DPURIFY
         make all install_sw
     )
 }
@@ -91,7 +91,7 @@ build_openssl_osx () {
     (
         cd "openssl-${OPENSSL_VERSION}/"
         ./Configure darwin64-x86_64-cc shared \
-            --openssldir="${PREFIX}" -DPURIFY
+            --prefix="${PREFIX}" --openssldir="${PREFIX}" -DPURIFY
         make depend all install_sw
     )
 }
@@ -107,7 +107,7 @@ build_openssl_mingw () {
         fi
 
         ./Configure --cross-compile-prefix=${CHOST}- shared \
-           ${TARGET} no-multilib no-capieng --openssldir="${PREFIX}" -static-libgcc
+           ${TARGET} no-multilib no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
         make install
     )
 }
Signature · 1 line
2.5.5
#1 lore raw

Hi,

Quoted 51 lines · Ilya Shipitsin

openssl build script was modified according to official openssl manual:
https://wiki.openssl.org/index.php/Compilation_and_Installation

---
 .travis.yml           | 6 ++++++
 .travis/build-deps.sh | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)
.travis.yml +6 -0
index bb44222..db90e03 100644
@@ -27,9 +27,15 @@ matrix:
     - env: SSLLIB="openssl"
       os: linux
       compiler: gcc
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
+      os: linux
+      compiler: gcc
     - env: SSLLIB="openssl"
       os: linux
       compiler: clang
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
+      os: linux
+      compiler: clang
     - env: SSLLIB="mbedtls"
       os: linux
       compiler: gcc
.travis/build-deps.sh +2 -2
index c5c1188..9cc1858 100755
@@ -82,7 +82,7 @@ download_openssl () {
 build_openssl_linux () {
     (
         cd "openssl-${OPENSSL_VERSION}/"
-        ./config shared --openssldir="${PREFIX}" -DPURIFY
+        ./config shared --prefix="${PREFIX}" --openssldir="${PREFIX}" -DPURIFY
         make all install_sw
     )
 }
@@ -91,7 +91,7 @@ build_openssl_osx () {
     (
         cd "openssl-${OPENSSL_VERSION}/"
         ./Configure darwin64-x86_64-cc shared \
-            --openssldir="${PREFIX}" -DPURIFY
+            --prefix="${PREFIX}" --openssldir="${PREFIX}" -DPURIFY
         make depend all install_sw
     )
 }

.travis/build-deps.sh build_openssl_mingw () { · line 113

Quoted 8 lines
.travis/build-deps.sh +1 -1
@@ -107,7 +107,7 @@ build_openssl_mingw () {
         fi
 
         ./Configure --cross-compile-prefix=${CHOST}- shared \
-           ${TARGET} no-multilib no-capieng --openssldir="${PREFIX}" -static-libgcc
+           ${TARGET} no-multilib no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
         make install
     )
 }

Good idea, good patch. ACK.

-Steffan

#2 lore raw
In reply to Ilya Shipitsin

Your patch has been applied to the master branch.

I tried to apply it to release/2.4 as well, but it seems some prior patch to the .travis/ stuff never made it, so this patch does not apply.

As I'm a bit lazy today - could you backport all the travis stuff that is missing from 2.4 to release/2.4 and send a patch for that? thanks :)

commit aeac1139a34321a7f770ca20bfef886a21a89fe9 (master)

Author: Ilya Shipitsin
Date:   Mon Jun 19 23:38:08 2017 +0500
     travis-ci: added gcc and clang openssl-1.1.0 builds

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

--
kind regards,

Gert Doering

#3 lore raw

The following have to be cherry-picked (just tested, works without fuzz):

56e6bd8967d72c4374389dfd5cf32f5e3b86242c
81ba70b39b78d7677aabab957421264800028f53
aeac1139a34321a7f770ca20bfef886a21a89fe9

-Steffan

Quoted 34 lines · Gert Doering

Your patch has been applied to the master branch.

I tried to apply it to release/2.4 as well, but it seems some prior patch to the .travis/ stuff never made it, so this patch does not apply.

As I'm a bit lazy today - could you backport all the travis stuff that is missing from 2.4 to release/2.4 and send a patch for that? thanks :)

commit aeac1139a34321a7f770ca20bfef886a21a89fe9 (master)

Author: Ilya Shipitsin
Date:   Mon Jun 19 23:38:08 2017 +0500
     travis-ci: added gcc and clang openssl-1.1.0 builds

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

--
kind regards,

Gert Doering

------------------------------------------------------------------------------
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 [email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

#4 lore raw

Hi,

Quoted 5 lines · Steffan Karger

The following have to be cherry-picked (just tested, works without fuzz):

56e6bd8967d72c4374389dfd5cf32f5e3b86242c
81ba70b39b78d7677aabab957421264800028f53
aeac1139a34321a7f770ca20bfef886a21a89fe9

I have done this, and squashed them into a single commit for simplicity (but keeping the original URL and Message-IDs).

commit 5852a035b444a41140a7fc7007b7df718a2e6c43 (HEAD -> release/2.4)

Author: Ilya Shipitsin <[email protected]...>
Date:   Sat Feb 25 23:00:04 2017 +0500

travis-ci: add 3 missing patches from master to release/2.4

"Testing infrastructure only, no code changes"

gert

Signature · 4 lines
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]...