commit: 320473f8285ed18dd347412829620e8237ceed0f Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Dec 27 16:32:37 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Dec 27 16:32:37 2024 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=320473f8
Rebase for glibc-2.41 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> 9999/0001-Disable-ldconfig-during-install.patch | 8 +++---- ...Adapt-to-Gentoo-specific-etc-mail-aliases.patch | 12 +++++------ ...O0-in-conform-tests-to-survive-CC-changes.patch | 7 +++--- ...4-linux-Use-getdents64-on-non-LFS-readdir.patch | 6 +++--- 9999/0005-support-Add-xreallocarray.patch | 12 +++++------ ...nternal-DIR-filepos-as-off64_t-BZ-23960-B.patch | 25 +++++++++++++--------- 6 files changed, 37 insertions(+), 33 deletions(-) diff --git a/9999/0001-Disable-ldconfig-during-install.patch b/9999/0001-Disable-ldconfig-during-install.patch index 5dc96e2..b038b00 100644 --- a/9999/0001-Disable-ldconfig-during-install.patch +++ b/9999/0001-Disable-ldconfig-during-install.patch @@ -1,7 +1,7 @@ -From 2c5f0265999e3469b81a8cf27d713f212746a352 Mon Sep 17 00:00:00 2001 +From f3204fbe0db88620ef54a3b3ca26a345f53a08a8 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <[email protected]> Date: Tue, 3 Aug 2021 00:34:59 +0200 -Subject: [PATCH 1/9] Disable ldconfig during install +Subject: [PATCH 1/6] Disable ldconfig during install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -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 a4f3378e21..dca38dd666 100644 +index 430a0942eb..ca8d833c51 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,7 @@ elf/ldso_install: @@ -31,5 +31,5 @@ index a4f3378e21..dca38dd666 100644 $(elf-objpfx)ldconfig $(addprefix -r ,$(install_root)) \ $(slibdir) $(libdir) -- -2.41.0 +2.45.2 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 44af542..1ef2d6c 100644 --- a/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch +++ b/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch @@ -1,7 +1,7 @@ -From e6abcb198ba9bbc848fe00af7da56daff3da7048 Mon Sep 17 00:00:00 2001 +From 01d781a5ff9392dccf849c3a9ce3063375c11431 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/9] Adapt to Gentoo-specific /etc/mail/aliases +Subject: [PATCH 2/6] Adapt to Gentoo-specific /etc/mail/aliases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -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 4601cb6ce9..0ce3cddca1 100644 +index 14a59b4655..2c4b208b25 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 4601cb6ce9..0ce3cddca1 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 a62e137614..f0cd132ce6 100644 +index 290c5e9b4b..c2bdf52e40 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,7 +80,7 @@ index a62e137614..f0cd132ce6 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 7a1b7272f0..500c9a79a3 100644 +index 809342c8a2..492c656069 100644 --- a/support/support_chroot.c +++ b/support/support_chroot.c @@ -52,13 +52,19 @@ support_chroot_create (struct support_chroot_configuration conf) @@ -105,5 +105,5 @@ index 7a1b7272f0..500c9a79a3 100644 /* valgrind needs a temporary directory in the chroot. */ { -- -2.41.0 +2.45.2 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 15d4bab..8b59649 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,7 +1,7 @@ -From 848cc4f87354309e6298112270622f1456eed862 Mon Sep 17 00:00:00 2001 +From 65ca896f1fe058040a88356a573ecb1ffca3aa58 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/9] Force -O0 in conform tests to survive $CC changes +Subject: [PATCH 3/6] Force -O0 in conform tests to survive $CC changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -60,7 +60,6 @@ index 8bc42bee22..2f8842456b 100644 c_syms = glibcconform.list_exported_functions(compiler, args.standard, args.header) with tempfile.TemporaryDirectory() as temp_dir: - -- -2.47.1 +2.45.2 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 ddb3660..603cfa7 100644 --- a/9999/0004-linux-Use-getdents64-on-non-LFS-readdir.patch +++ b/9999/0004-linux-Use-getdents64-on-non-LFS-readdir.patch @@ -1,7 +1,7 @@ -From 3fac92713621f894d33a9f499bacb5b20f0d8ec3 Mon Sep 17 00:00:00 2001 +From 174cb5ca4d4678054edd2be171b14cfa85aee90a Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <[email protected]> Date: Tue, 20 Oct 2020 13:37:15 -0300 -Subject: [PATCH 1/3] linux: Use getdents64 on non-LFS readdir +Subject: [PATCH 4/6] linux: Use getdents64 on non-LFS readdir It is similar to what non-LFS getdents do (including overflow check). @@ -132,5 +132,5 @@ index 33bae4b57d..4e2214f21e 100644 struct dirent * -- -2.41.0 +2.45.2 diff --git a/9999/0005-support-Add-xreallocarray.patch b/9999/0005-support-Add-xreallocarray.patch index dbfae4d..975f476 100644 --- a/9999/0005-support-Add-xreallocarray.patch +++ b/9999/0005-support-Add-xreallocarray.patch @@ -1,7 +1,7 @@ -From 7d0638e792ebe528af3f6d8e353eff68157d7105 Mon Sep 17 00:00:00 2001 +From 1be0d15708736f689ab2cc371a1576b029623a7a Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <[email protected]> Date: Wed, 1 Mar 2023 14:41:23 -0300 -Subject: [PATCH 2/3] support: Add xreallocarray +Subject: [PATCH 5/6] support: Add xreallocarray As a wrapper over reallocarray. --- @@ -12,10 +12,10 @@ As a wrapper over reallocarray. create mode 100644 support/xreallocarray.c diff --git a/support/Makefile b/support/Makefile -index 362a51f882..d056563c15 100644 +index 099f5ebb9c..ce19f5a2b8 100644 --- a/support/Makefile +++ b/support/Makefile -@@ -201,6 +201,7 @@ libsupport-routines = \ +@@ -210,6 +210,7 @@ libsupport-routines = \ xread \ xreadlink \ xrealloc \ @@ -24,7 +24,7 @@ index 362a51f882..d056563c15 100644 xsendto \ xsetlocale \ diff --git a/support/support.h b/support/support.h -index ba21ec9b5a..b4e31e4483 100644 +index 1a77f79793..78ad445b65 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.41.0 +2.45.2 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 6450910..a0120ed 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,8 +1,11 @@ -From 6d5975652503acffae0566500cc15f8efc89e30a Mon Sep 17 00:00:00 2001 +From 8773ba65007694b27613d9e8dfc6137c90ae462d Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <[email protected]> Date: Mon, 13 Apr 2020 18:09:20 -0300 -Subject: [PATCH 3/3] linux: Set internal DIR filepos as off64_t (BZ #23960, BZ +Subject: [PATCH 6/6] linux: Set internal DIR filepos as off64_t (BZ #23960, BZ #24050) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit It allows to obtain the expected entry offset on telldir and set it correctly on seekdir on platforms where long int is smaller @@ -23,6 +26,8 @@ telldir (BZ #24050). Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc-linux-gnu, and arm-linux-gnueabihf. + +Rebased for glibc-2.41 by Andreas K. Hüttel <[email protected]> --- include/dirent.h | 2 +- sysdeps/unix/sysv/linux/Makefile | 2 + @@ -59,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 415aa1f14d..d5b6e26e76 100644 +index eb9c697ce5..f86100006b 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile -@@ -574,6 +574,8 @@ sysdep_routines += \ +@@ -590,6 +590,8 @@ sysdep_routines += \ tests += \ tst-getdents64 \ @@ -194,10 +199,10 @@ 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 e6f5108c0a..d61c5e6e26 100644 +index e6b8867b7a..34c55196ec 100644 --- a/sysdeps/unix/sysv/linux/readdir64.c +++ b/sysdeps/unix/sysv/linux/readdir64.c -@@ -68,6 +68,17 @@ __readdir64 (DIR *dirp) +@@ -61,6 +61,17 @@ __readdir64_unlocked (DIR *dirp) dirp->offset += dp->d_reclen; dirp->filepos = dp->d_off; @@ -212,9 +217,9 @@ index e6f5108c0a..d61c5e6e26 100644 + } +#endif + - #if IS_IN (libc) - __libc_lock_unlock (dirp->lock); - #endif + return dp; + } + diff --git a/sysdeps/unix/sysv/linux/rewinddir.c b/sysdeps/unix/sysv/linux/rewinddir.c index af85000a28..4936be5c6a 100644 --- a/sysdeps/unix/sysv/linux/rewinddir.c @@ -570,5 +575,5 @@ index 0000000000..216ecf123f + +#include <support/test-driver.c> -- -2.41.0 +2.45.2
