diff options
| -rwxr-xr-x | setup-abuild | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/setup-abuild b/setup-abuild index 46122c8..1e8af8d 100755 --- a/setup-abuild +++ b/setup-abuild @@ -5,7 +5,6 @@ DEST=/usr/local; git config --global http.sslCAInfo "${CURL_CA_BUNDLE}"; - mkdir -p "${DEST}"; cd "${DEST}"; # this directory will already exist if correct @@ -20,7 +19,7 @@ vmus=1.2.3; test ! -f ._${nmus}-${vmus} && \ ( test ! -d ${nmus}-${vmus} \ - && curl -s https://musl.libc.org/releases/${nmus}-${vmus}.tar.gz \ + && curl -sL https://musl.libc.org/releases/${nmus}-${vmus}.tar.gz \ | tar -xzf - \ ; cd ${nmus}-${vmus}; @@ -41,11 +40,14 @@ rm -fr ${nmus}-${vmus}; # OpenSSL # nssl=openssl; -vssl=1.1.1v; +#vssl=1.1.1v; +vssl=1.1.1w; test ! -f ._${nssl}-${vssl} && \ ( +#https://www.openssl.org/source/${nssl}-${vssl}.tar.gz +temp=https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz; test ! -d ${nssl}-${vssl} \ - && curl -s https://www.openssl.org/source/${nssl}-${vssl}.tar.gz \ + && curl -sL ${temp} \ | tar -xzf - \ ; cd ${nssl}-${vssl}; @@ -66,11 +68,11 @@ rm -fr ${nssl}-${vssl}; # zlib # nzlb=zlib; -vzlb=1.3; +vzlb=1.3.1; test ! -f ._${nzlb}-${vzlb} && \ ( test ! -d ${nzlb}-${vzlb} \ - && curl -s https://www.zlib.net/${nzlb}-${vzlb}.tar.gz \ + && curl -sL https://www.zlib.net/${nzlb}-${vzlb}.tar.gz \ | tar -xzf - \ ; cd ${nzlb}-${vzlb}; @@ -98,7 +100,7 @@ test ! -f ._${nbld}-${vbld} && \ ; cd abuild-${vbld}; git checkout ${vbld}; - while read k; do curl -s ${k} | patch -p1 || true; done <<EOF + while read k; do curl -sL ${k} | patch -p1 || true; done <<EOF http://ix.io/4ifN https://git.alpinelinux.org/abuild/patch/abuild.in?id=f263cb9f49f3861f3141c22a74360b06cec7b868 EOF @@ -212,7 +214,7 @@ rm -fr ${nsam}-${vsam}; # muon (meson replacement) # nmun=muon; -vmun=34953adc6bd14851fe6fa5f5d469f7ef28ee3b32; +vmun=834460da03dd4a0c5b4570ca905780ce191c2443; test ! -f ._${nmun}-${vmun} && ( test ! -d ${nmun}-${vmun} \ @@ -229,9 +231,6 @@ test ! -f ._${nmun}-${vmun} && -Dstatic=true \ build \ ; - sed -i build/build.ninja \ - -e "s@\bar\b@${AR}@g" \ - ; samu -C build; cp build/muon "${DEST}/bin"; ) @@ -246,7 +245,7 @@ rm -fr ${nmun}-${vmun}; # Also, '-j' will break the build. # natl=apk-tools; -vatl=be4ce40797af9056c79be4dc74ff978f1f4957e4; +vatl=3bf28d03a025f7cd7fc174af4102405090dba24c; test ! -f ._${natl}-${vatl} && \ ( test ! -d ${natl}-${vatl} \ @@ -270,6 +269,7 @@ test ! -f ._${natl}-${vatl} && \ ; # hardcoded ln -sf ../portability/strlcpy.c src/strlcpy.c; export LUA=no; # documentation requires lua + export ZSTD=no; # d7fb939a68cb20c0398753379a17fc165b3c892a make clean; make \ INSTALLDIR="${DEST}" \ @@ -318,7 +318,7 @@ test ! -f ._${nfrt}-${vfrt} && \ ; cd ${nfrt}-${vfrt}; git checkout ${vfrt}; - while read k; do curl -s ${k} | patch -p1 || true; done <<EOF + while read k; do curl -sL ${k} | patch -p1 || true; done <<EOF https://git.alpinelinux.org/aports/plain/main/fakeroot/do-not-redefine-id_t.patch?id=bb497eeb2155d0332284942105692bc05fec25a9 https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=bb497eeb2155d0332284942105692bc05fec25a9 https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-stdint.patch?id=bb497eeb2155d0332284942105692bc05fec25a9 |