From 8cd4a6cbc4e48fd98b8336c911a2a39680a8dd7e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 4 May 2023 12:39:41 -0700 Subject: [PATCH] Update devel to 20230501, commit 23935dbe8513437e69ca14d6b0890067dddceba3 (with ssize_t compilation workaround) --- Dockerfile.template | 6 ++++++ devel/Dockerfile | 10 +++++++--- versions.json | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index ef386c4..05034a3 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -92,6 +92,12 @@ RUN set -eux; \ rmdir bash-patches; \ apk del --no-network .patch-deps; \ fi; \ +{{ if env.version == "devel" then ( -}} + \ +# https://lists.gnu.org/archive/html/bug-bash/2023-05/msg00011.html + { echo '#include '; echo; cat /usr/src/bash/lib/sh/strscpy.c; } > /usr/src/bash/lib/sh/strscpy.c.new; \ + mv /usr/src/bash/lib/sh/strscpy.c.new /usr/src/bash/lib/sh/strscpy.c; \ +{{ ) else "" end -}} \ cd /usr/src/bash; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ diff --git a/devel/Dockerfile b/devel/Dockerfile index 68fff74..058964c 100644 --- a/devel/Dockerfile +++ b/devel/Dockerfile @@ -7,9 +7,9 @@ FROM alpine:3.17 # https://git.savannah.gnu.org/cgit/bash.git/log/?h=devel -ENV _BASH_COMMIT ec9447ce9392a0f93d96789c3741285fede8a150 -# fix minor asan bug; $('; echo; cat /usr/src/bash/lib/sh/strscpy.c; } > /usr/src/bash/lib/sh/strscpy.c.new; \ + mv /usr/src/bash/lib/sh/strscpy.c.new /usr/src/bash/lib/sh/strscpy.c; \ + \ cd /usr/src/bash; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/versions.json b/versions.json index 76b0af5..1218b6b 100644 --- a/versions.json +++ b/versions.json @@ -139,9 +139,9 @@ "version": "3.17" }, "commit": { - "description": "fix minor asan bug; $(