From 7a1c61536ea20bb5f12f47a183c638e4482885cf Mon Sep 17 00:00:00 2001 From: mayeut Date: Mon, 5 Apr 2021 14:09:15 +0200 Subject: [PATCH] =?UTF-8?q?chore:=20update=20curl=207.52.1=20=E2=86=92=207?= =?UTF-8?q?.76.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit changelog: https://curl.se/changes.html#7_76_0 --- imagefiles/build-and-install-curl.sh | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/imagefiles/build-and-install-curl.sh b/imagefiles/build-and-install-curl.sh index 27e3778..cd0393d 100755 --- a/imagefiles/build-and-install-curl.sh +++ b/imagefiles/build-and-install-curl.sh @@ -10,12 +10,9 @@ source $MY_DIR/utils.sh # copied from https://github.com/pypa/manylinux/tree/master/docker/build_scripts # -CURL_ROOT=curl_7.52.1 -CURL_HASH=a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae - -# We had to switch to a debian mirror because we can't use TLS until we -# bootstrap it with this curl + openssl -CURL_DOWNLOAD_URL=http://deb.debian.org/debian/pool/main/c/curl +CURL_ROOT=curl-7.76.0 +CURL_HASH=3b4378156ba09e224008e81dcce854b7ce4d182b1f9cfb97fe5ed9e9c18c6bd3 +CURL_DOWNLOAD_URL=https://curl.haxx.se/download function do_curl_build { # We do this shared to avoid obnoxious linker issues where git couldn't @@ -32,12 +29,11 @@ function build_curl { local curl_sha256=$2 check_var ${curl_sha256} check_var ${CURL_DOWNLOAD_URL} - # Can't use curl here because we don't have it yet...we are building it. - wget -q ${CURL_DOWNLOAD_URL}/${curl_fname}.orig.tar.gz - check_sha256sum ${curl_fname}.orig.tar.gz ${curl_sha256} - tar -zxf ${curl_fname}.orig.tar.gz - (cd curl-* && do_curl_build) - rm -rf curl_* + curl -fsSLO ${CURL_DOWNLOAD_URL}/${curl_fname}.tar.gz + check_sha256sum ${curl_fname}.tar.gz ${curl_sha256} + tar -zxf ${curl_fname}.tar.gz + (cd curl-*/ && do_curl_build) + rm -rf curl-* } cd /usr/src