commit: 2e39dd4e6e8a3fcf25be1ca9528968163534ee4d Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Jul 18 17:42:24 2025 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Jul 18 17:42:24 2025 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=2e39dd4e
Rebase for glibc-2.42 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> 9999/0001-Disable-ldconfig-during-install.patch | 6 ++--- ...Adapt-to-Gentoo-specific-etc-mail-aliases.patch | 13 +++++----- ...O0-in-conform-tests-to-survive-CC-changes.patch | 12 +++++----- ...4-linux-Use-getdents64-on-non-LFS-readdir.patch | 6 ++--- 9999/0005-support-Add-xreallocarray.patch | 8 +++---- ...nternal-DIR-filepos-as-off64_t-BZ-23960-B.patch | 28 +++++++++++----------- 6 files changed, 37 insertions(+), 36 deletions(-) diff --git a/9999/0001-Disable-ldconfig-during-install.patch b/9999/0001-Disable-ldconfig-during-install.patch index b038b00..39a72f4 100644 --- a/9999/0001-Disable-ldconfig-during-install.patch +++ b/9999/0001-Disable-ldconfig-during-install.patch @@ -1,4 +1,4 @@ -From f3204fbe0db88620ef54a3b3ca26a345f53a08a8 Mon Sep 17 00:00:00 2001 +From 65d5aeff17f11755e20b29748636a17db103d6e1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <[email protected]> Date: Tue, 3 Aug 2021 00:34:59 +0200 Subject: [PATCH 1/6] Disable ldconfig during install @@ -19,7 +19,7 @@ Signed-off-by: Andreas K. Hüttel <[email protected]> 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index 430a0942eb..ca8d833c51 100644 +index cb927fb9f9..42bd789e4a 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,7 @@ elf/ldso_install: @@ -31,5 +31,5 @@ index 430a0942eb..ca8d833c51 100644 $(elf-objpfx)ldconfig $(addprefix -r ,$(install_root)) \ $(slibdir) $(libdir) -- -2.45.2 +2.49.0 diff --git a/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch b/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch index 1ef2d6c..a33a55e 100644 --- a/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch +++ b/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch @@ -1,4 +1,4 @@ -From 01d781a5ff9392dccf849c3a9ce3063375c11431 Mon Sep 17 00:00:00 2001 +From 4c2ba791aa33b1a2ebdd04febfd95e25958a6515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> Date: Mon, 22 Oct 2018 22:34:13 +0200 Subject: [PATCH 2/6] Adapt to Gentoo-specific /etc/mail/aliases @@ -18,7 +18,7 @@ Signed-off-by: Andreas K. Hüttel <[email protected]> 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c -index 14a59b4655..2c4b208b25 100644 +index 297449013d..7857e63859 100644 --- a/nss/nss_files/files-alias.c +++ b/nss/nss_files/files-alias.c @@ -42,7 +42,7 @@ internal_setent (FILE **stream) @@ -31,7 +31,7 @@ index 14a59b4655..2c4b208b25 100644 if (*stream == NULL) status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; diff --git a/nss/tst-nss-files-alias-leak.c b/nss/tst-nss-files-alias-leak.c -index 290c5e9b4b..c2bdf52e40 100644 +index 7068de9787..71bafa0f7d 100644 --- a/nss/tst-nss-files-alias-leak.c +++ b/nss/tst-nss-files-alias-leak.c @@ -45,27 +45,27 @@ prepare (int argc, char **argv) @@ -80,10 +80,10 @@ index 290c5e9b4b..c2bdf52e40 100644 FILE *fp = xfopen (path, "w"); for (int i = 0; i < many_aliases; ++i) diff --git a/support/support_chroot.c b/support/support_chroot.c -index 809342c8a2..492c656069 100644 +index 92c2a453aa..fec6b4b680 100644 --- a/support/support_chroot.c +++ b/support/support_chroot.c -@@ -52,13 +52,19 @@ support_chroot_create (struct support_chroot_configuration conf) +@@ -52,14 +52,20 @@ support_chroot_create (struct support_chroot_configuration conf) xmkdir (path_etc, 0777); add_temp_file (path_etc); @@ -98,6 +98,7 @@ index 809342c8a2..492c656069 100644 write_file (path_etc, "host.conf", conf.host_conf, &chroot->path_host_conf); - write_file (path_etc, "aliases", conf.aliases, &chroot->path_aliases); + write_file (path_etc_mail, "aliases", conf.aliases, &chroot->path_aliases); + write_file (path_etc, "networks", conf.networks, &chroot->path_networks); free (path_etc); + free (path_etc_mail); @@ -105,5 +106,5 @@ index 809342c8a2..492c656069 100644 /* valgrind needs a temporary directory in the chroot. */ { -- -2.45.2 +2.49.0 diff --git a/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch b/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch index 8b59649..63a803d 100644 --- a/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch +++ b/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch @@ -1,4 +1,4 @@ -From 65ca896f1fe058040a88356a573ecb1ffca3aa58 Mon Sep 17 00:00:00 2001 +From 4b76e16d6d8bf67a96047042061d21dbe45b4200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> Date: Fri, 14 Dec 2018 20:43:04 +0100 Subject: [PATCH 3/6] Force -O0 in conform tests to survive $CC changes @@ -22,10 +22,10 @@ Signed-off-by: Andreas K. Hüttel <[email protected]> 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/conform/conformtest.py b/conform/conformtest.py -index d38afb06a8..c0df540ee8 100644 +index a14ffb86dd..8a7da74a06 100644 --- a/conform/conformtest.py +++ b/conform/conformtest.py -@@ -566,7 +566,7 @@ class HeaderTests(object): +@@ -570,7 +570,7 @@ class HeaderTests(object): o_file = os.path.join(self.temp_dir, 'test.o') with open(c_file, 'w') as c_file_out: c_file_out.write('#include <%s>\n%s' % (self.header, text)) @@ -34,7 +34,7 @@ index d38afb06a8..c0df540ee8 100644 try: subprocess.check_call(cmd, shell=True) except subprocess.CalledProcessError: -@@ -620,7 +620,9 @@ class HeaderTests(object): +@@ -624,7 +624,9 @@ class HeaderTests(object): out_file = os.path.join(self.temp_dir, 'namespace-out') with open(c_file, 'w') as c_file_out: c_file_out.write('#include <%s>\n' % self.header) @@ -46,7 +46,7 @@ index d38afb06a8..c0df540ee8 100644 subprocess.check_call(cmd, shell=True) bad_tokens = set() diff --git a/conform/linknamespace.py b/conform/linknamespace.py -index 8bc42bee22..2f8842456b 100644 +index d099cac027..ac9adbf4d5 100644 --- a/conform/linknamespace.py +++ b/conform/linknamespace.py @@ -157,7 +157,9 @@ def main(): @@ -61,5 +61,5 @@ index 8bc42bee22..2f8842456b 100644 args.header) with tempfile.TemporaryDirectory() as temp_dir: -- -2.45.2 +2.49.0 diff --git a/9999/0004-linux-Use-getdents64-on-non-LFS-readdir.patch b/9999/0004-linux-Use-getdents64-on-non-LFS-readdir.patch index 603cfa7..ba7c2fd 100644 --- a/9999/0004-linux-Use-getdents64-on-non-LFS-readdir.patch +++ b/9999/0004-linux-Use-getdents64-on-non-LFS-readdir.patch @@ -1,4 +1,4 @@ -From 174cb5ca4d4678054edd2be171b14cfa85aee90a Mon Sep 17 00:00:00 2001 +From a26056272e8ae49a81aa4699af95bd457178ae52 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <[email protected]> Date: Tue, 20 Oct 2020 13:37:15 -0300 Subject: [PATCH 4/6] linux: Use getdents64 on non-LFS readdir @@ -11,7 +11,7 @@ Checked on x86_64-linux-gnu and i686-linux-gnu. 1 file changed, 73 insertions(+), 24 deletions(-) diff --git a/sysdeps/unix/sysv/linux/readdir.c b/sysdeps/unix/sysv/linux/readdir.c -index 33bae4b57d..4e2214f21e 100644 +index abd1ec5c45..0213de925c 100644 --- a/sysdeps/unix/sysv/linux/readdir.c +++ b/sysdeps/unix/sysv/linux/readdir.c @@ -20,43 +20,92 @@ @@ -132,5 +132,5 @@ index 33bae4b57d..4e2214f21e 100644 struct dirent * -- -2.45.2 +2.49.0 diff --git a/9999/0005-support-Add-xreallocarray.patch b/9999/0005-support-Add-xreallocarray.patch index 975f476..b133ddc 100644 --- a/9999/0005-support-Add-xreallocarray.patch +++ b/9999/0005-support-Add-xreallocarray.patch @@ -1,4 +1,4 @@ -From 1be0d15708736f689ab2cc371a1576b029623a7a Mon Sep 17 00:00:00 2001 +From b27348f88a5025ed75f16fe2da62fc5c2d1e40d2 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <[email protected]> Date: Wed, 1 Mar 2023 14:41:23 -0300 Subject: [PATCH 5/6] support: Add xreallocarray @@ -12,7 +12,7 @@ As a wrapper over reallocarray. create mode 100644 support/xreallocarray.c diff --git a/support/Makefile b/support/Makefile -index 099f5ebb9c..ce19f5a2b8 100644 +index d41278eeab..81f8fbb222 100644 --- a/support/Makefile +++ b/support/Makefile @@ -210,6 +210,7 @@ libsupport-routines = \ @@ -24,7 +24,7 @@ index 099f5ebb9c..ce19f5a2b8 100644 xsendto \ xsetlocale \ diff --git a/support/support.h b/support/support.h -index 1a77f79793..78ad445b65 100644 +index 4998a34894..c1b7070b1c 100644 --- a/support/support.h +++ b/support/support.h @@ -107,6 +107,8 @@ extern void *xcalloc (size_t n, size_t s) @@ -72,5 +72,5 @@ index 0000000000..74fdaa421b + return r; +} -- -2.45.2 +2.49.0 diff --git a/9999/0006-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch b/9999/0006-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch index a0120ed..bbda169 100644 --- a/9999/0006-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch +++ b/9999/0006-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch @@ -1,4 +1,4 @@ -From 8773ba65007694b27613d9e8dfc6137c90ae462d Mon Sep 17 00:00:00 2001 +From 220967a1f6f6b50698b8c0f2bd32439171f44421 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <[email protected]> Date: Mon, 13 Apr 2020 18:09:20 -0300 Subject: [PATCH 6/6] linux: Set internal DIR filepos as off64_t (BZ #23960, BZ @@ -64,10 +64,10 @@ index d7567f5e86..17827176ba 100644 # include <sys/stat.h> # include <stdbool.h> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile -index eb9c697ce5..f86100006b 100644 +index 0aec783f1e..b0052a5b04 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile -@@ -590,6 +590,8 @@ sysdep_routines += \ +@@ -603,6 +603,8 @@ sysdep_routines += \ tests += \ tst-getdents64 \ @@ -77,7 +77,7 @@ index eb9c697ce5..f86100006b 100644 # tests endif # $(subdir) == dirent diff --git a/sysdeps/unix/sysv/linux/alpha/bits/dirent.h b/sysdeps/unix/sysv/linux/alpha/bits/dirent.h -index b604576188..4e511e7654 100644 +index fbec5500b5..0e39599ee6 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/dirent.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/dirent.h @@ -54,4 +54,7 @@ struct dirent64 @@ -89,7 +89,7 @@ index b604576188..4e511e7654 100644 + #endif /* bits/dirent.h */ diff --git a/sysdeps/unix/sysv/linux/bits/dirent.h b/sysdeps/unix/sysv/linux/bits/dirent.h -index 8bf38f8188..7c5f3419cd 100644 +index cd5e93c6c9..87b2150147 100644 --- a/sysdeps/unix/sysv/linux/bits/dirent.h +++ b/sysdeps/unix/sysv/linux/bits/dirent.h @@ -57,3 +57,7 @@ struct dirent64 @@ -101,7 +101,7 @@ index 8bf38f8188..7c5f3419cd 100644 + store off64_t values. In this case, translation is required. */ +#define _DIRENT_OFFSET_TRANSLATION (LONG_WIDTH < 64) diff --git a/sysdeps/unix/sysv/linux/closedir.c b/sysdeps/unix/sysv/linux/closedir.c -index b86f79f133..3a4eba03f1 100644 +index 36f196855a..3684277326 100644 --- a/sysdeps/unix/sysv/linux/closedir.c +++ b/sysdeps/unix/sysv/linux/closedir.c @@ -47,6 +47,10 @@ __closedir (DIR *dirp) @@ -116,7 +116,7 @@ index b86f79f133..3a4eba03f1 100644 return __close_nocancel (fd); diff --git a/sysdeps/unix/sysv/linux/dirstream.h b/sysdeps/unix/sysv/linux/dirstream.h -index 3d3643733a..fc2586566a 100644 +index 8649f85fef..77c2ff7e86 100644 --- a/sysdeps/unix/sysv/linux/dirstream.h +++ b/sysdeps/unix/sysv/linux/dirstream.h @@ -21,6 +21,7 @@ @@ -146,7 +146,7 @@ index 3d3643733a..fc2586566a 100644 at an address that is aligned adequately enough to store dirent entries. Using the alignment of "void *" is not diff --git a/sysdeps/unix/sysv/linux/opendir.c b/sysdeps/unix/sysv/linux/opendir.c -index b5218138ec..fda2c5f9fe 100644 +index 48e3dc4fdb..0c53111318 100644 --- a/sysdeps/unix/sysv/linux/opendir.c +++ b/sysdeps/unix/sysv/linux/opendir.c @@ -129,6 +129,9 @@ __alloc_dir (int fd, bool close_fd, int flags, @@ -160,7 +160,7 @@ index b5218138ec..fda2c5f9fe 100644 return dirp; } diff --git a/sysdeps/unix/sysv/linux/readdir.c b/sysdeps/unix/sysv/linux/readdir.c -index 4e2214f21e..d474f70a8d 100644 +index 0213de925c..9a0f9da432 100644 --- a/sysdeps/unix/sysv/linux/readdir.c +++ b/sysdeps/unix/sysv/linux/readdir.c @@ -75,25 +75,22 @@ __readdir_unlocked (DIR *dirp) @@ -199,7 +199,7 @@ index 4e2214f21e..d474f70a8d 100644 outp->dp.d_off = d_off; outp->dp.d_reclen = new_reclen; diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c -index e6b8867b7a..34c55196ec 100644 +index f4b2cc0161..8d39817064 100644 --- a/sysdeps/unix/sysv/linux/readdir64.c +++ b/sysdeps/unix/sysv/linux/readdir64.c @@ -61,6 +61,17 @@ __readdir64_unlocked (DIR *dirp) @@ -221,7 +221,7 @@ index e6b8867b7a..34c55196ec 100644 } diff --git a/sysdeps/unix/sysv/linux/rewinddir.c b/sysdeps/unix/sysv/linux/rewinddir.c -index af85000a28..4936be5c6a 100644 +index 40b5e10954..cd6972c1a4 100644 --- a/sysdeps/unix/sysv/linux/rewinddir.c +++ b/sysdeps/unix/sysv/linux/rewinddir.c @@ -33,6 +33,11 @@ __rewinddir (DIR *dirp) @@ -237,7 +237,7 @@ index af85000a28..4936be5c6a 100644 __libc_lock_unlock (dirp->lock); #endif diff --git a/sysdeps/unix/sysv/linux/seekdir.c b/sysdeps/unix/sysv/linux/seekdir.c -index 52005878fc..cd49676750 100644 +index facd2f95dc..5fdb37519c 100644 --- a/sysdeps/unix/sysv/linux/seekdir.c +++ b/sysdeps/unix/sysv/linux/seekdir.c @@ -22,14 +22,36 @@ @@ -282,7 +282,7 @@ index 52005878fc..cd49676750 100644 __libc_lock_unlock (dirp->lock); } diff --git a/sysdeps/unix/sysv/linux/telldir.c b/sysdeps/unix/sysv/linux/telldir.c -index c8dff30719..8d9e2c9db2 100644 +index 039d377086..89374a3f95 100644 --- a/sysdeps/unix/sysv/linux/telldir.c +++ b/sysdeps/unix/sysv/linux/telldir.c @@ -15,9 +15,12 @@ @@ -575,5 +575,5 @@ index 0000000000..216ecf123f + +#include <support/test-driver.c> -- -2.45.2 +2.49.0
