[Openvpn-devel] Fetch OpenSSL versions via source/old links

Message ID 20200401124019.10529-1-arne@rfc2549.org
State Accepted
Headers show
Series
  • [Openvpn-devel] Fetch OpenSSL versions via source/old links
Related show

Commit Message

Arne Schwabe April 1, 2020, 12:40 p.m.
New versions are already available as source/old but old version at
some point disappear from the normal download path. Use the source/old
path for all OpenSSL versions to avoid this problem.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 .travis/build-deps.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Lev Stipakov April 1, 2020, 12:51 p.m. | #1
Patch applies, travis builds are fixed now.

There is a line with 4 whitespaces under "download_openssl" line, but
that can be fixed by committer.

Acked-by: Lev Stipakov <lstipakov@gmail.com>
Gert Doering April 1, 2020, 12:54 p.m. | #2
Your patch has been applied to the master branch.

(Removing the spurious extra new line, as requested by Lev)

commit 3e0e169254427c4fdcd667e23b110fb939f9fbde (master)
commit 22df79bb3ba3a5ecce964df223288e99f39e5a12 (release/2.4)
Author: Arne Schwabe
Date:   Wed Apr 1 14:40:19 2020 +0200

     Fetch OpenSSL versions via source/old links

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Lev Stipakov <lstipakov@gmail.com>
     Message-Id: <20200401124019.10529-1-arne@rfc2549.org>
     URL: https://www.mail-archive.com/search?l=mid&q=20200401124019.10529-1-arne@rfc2549.org
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
index 0c8d69b8..e8a1f101 100755
--- a/.travis/build-deps.sh
+++ b/.travis/build-deps.sh
@@ -90,9 +90,11 @@  build_mbedtls () {
 }
 
 download_openssl () {
+    
     if [ ! -f "download-cache/openssl-${OPENSSL_VERSION}.tar.gz" ]; then
+        MAJOR=`echo $OPENSSL_VERSION | sed -e 's/\([0-9.]*\).*/\1/'`
         wget -P download-cache/ \
-            "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz"
+             "https://www.openssl.org/source/old/${MAJOR}/openssl-${OPENSSL_VERSION}.tar.gz"
     fi
 }