Merge pull request #3092 from vmihalis/https-config-fetch

build: fetch config.guess/config.sub over HTTPS
(cherry picked from commit a70de97aab893f73c2e63c45dfc1210437dad487)

diff --git a/build/makerelease.sh b/build/makerelease.sh
index 82843d6773095cd089edd29ec1d0b285f2608f33..142056d84bd5b142476aed91092bdec7a956b14f 100755 (executable)
--- a/build/makerelease.sh
+++ b/build/makerelease.sh
@@ -50,8 +50,8 @@ export MAKE_LIBARCHIVE_RELEASE="1"
 /bin/sh build/autogen.sh
 
 # Get the newest config.guess/config.sub from savannah.gnu.org
-curl 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' > build/autoconf/config.guess
-curl 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' > build/autoconf/config.sub
+curl -fsSL 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' > build/autoconf/config.guess
+curl -fsSL 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' > build/autoconf/config.sub
 
 ./configure
 make distcheck

diff --git a/build/release/Dockerfile b/build/release/Dockerfile
index 619b67f4b626cec1527d81d6366bd030aac91698..96d33e0c4156aa26fb5927067d72d9fd433dc171 100644 (file)
--- a/build/release/Dockerfile
+++ b/build/release/Dockerfile
@@ -3,8 +3,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 RUN apt-get update && apt-get install -y build-essential autoconf automake libtool pkg-config cmake zlib1g-dev libssl-dev libacl1-dev libbz2-dev liblzma-dev liblz4-dev libzstd-dev lzop groff ghostscript bsdmainutils zip
 ADD . $HOME/libarchive/
-ADD "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" $HOME/libarchive/build/autoconf/config.guess
-ADD "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" $HOME/libarchive/build/autoconf/config.sub
+ADD "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" $HOME/libarchive/build/autoconf/config.guess
+ADD "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" $HOME/libarchive/build/autoconf/config.sub
 WORKDIR $HOME/libarchive
 RUN /bin/sh build/clean.sh
 RUN /bin/sh build/autogen.sh