forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Announcement: https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00017.html This release seems relatively harmless in terms of potential fallout. Most notably is the removal of `crypt(3)` in favor of libxcrypt which we've done already and compatibility from ISO C2X. Also decided to drop the old *.gz approach in favor of inlining the patch with the changes from the release branch directly: it's relatively small in contrast to certain lockfiles in this repo and having a textual version makes reviews & diffs easier. See also NixOS#258972 (comment) for more context.
- Loading branch information
Showing
6 changed files
with
328 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From cdd0c4b168fe228de97778556cea5c0f936e0e79 Mon Sep 17 00:00:00 2001 | ||
From e207c3dbcff1d3d09c60eec99b6fec2a698b01bd Mon Sep 17 00:00:00 2001 | ||
From: Bernardo Meurer <[email protected]> | ||
Date: Fri, 22 Jul 2022 22:11:07 -0700 | ||
Subject: [PATCH] Revert "Remove all usage of @BASH@ or ${BASH} in installed | ||
|
@@ -22,10 +22,10 @@ Co-authored-by: Maximilian Bosch <[email protected]> | |
8 files changed, 15 insertions(+), 10 deletions(-) | ||
|
||
diff --git a/debug/Makefile b/debug/Makefile | ||
index 52f9a7852c..22e4ae5461 100644 | ||
index 3903cc97a3..b041acca71 100644 | ||
--- a/debug/Makefile | ||
+++ b/debug/Makefile | ||
@@ -265,8 +265,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o | ||
@@ -343,8 +343,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o | ||
|
||
$(objpfx)xtrace: xtrace.sh | ||
rm -f [email protected] | ||
|
@@ -38,20 +38,20 @@ index 52f9a7852c..22e4ae5461 100644 | |
&& rm -f $@ && mv [email protected] $@ && chmod +x $@ | ||
|
||
diff --git a/debug/xtrace.sh b/debug/xtrace.sh | ||
index 3d1f2af43a..eb2ba7ad4a 100755 | ||
index 77ec1d84df..5614404a71 100755 | ||
--- a/debug/xtrace.sh | ||
+++ b/debug/xtrace.sh | ||
@@ -1,4 +1,4 @@ | ||
-#!/bin/bash | ||
+#! @BASH@ | ||
# Copyright (C) 1999-2023 Free Software Foundation, Inc. | ||
# Copyright (C) 1999-2024 Free Software Foundation, Inc. | ||
# This file is part of the GNU C Library. | ||
|
||
diff --git a/elf/Makefile b/elf/Makefile | ||
index 0d19964d42..ee8ee1cd41 100644 | ||
index 5d78b659ce..a2145d7b64 100644 | ||
--- a/elf/Makefile | ||
+++ b/elf/Makefile | ||
@@ -250,7 +250,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ | ||
@@ -249,7 +249,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ | ||
$(common-objpfx)libc_nonshared.a | ||
|
||
$(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make | ||
|
@@ -61,7 +61,7 @@ index 0d19964d42..ee8ee1cd41 100644 | |
-e 's%@TEXTDOMAINDIR@%$(localedir)%g' \ | ||
-e 's%@PREFIX@%$(prefix)%g' \ | ||
-e 's|@PKGVERSION@|$(PKGVERSION)|g' \ | ||
@@ -1396,6 +1397,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ | ||
@@ -1392,6 +1393,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ | ||
-e 's%@VERSION@%$(version)%g' \ | ||
-e 's|@PKGVERSION@|$(PKGVERSION)|g' \ | ||
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \ | ||
|
@@ -70,30 +70,30 @@ index 0d19964d42..ee8ee1cd41 100644 | |
|
||
ifeq ($(ldd-rewrite-script),no) | ||
diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in | ||
index e45dec5894..e09428506e 100644 | ||
index d6b640df66..46111670cd 100644 | ||
--- a/elf/ldd.bash.in | ||
+++ b/elf/ldd.bash.in | ||
@@ -1,4 +1,4 @@ | ||
-#!/bin/bash | ||
+#! @BASH@ | ||
# Copyright (C) 1996-2023 Free Software Foundation, Inc. | ||
# Copyright (C) 1996-2024 Free Software Foundation, Inc. | ||
# This file is part of the GNU C Library. | ||
|
||
diff --git a/elf/sotruss.sh b/elf/sotruss.sh | ||
index 874a6bed3f..7cc154561e 100755 | ||
index ac1a83984e..2bf17c518e 100755 | ||
--- a/elf/sotruss.sh | ||
+++ b/elf/sotruss.sh | ||
@@ -1,4 +1,4 @@ | ||
-#!/bin/bash | ||
+#! @BASH@ | ||
# Copyright (C) 2011-2023 Free Software Foundation, Inc. | ||
# Copyright (C) 2011-2024 Free Software Foundation, Inc. | ||
# This file is part of the GNU C Library. | ||
|
||
diff --git a/malloc/Makefile b/malloc/Makefile | ||
index dfb51d344c..574b5e9579 100644 | ||
index c83ade5f10..8dd9174b79 100644 | ||
--- a/malloc/Makefile | ||
+++ b/malloc/Makefile | ||
@@ -306,8 +306,9 @@ $(objpfx)mtrace: mtrace.pl | ||
@@ -312,8 +312,9 @@ $(objpfx)mtrace: mtrace.pl | ||
|
||
$(objpfx)memusage: memusage.sh | ||
rm -f [email protected] | ||
|
@@ -106,17 +106,17 @@ index dfb51d344c..574b5e9579 100644 | |
&& rm -f $@ && mv [email protected] $@ && chmod +x $@ | ||
|
||
diff --git a/malloc/memusage.sh b/malloc/memusage.sh | ||
index b1f5848b74..329e36ef8a 100755 | ||
index d2d9d17ea8..2e7efc9049 100755 | ||
--- a/malloc/memusage.sh | ||
+++ b/malloc/memusage.sh | ||
@@ -1,4 +1,4 @@ | ||
-#!/bin/bash | ||
+#! @BASH@ | ||
# Copyright (C) 1999-2023 Free Software Foundation, Inc. | ||
# Copyright (C) 1999-2024 Free Software Foundation, Inc. | ||
# This file is part of the GNU C Library. | ||
|
||
diff --git a/timezone/Makefile b/timezone/Makefile | ||
index 0306c0bca9..de9bbcc815 100644 | ||
index d7acb387ba..c8e203ea3a 100644 | ||
--- a/timezone/Makefile | ||
+++ b/timezone/Makefile | ||
@@ -132,7 +132,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh | ||
|
@@ -130,5 +130,5 @@ index 0306c0bca9..de9bbcc815 100644 | |
-e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ | ||
-e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ | ||
-- | ||
2.38.4 | ||
2.42.0 | ||
|
Binary file not shown.
Oops, something went wrong.