lol

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

+28 -27
+20 -19
pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch
··· 1 - From faeeb0f353f5540da2015a41cb60fe43d199a1ac Mon Sep 17 00:00:00 2001 1 + From cdd0c4b168fe228de97778556cea5c0f936e0e79 Mon Sep 17 00:00:00 2001 2 2 From: Bernardo Meurer <bernardo@meurer.org> 3 3 Date: Fri, 22 Jul 2022 22:11:07 -0700 4 4 Subject: [PATCH] Revert "Remove all usage of @BASH@ or ${BASH} in installed ··· 22 22 8 files changed, 15 insertions(+), 10 deletions(-) 23 23 24 24 diff --git a/debug/Makefile b/debug/Makefile 25 - index 96029f32ee..cbbdeda277 100644 25 + index 52f9a7852c..22e4ae5461 100644 26 26 --- a/debug/Makefile 27 27 +++ b/debug/Makefile 28 - @@ -238,7 +238,8 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o 28 + @@ -265,8 +265,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o 29 29 30 30 $(objpfx)xtrace: xtrace.sh 31 31 rm -f $@.new ··· 36 36 + -e 's|@PKGVERSION@|$(PKGVERSION)|' \ 37 37 -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \ 38 38 && rm -f $@ && mv $@.new $@ && chmod +x $@ 39 + 39 40 diff --git a/debug/xtrace.sh b/debug/xtrace.sh 40 - index 8c56e01449..c760391a33 100755 41 + index 3d1f2af43a..eb2ba7ad4a 100755 41 42 --- a/debug/xtrace.sh 42 43 +++ b/debug/xtrace.sh 43 44 @@ -1,4 +1,4 @@ 44 45 -#!/bin/bash 45 46 +#! @BASH@ 46 - # Copyright (C) 1999-2022 Free Software Foundation, Inc. 47 + # Copyright (C) 1999-2023 Free Software Foundation, Inc. 47 48 # This file is part of the GNU C Library. 48 49 49 50 diff --git a/elf/Makefile b/elf/Makefile 50 - index 3536b6af5e..83521d9dbc 100644 51 + index 0d19964d42..ee8ee1cd41 100644 51 52 --- a/elf/Makefile 52 53 +++ b/elf/Makefile 53 - @@ -256,7 +256,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ 54 + @@ -250,7 +250,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ 54 55 $(common-objpfx)libc_nonshared.a 55 56 56 57 $(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make ··· 60 61 -e 's%@TEXTDOMAINDIR@%$(localedir)%g' \ 61 62 -e 's%@PREFIX@%$(prefix)%g' \ 62 63 -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ 63 - @@ -1363,6 +1364,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ 64 + @@ -1396,6 +1397,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ 64 65 -e 's%@VERSION@%$(version)%g' \ 65 66 -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ 66 67 -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \ ··· 69 70 70 71 ifeq ($(ldd-rewrite-script),no) 71 72 diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in 72 - index 3253b32ef8..127eb59206 100644 73 + index e45dec5894..e09428506e 100644 73 74 --- a/elf/ldd.bash.in 74 75 +++ b/elf/ldd.bash.in 75 76 @@ -1,4 +1,4 @@ 76 77 -#!/bin/bash 77 78 +#! @BASH@ 78 - # Copyright (C) 1996-2022 Free Software Foundation, Inc. 79 + # Copyright (C) 1996-2023 Free Software Foundation, Inc. 79 80 # This file is part of the GNU C Library. 80 81 81 82 diff --git a/elf/sotruss.sh b/elf/sotruss.sh 82 - index 22327eac5c..7d15bf4fc8 100755 83 + index 874a6bed3f..7cc154561e 100755 83 84 --- a/elf/sotruss.sh 84 85 +++ b/elf/sotruss.sh 85 86 @@ -1,4 +1,4 @@ 86 87 -#!/bin/bash 87 88 +#! @BASH@ 88 - # Copyright (C) 2011-2022 Free Software Foundation, Inc. 89 + # Copyright (C) 2011-2023 Free Software Foundation, Inc. 89 90 # This file is part of the GNU C Library. 90 91 91 92 diff --git a/malloc/Makefile b/malloc/Makefile 92 - index 2329cf718a..5d7de4bee7 100644 93 + index dfb51d344c..574b5e9579 100644 93 94 --- a/malloc/Makefile 94 95 +++ b/malloc/Makefile 95 - @@ -307,8 +307,9 @@ $(objpfx)mtrace: mtrace.pl 96 + @@ -306,8 +306,9 @@ $(objpfx)mtrace: mtrace.pl 96 97 97 98 $(objpfx)memusage: memusage.sh 98 99 rm -f $@.new ··· 105 106 && rm -f $@ && mv $@.new $@ && chmod +x $@ 106 107 107 108 diff --git a/malloc/memusage.sh b/malloc/memusage.sh 108 - index f447160b7d..faa4936639 100755 109 + index b1f5848b74..329e36ef8a 100755 109 110 --- a/malloc/memusage.sh 110 111 +++ b/malloc/memusage.sh 111 112 @@ -1,4 +1,4 @@ 112 113 -#!/bin/bash 113 114 +#! @BASH@ 114 - # Copyright (C) 1999-2022 Free Software Foundation, Inc. 115 + # Copyright (C) 1999-2023 Free Software Foundation, Inc. 115 116 # This file is part of the GNU C Library. 116 117 117 118 diff --git a/timezone/Makefile b/timezone/Makefile 118 - index a789c22d26..d65bdf2391 100644 119 + index 0306c0bca9..de9bbcc815 100644 119 120 --- a/timezone/Makefile 120 121 +++ b/timezone/Makefile 121 - @@ -130,7 +130,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh 122 + @@ -132,7 +132,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh 122 123 mv $@.tmp $@ 123 124 124 125 $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make ··· 129 130 -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ 130 131 -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ 131 132 -- 132 - 2.37.0 133 + 2.38.4 133 134
pkgs/development/libraries/glibc/2.35-master.patch.gz

