Commit 825dd544ab719b1c6c3952cc292a20643392054d

Edward Thomson 2021-09-20T12:41:13

ci: pull libssh2 from www.libssh2.org libssh2.org and www.libssh2.org were previously identical; now this is a redirect.

diff --git a/ci/docker/centos7 b/ci/docker/centos7
index 098edb2..8105f14 100644
--- a/ci/docker/centos7
+++ b/ci/docker/centos7
@@ -18,7 +18,7 @@ RUN yum install -y \
 
 FROM yum AS libssh2
 RUN cd /tmp && \
-    curl https://libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \
+    curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \
     cd libssh2-1.8.0 && \
     ./configure && \
     make && \
diff --git a/ci/docker/centos8 b/ci/docker/centos8
index f471984..cca0881 100644
--- a/ci/docker/centos8
+++ b/ci/docker/centos8
@@ -20,7 +20,7 @@ RUN yum install -y \
 
 FROM yum AS libssh2
 RUN cd /tmp && \
-    curl https://libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \
+    curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \
     cd libssh2-1.8.0 && \
     ./configure && \
     make && \
diff --git a/ci/docker/focal b/ci/docker/focal
index 1713876..37d7d63 100644
--- a/ci/docker/focal
+++ b/ci/docker/focal
@@ -49,8 +49,7 @@ RUN cd /tmp && \
 
 FROM mbedtls AS libssh2
 RUN cd /tmp && \
-    curl --insecure --location --silent --show-error https://www.libssh2.org/download/libssh2-1.9.0.tar.gz | \
-        tar -xz && \
+    curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.9.0.tar.gz | tar -xz && \
     cd libssh2-1.9.0 && \
     mkdir build build-msan && \
     cd build && \
diff --git a/ci/docker/xenial b/ci/docker/xenial
index 4c3810a..c19fe42 100644
--- a/ci/docker/xenial
+++ b/ci/docker/xenial
@@ -41,8 +41,7 @@ RUN cd /tmp && \
 
 FROM mbedtls AS libssh2
 RUN cd /tmp && \
-    curl --insecure --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | \
-    tar -xz && \
+    curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | tar -xz && \
     cd libssh2-1.8.2 && \
     CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=Libgcrypt . && \
     ninja install && \