b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

glibc: 2.35-224 -> 2.37-8

Browse source 
Announcement: https://sourceware.org/pipermail/libc-alpha/2022-August/141193.html
Announcement: https://sourceware.org/pipermail/libc-alpha/2023-February/145190.html
This commit is contained in:
Maximilian Bosch 2022-08-27 12:28:45 +02:00
parent 249b458e58
commit b42ee8b817
No known key found for this signature in database
GPG key ID: 9A6EEA275CA5BE0A
4 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch
View file

@ -1,4 +1,4 @@
From faeeb0f353f5540da2015a41cb60fe43d199a1ac Mon Sep 17 00:00:00 2001
From cdd0c4b168fe228de97778556cea5c0f936e0e79 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
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 <maximilian@mbosch.me>
8 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/debug/Makefile b/debug/Makefile
index 96029f32ee..cbbdeda277 100644
index 52f9a7852c..22e4ae5461 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -238,7 +238,8 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o
@@ -265,8 +265,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o
$(objpfx)xtrace: xtrace.sh
rm -f $@.new
@ -36,21 +36,22 @@ index 96029f32ee..cbbdeda277 100644
+ -e 's|@PKGVERSION@|$(PKGVERSION)|' \
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \
&& rm -f $@ && mv $@.new $@ && chmod +x $@
diff --git a/debug/xtrace.sh b/debug/xtrace.sh
index 8c56e01449..c760391a33 100755
index 3d1f2af43a..eb2ba7ad4a 100755
--- a/debug/xtrace.sh
+++ b/debug/xtrace.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
# Copyright (C) 1999-2022 Free Software Foundation, Inc.
# Copyright (C) 1999-2023 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
diff --git a/elf/Makefile b/elf/Makefile
index 3536b6af5e..83521d9dbc 100644
index 0d19964d42..ee8ee1cd41 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -256,7 +256,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
@@ -250,7 +250,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
@ -60,7 +61,7 @@ index 3536b6af5e..83521d9dbc 100644
-e 's%@TEXTDOMAINDIR@%$(localedir)%g' \
-e 's%@PREFIX@%$(prefix)%g' \
-e 's|@PKGVERSION@|$(PKGVERSION)|g' \
@@ -1363,6 +1364,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
@@ -1396,6 +1397,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' \
@ -69,30 +70,30 @@ index 3536b6af5e..83521d9dbc 100644
ifeq ($(ldd-rewrite-script),no)
diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index 3253b32ef8..127eb59206 100644
index e45dec5894..e09428506e 100644
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
# Copyright (C) 1996-2022 Free Software Foundation, Inc.
# Copyright (C) 1996-2023 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
diff --git a/elf/sotruss.sh b/elf/sotruss.sh
index 22327eac5c..7d15bf4fc8 100755
index 874a6bed3f..7cc154561e 100755
--- a/elf/sotruss.sh
+++ b/elf/sotruss.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
# Copyright (C) 2011-2022 Free Software Foundation, Inc.
# Copyright (C) 2011-2023 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
diff --git a/malloc/Makefile b/malloc/Makefile
index 2329cf718a..5d7de4bee7 100644
index dfb51d344c..574b5e9579 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -307,8 +307,9 @@ $(objpfx)mtrace: mtrace.pl
@@ -306,8 +306,9 @@ $(objpfx)mtrace: mtrace.pl
$(objpfx)memusage: memusage.sh
rm -f $@.new
@ -105,20 +106,20 @@ index 2329cf718a..5d7de4bee7 100644
&& rm -f $@ && mv $@.new $@ && chmod +x $@
diff --git a/malloc/memusage.sh b/malloc/memusage.sh
index f447160b7d..faa4936639 100755
index b1f5848b74..329e36ef8a 100755
--- a/malloc/memusage.sh
+++ b/malloc/memusage.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
# Copyright (C) 1999-2022 Free Software Foundation, Inc.
# Copyright (C) 1999-2023 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
diff --git a/timezone/Makefile b/timezone/Makefile
index a789c22d26..d65bdf2391 100644
index 0306c0bca9..de9bbcc815 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -130,7 +130,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh
@@ -132,7 +132,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh
mv $@.tmp $@
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
@ -129,5 +130,5 @@ index a789c22d26..d65bdf2391 100644
-e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
-e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
--
2.37.0
2.38.4

BIN
pkgs/development/libraries/glibc/2.35-master.patch.gz
View file

Binary file not shown.

BIN
pkgs/development/libraries/glibc/2.37-master.patch.gz Normal file
View file

Binary file not shown.

16
pkgs/development/libraries/glibc/common.nix
View file

@ -43,9 +43,9 @@
} @ args:
let
version = "2.35";
patchSuffix = "-224";
sha256 = "sha256-USNzL2tnzNMZMF79OZlx1YWSEivMKmUYob0lEN0M9S4=";
version = "2.37";
patchSuffix = "-8";
sha256 = "sha256-Ilfv8RGhgV109GhW2q9AsBnB5VMVbGnUi6DL/Bu5GkM=";
in
assert withLinuxHeaders -> linuxHeaders != null;
@ -59,14 +59,14 @@ stdenv.mkDerivation ({
patches =
[
/* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
$ git fetch --all -p && git checkout origin/release/2.35/master && git describe
glibc-2.35-210-ge123f08ad5
$ git show --minimal --reverse glibc-2.35.. | gzip -9n --rsyncable - > 2.35-master.patch.gz
$ git fetch --all -p && git checkout origin/release/2.36/master && git describe
glibc-2.37-8-g590d0e089b
$ git show --minimal --reverse glibc-2.37.. | gzip -9n --rsyncable - > 2.37-master.patch.gz
To compare the archive contents zdiff can be used.
$ zdiff -u 2.35-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz
$ zdiff -u 2.37-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.37-master.patch.gz
*/
./2.35-master.patch.gz
./2.37-master.patch.gz
/* Allow NixOS and Nix to handle the locale-archive. */
./nix-locale-archive.patch