This is a binary file and will not be displayed.

pkgs/development/libraries/glibc/2.37-master.patch.gz

This is a binary file and will not be displayed.

+8 -8
pkgs/development/libraries/glibc/common.nix
··· 43 43 } @ args: 44 44 45 45 let 46 - version = "2.35"; 47 - patchSuffix = "-224"; 48 - sha256 = "sha256-USNzL2tnzNMZMF79OZlx1YWSEivMKmUYob0lEN0M9S4="; 46 + version = "2.37"; 47 + patchSuffix = "-8"; 48 + sha256 = "sha256-Ilfv8RGhgV109GhW2q9AsBnB5VMVbGnUi6DL/Bu5GkM="; 49 49 in 50 50 51 51 assert withLinuxHeaders -> linuxHeaders != null; ··· 59 59 patches = 60 60 [ 61 61 /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. 62 - $ git fetch --all -p && git checkout origin/release/2.35/master && git describe 63 - glibc-2.35-210-ge123f08ad5 64 - $ git show --minimal --reverse glibc-2.35.. | gzip -9n --rsyncable - > 2.35-master.patch.gz 62 + $ git fetch --all -p && git checkout origin/release/2.36/master && git describe 63 + glibc-2.37-8-g590d0e089b 64 + $ git show --minimal --reverse glibc-2.37.. | gzip -9n --rsyncable - > 2.37-master.patch.gz 65 65 66 66 To compare the archive contents zdiff can be used. 67 - $ zdiff -u 2.35-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz 67 + $ zdiff -u 2.37-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.37-master.patch.gz 68 68 */ 69 - ./2.35-master.patch.gz 69 + ./2.37-master.patch.gz 70 70 71 71 /* Allow NixOS and Nix to handle the locale-archive. */ 72 72 ./nix-locale-archive.patch