cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

135 lines
4.5 KiB
Diff
Raw Normal View History

glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
From cdd0c4b168fe228de97778556cea5c0f936e0e79 Mon Sep 17 00:00:00 2001
glibc: 2.34-210 -> 2.35-163
2022-07-23 07:30:56 +02:00
From: Bernardo Meurer <bernardo@meurer.org>
Date: Fri, 22 Jul 2022 22:11:07 -0700
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
Subject: [PATCH] Revert "Remove all usage of @BASH@ or ${BASH} in installed
files, and hardcode /bin/bash instead"
We need the ability to override to use `/bin/sh` here to avoid having
some bootstrap tools in a final build product.
This reverts commit 5188a9d0265cc6f7235a8af1d31ab02e4a24853d.
glibc: 2.34-210 -> 2.35-163
2022-07-23 07:30:56 +02:00
Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
---
debug/Makefile | 5 +++--
debug/xtrace.sh | 2 +-
elf/Makefile | 4 +++-
elf/ldd.bash.in | 2 +-
elf/sotruss.sh | 2 +-
malloc/Makefile | 5 +++--
malloc/memusage.sh | 2 +-
timezone/Makefile | 3 ++-
8 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/debug/Makefile b/debug/Makefile
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
index 52f9a7852c..22e4ae5461 100644
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
--- a/debug/Makefile
+++ b/debug/Makefile
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
@@ -265,8 +265,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
$(objpfx)xtrace: xtrace.sh
rm -f $@.new
- sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \
- -e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \
+ sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \
+ -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \
+ -e 's|@PKGVERSION@|$(PKGVERSION)|' \
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \
&& rm -f $@ && mv $@.new $@ && chmod +x $@
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
diff --git a/debug/xtrace.sh b/debug/xtrace.sh
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
index 3d1f2af43a..eb2ba7ad4a 100755
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
--- a/debug/xtrace.sh
+++ b/debug/xtrace.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
# Copyright (C) 1999-2023 Free Software Foundation, Inc.
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
# This file is part of the GNU C Library.
glibc: 2.34-210 -> 2.35-163
2022-07-23 07:30:56 +02:00
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
diff --git a/elf/Makefile b/elf/Makefile
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
index 0d19964d42..ee8ee1cd41 100644
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
--- a/elf/Makefile
+++ b/elf/Makefile
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
@@ -250,7 +250,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
$(common-objpfx)libc_nonshared.a
$(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make
- sed -e 's%@VERSION@%$(version)%g' \
+ sed -e 's%@BASH@%$(BASH)%g' \
+ -e 's%@VERSION@%$(version)%g' \
-e 's%@TEXTDOMAINDIR@%$(localedir)%g' \
-e 's%@PREFIX@%$(prefix)%g' \
-e 's|@PKGVERSION@|$(PKGVERSION)|g' \
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
@@ -1396,6 +1397,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
-e 's%@VERSION@%$(version)%g' \
-e 's|@PKGVERSION@|$(PKGVERSION)|g' \
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \
+ -e 's%@BASH@%$(BASH)%g' \
-e 's%@TEXTDOMAINDIR@%$(localedir)%g'
ifeq ($(ldd-rewrite-script),no)
diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
index e45dec5894..e09428506e 100644
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
# Copyright (C) 1996-2023 Free Software Foundation, Inc.
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
# This file is part of the GNU C Library.
diff --git a/elf/sotruss.sh b/elf/sotruss.sh
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
index 874a6bed3f..7cc154561e 100755
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
--- a/elf/sotruss.sh
+++ b/elf/sotruss.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
# Copyright (C) 2011-2023 Free Software Foundation, Inc.
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
# This file is part of the GNU C Library.
diff --git a/malloc/Makefile b/malloc/Makefile
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
index dfb51d344c..574b5e9579 100644
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
--- a/malloc/Makefile
+++ b/malloc/Makefile
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
@@ -306,8 +306,9 @@ $(objpfx)mtrace: mtrace.pl
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
$(objpfx)memusage: memusage.sh
rm -f $@.new
- sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \
- -e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \
+ sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \
+ -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \
+ -e 's|@PKGVERSION@|$(PKGVERSION)|' \
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \
&& rm -f $@ && mv $@.new $@ && chmod +x $@
diff --git a/malloc/memusage.sh b/malloc/memusage.sh
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
index b1f5848b74..329e36ef8a 100755
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
--- a/malloc/memusage.sh
+++ b/malloc/memusage.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
# Copyright (C) 1999-2023 Free Software Foundation, Inc.
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
# This file is part of the GNU C Library.
glibc: 2.34-210 -> 2.35-163
2022-07-23 07:30:56 +02:00
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
diff --git a/timezone/Makefile b/timezone/Makefile
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
index 0306c0bca9..de9bbcc815 100644
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
--- a/timezone/Makefile
+++ b/timezone/Makefile
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
@@ -132,7 +132,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh
glibc: 2.34-210 -> 2.35-163
2022-07-23 07:30:56 +02:00
mv $@.tmp $@
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- sed -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \
+ sed -e 's|/bin/bash|$(BASH)|' \
+ -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \
-e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
-e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
-e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
--
glibc: 2.35-224 -> 2.37-8 Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
2022-08-27 12:28:45 +02:00
2.38.4
glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d
2021-08-27 19:21:16 +02:00
Reference in a new issue Copy permalink