From 5d51173eef17b796741781d292f4bf3c73ac6bee Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Fri, 1 Nov 2024 17:25:05 +0800 Subject: [PATCH 1/9] debian7/Dockerfile: install ca-certificates Also, perform cleanup after `apt-get`. --- debian7/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian7/Dockerfile b/debian7/Dockerfile index d947fe5..f51df21 100644 --- a/debian7/Dockerfile +++ b/debian7/Dockerfile @@ -2,7 +2,8 @@ FROM debian/eol:wheezy ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update \ - && apt-get install -y build-essential bzip2 libz-dev texinfo wget + && apt-get install -y build-essential bzip2 ca-certificates libz-dev texinfo wget \ + && rm -rf /var/lib/apt/lists/* RUN useradd --create-home --shell /bin/bash linuxbrew From 4e4c3ee473636ed5ae44355ea5fd378785b3cc26 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Sun, 27 Oct 2024 23:26:58 +0800 Subject: [PATCH 2/9] utils.sh: fix incompatibility with CentOS 7 coreutils Fixes: tar: .: Cannot rmdir: Invalid argument tar: Exiting with failure status due to previous errors --- utils.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/utils.sh b/utils.sh index 94313dd..4a19768 100755 --- a/utils.sh +++ b/utils.sh @@ -3,20 +3,20 @@ set -e verify_checksum() { - FILE=$1 - EXPECTED_CHECKSUM=$2 - FILE_CHECKSUM=$(sha256sum ${FILE} | cut -d ' ' -f 1) + FILE="$1" + EXPECTED_CHECKSUM="$2" + FILE_CHECKSUM="$(sha256sum "${FILE}" | cut -d ' ' -f 1)" - if [[ $FILE_CHECKSUM != $EXPECTED_CHECKSUM ]]; then + if [[ "$FILE_CHECKSUM" != "$EXPECTED_CHECKSUM" ]]; then echo "Checksum mismatch!" return 1 fi } package() { - PKGNAME=$1 - VERSION=$2 + PKGNAME="$1" + VERSION="$2" - cd $PREFIX - tar --remove-files --create --gzip --file $PKGDIR/bootstrap-$PKGNAME-$VERSION.tar.gz . + tar -C "$PREFIX" -czvf "$PKGDIR/bootstrap-$PKGNAME-$VERSION.tar.gz" . + find "$PREFIX" -mindepth 1 -delete } From 22cbbe4c788ba4745373361a9d2b6da4357c966a Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Sun, 27 Oct 2024 23:27:29 +0800 Subject: [PATCH 3/9] build-binutils.sh: bump to 2.43.1 --- build-binutils.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-binutils.sh b/build-binutils.sh index 3164bcb..cba18ca 100755 --- a/build-binutils.sh +++ b/build-binutils.sh @@ -3,8 +3,8 @@ set -e source "$(dirname "${BASH_SOURCE[0]}")/utils.sh" -VERSION=2.38 -SHA256SUM=e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024 +VERSION=2.43.1 +SHA256SUM=13f74202a3c4c51118b797a39ea4200d3f6cfbe224da6d1d95bb938480132dfd # Build binutils wget --no-check-certificate https://ftp.gnu.org/gnu/binutils/binutils-$VERSION.tar.xz @@ -20,6 +20,7 @@ cd binutils-$VERSION --enable-multilib \ --enable-64-bit-bfd \ --enable-targets=all \ + --disable-gprofng \ --disable-nls make From e32ced1812cf83d657280ebb94b02d6fd721ecf2 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Sun, 27 Oct 2024 23:27:38 +0800 Subject: [PATCH 4/9] build-gawk.sh: bump to 5.3.1 --- build-gawk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-gawk.sh b/build-gawk.sh index cb6d2a2..9f0914f 100755 --- a/build-gawk.sh +++ b/build-gawk.sh @@ -3,8 +3,8 @@ set -e source "$(dirname "${BASH_SOURCE[0]}")/utils.sh" -VERSION=5.1.1 -SHA256SUM=d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2 +VERSION=5.3.1 +SHA256SUM=694db764812a6236423d4ff40ceb7b6c4c441301b72ad502bb5c27e00cd56f78 # Build gawk wget --no-check-certificate https://ftp.gnu.org/gnu/gawk/gawk-$VERSION.tar.xz From 6b2fd1f4aec9d504cce93996d594284219c479bd Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Fri, 1 Nov 2024 17:41:25 +0800 Subject: [PATCH 5/9] build-gcc.sh: fix an unused variable --- build-gcc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-gcc.sh b/build-gcc.sh index 347fb06..9a7cd82 100755 --- a/build-gcc.sh +++ b/build-gcc.sh @@ -17,7 +17,7 @@ cd gcc-$VERSION ./contrib/download_prerequisites # Disable building documentation -gcc_cv_prog_makeinfo_modern=no +export gcc_cv_prog_makeinfo_modern=no mkdir build cd build From 0d048a12a0b8cc40c567c863c2f6d185958d70d5 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Sun, 27 Oct 2024 23:27:59 +0800 Subject: [PATCH 6/9] build-make.sh: bump to 4.4.1 --- build-make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-make.sh b/build-make.sh index 34ac5b4..3e5bf53 100755 --- a/build-make.sh +++ b/build-make.sh @@ -3,8 +3,8 @@ set -e source "$(dirname "${BASH_SOURCE[0]}")/utils.sh" -VERSION=4.3 -SHA256SUM=e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19 +VERSION=4.4.1 +SHA256SUM=dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 # Build make wget --no-check-certificate https://ftp.gnu.org/gnu/make/make-${VERSION}.tar.gz From ba91c92f5d951fd03390fca12098b83605510858 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Sun, 27 Oct 2024 23:28:11 +0800 Subject: [PATCH 7/9] build-python3.sh: bump to 3.11.10 --- build-python3.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-python3.sh b/build-python3.sh index 8110525..e238a7d 100755 --- a/build-python3.sh +++ b/build-python3.sh @@ -3,8 +3,8 @@ set -e source "$(dirname "${BASH_SOURCE[0]}")/utils.sh" -VERSION=3.9.13 -SHA256SUM=125b0c598f1e15d2aa65406e83f792df7d171cdf38c16803b149994316a3080f +VERSION=3.11.10 +SHA256SUM=07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372 # Build Python 3 wget --no-check-certificate https://www.python.org/ftp/python/$VERSION/Python-$VERSION.tar.xz From e38827ca85a50b77848455f2bcbd695cde7ec4f6 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Sun, 27 Oct 2024 23:28:20 +0800 Subject: [PATCH 8/9] build-sed.sh: bump to 4.9 --- build-sed.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-sed.sh b/build-sed.sh index c8f5560..d566184 100755 --- a/build-sed.sh +++ b/build-sed.sh @@ -3,8 +3,8 @@ set -e source "$(dirname "${BASH_SOURCE[0]}")/utils.sh" -VERSION=4.8 -SHA256SUM=f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633 +VERSION=4.9 +SHA256SUM=6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181 # Build sed wget --no-check-certificate https://ftp.gnu.org/gnu/sed/sed-$VERSION.tar.xz From 6755c2cb723962e11458951b03c88c68f73ceadf Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Mon, 18 Nov 2024 17:08:27 +0800 Subject: [PATCH 9/9] util.sh: keep long options --- utils.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils.sh b/utils.sh index 4a19768..2a1c450 100755 --- a/utils.sh +++ b/utils.sh @@ -17,6 +17,8 @@ package() { PKGNAME="$1" VERSION="$2" - tar -C "$PREFIX" -czvf "$PKGDIR/bootstrap-$PKGNAME-$VERSION.tar.gz" . + tar --directory "$PREFIX" \ + --create --gzip --verbose \ + --file "$PKGDIR/bootstrap-$PKGNAME-$VERSION.tar.gz" . find "$PREFIX" -mindepth 1 -delete }