Rebase for upcoming glibc 2.38

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

9 files changed, 23 insertions, 23 deletions

diff --git a/9999/0001-Disable-ldconfig-during-install.patch b/9999/0001-Disable-ldconfig-during-install.patch
index e947fac..117d65d 100644
--- a/9999/0001-Disable-ldconfig-during-install.patch
+++ b/9999/0001-Disable-ldconfig-during-install.patch
@@ -1,4 +1,4 @@
-From 3b59ad9dec2c1c7f1b4c7f72d14ea3f2b68a4eca Mon Sep 17 00:00:00 2001
+From 3924368571ae2b77a8465de8bb7ec7e6288dae67 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Tue, 3 Aug 2021 00:34:59 +0200
 Subject: [PATCH 1/9] Disable ldconfig during install
@@ -19,7 +19,7 @@ Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index 224c792185..be9df042e0 100644
+index f324df7a1f..0221906533 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -110,6 +110,7 @@ elf/ldso_install:
@@ -31,5 +31,5 @@ index 224c792185..be9df042e0 100644
  	  $(elf-objpfx)ldconfig $(addprefix -r ,$(install_root)) \
  				$(slibdir) $(libdir)
 -- 
-2.39.1
+2.39.3
 
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 09c2dde..52d6412 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 d8a45f4bfa30b502647a9ef742836c7e8694d009 Mon Sep 17 00:00:00 2001
+From bc18d3d2140f40e43f9767bf8964eca3b2d0da17 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
 Date: Mon, 22 Oct 2018 22:34:13 +0200
 Subject: [PATCH 2/9] Adapt to Gentoo-specific /etc/mail/aliases
@@ -18,7 +18,7 @@ Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
  3 files changed, 17 insertions(+), 11 deletions(-)
 
 diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c
-index 1c32884fe7..f40fd19288 100644
+index 4601cb6ce9..0ce3cddca1 100644
 --- a/nss/nss_files/files-alias.c
 +++ b/nss/nss_files/files-alias.c
 @@ -42,7 +42,7 @@ internal_setent (FILE **stream)
@@ -105,5 +105,5 @@ index 7a1b7272f0..500c9a79a3 100644
    /* valgrind needs a temporary directory in the chroot.  */
    {
 -- 
-2.39.1
+2.39.3
 
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 ac36f58..d890165 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 d2b4275295e9c5a312063c3bce663ae1dcf754f0 Mon Sep 17 00:00:00 2001
+From 85d0916ff499c8d9d135cd5200ec1d4797a74565 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
 Date: Fri, 14 Dec 2018 20:43:04 +0100
 Subject: [PATCH 3/9] Force -O0 in conform tests to survive $CC changes
@@ -61,5 +61,5 @@ index 983bba1bd2..b6fce8a21c 100644
                                                    args.header)
      with tempfile.TemporaryDirectory() as temp_dir:
 -- 
-2.39.1
+2.39.3
 
diff --git a/9999/0004-Fix-miscompilation-on-ia64-s-gcc-10.patch b/9999/0004-Fix-miscompilation-on-ia64-s-gcc-10.patch
index 215b5fa..8357101 100644
--- a/9999/0004-Fix-miscompilation-on-ia64-s-gcc-10.patch
+++ b/9999/0004-Fix-miscompilation-on-ia64-s-gcc-10.patch
@@ -1,4 +1,4 @@
-From 7a2ab3f8d680338aff2559541a4bb748618e16f6 Mon Sep 17 00:00:00 2001
+From ed428afb4c6353692fba6cedaa2f9db7bc9fb551 Mon Sep 17 00:00:00 2001
 From: Sergei Trofimovich <slyfox@gentoo.org>
 Date: Sat, 11 Jul 2020 20:06:51 +0300
 Subject: [PATCH 4/9] Fix miscompilation on ia64's gcc-10
@@ -28,5 +28,5 @@ index 3e4d5da820..eb7681b704 100644
  # define DL_SYSINFO_IMPLEMENTATION		\
    asm (".text\n\t"				\
 -- 
-2.39.1
+2.39.3
 
diff --git a/9999/0005-linux-Use-getdents64-on-non-LFS-readdir.patch b/9999/0005-linux-Use-getdents64-on-non-LFS-readdir.patch
index 4cb21bf..3bae810 100644
--- a/9999/0005-linux-Use-getdents64-on-non-LFS-readdir.patch
+++ b/9999/0005-linux-Use-getdents64-on-non-LFS-readdir.patch
@@ -1,4 +1,4 @@
-From 1652c61d24e43a0efd1fd4812f4a67494d093cc2 Mon Sep 17 00:00:00 2001
+From bc521cf2674e2a27cc4a0dfd638c151462d51d1b Mon Sep 17 00:00:00 2001
 From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
 Date: Fri, 27 Jan 2023 14:28:30 -0300
 Subject: [PATCH 5/9] linux: Use getdents64 on non-LFS readdir
@@ -177,5 +177,5 @@ index 4a4c00ea07..cd0ccaf33a 100644
  
  struct dirent *
 -- 
-2.39.1
+2.39.3
 
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 59e01fc..69f6ca0 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 861793671bd8daeed1f00902d9a9523ddae77462 Mon Sep 17 00:00:00 2001
+From 61beae8ace3127d476570b8989ec4d60f421b94e Mon Sep 17 00:00:00 2001
 From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
 Date: Fri, 27 Jan 2023 14:28:31 -0300
 Subject: [PATCH 6/9] linux: Set internal DIR filepos as off64_t (BZ #23960, BZ
@@ -61,11 +61,11 @@ index dcdd699b09..187eda7584 100644
    printf ("going back past 4-th entry...\n");
  
 diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
-index f8bd12d991..09adb99b86 100644
+index be801e3be4..29c747b387 100644
 --- a/sysdeps/unix/sysv/linux/Makefile
 +++ b/sysdeps/unix/sysv/linux/Makefile
-@@ -464,6 +464,7 @@ ifeq ($(subdir),dirent)
- sysdep_routines += getdirentries getdirentries64
+@@ -546,6 +546,7 @@ sysdep_routines += \
+ 
  tests += \
    tst-getdents64 \
 +  tst-opendir-nolfs \
@@ -530,5 +530,5 @@ index 0000000000..52e18171a7
 +
 +#include <support/test-driver.c>
 -- 
-2.39.1
+2.39.3
 
diff --git a/9999/0007-linux-Add-__readdir64_unlocked.patch b/9999/0007-linux-Add-__readdir64_unlocked.patch
index 18dcda4..73bf546 100644
--- a/9999/0007-linux-Add-__readdir64_unlocked.patch
+++ b/9999/0007-linux-Add-__readdir64_unlocked.patch
@@ -1,4 +1,4 @@
-From f697eec9ff1939e46d7730aa5cc0f696f41d8bd7 Mon Sep 17 00:00:00 2001
+From aa6bdde21d0305ce4e95fd49f7b36524ba92e745 Mon Sep 17 00:00:00 2001
 From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
 Date: Fri, 27 Jan 2023 14:28:32 -0300
 Subject: [PATCH 7/9] linux: Add __readdir64_unlocked
@@ -178,5 +178,5 @@ index 285dc99509..5ae099bde7 100644
  
  
 -- 
-2.39.1
+2.39.3
 
diff --git a/9999/0008-linux-Add-__old_readdir64_unlocked.patch b/9999/0008-linux-Add-__old_readdir64_unlocked.patch
index a1d289a..200d275 100644
--- a/9999/0008-linux-Add-__old_readdir64_unlocked.patch
+++ b/9999/0008-linux-Add-__old_readdir64_unlocked.patch
@@ -1,4 +1,4 @@
-From 5af443d8a53475680fdc51ff1c496b13a9e9e6d0 Mon Sep 17 00:00:00 2001
+From 906b7cf87806610267ffff0b850b138bd1fd2098 Mon Sep 17 00:00:00 2001
 From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
 Date: Fri, 27 Jan 2023 14:28:33 -0300
 Subject: [PATCH 8/9] linux: Add __old_readdir64_unlocked
@@ -190,5 +190,5 @@ index 5ae099bde7..b499388de7 100644
  
  compat_symbol (libc, __old_readdir64_r, readdir64_r, GLIBC_2_1);
 -- 
-2.39.1
+2.39.3
 
diff --git a/9999/0009-linux-Use-getdents64-on-readdir64-compat-implementat.patch b/9999/0009-linux-Use-getdents64-on-readdir64-compat-implementat.patch
index 644af1c..99429ea 100644
--- a/9999/0009-linux-Use-getdents64-on-readdir64-compat-implementat.patch
+++ b/9999/0009-linux-Use-getdents64-on-readdir64-compat-implementat.patch
@@ -1,4 +1,4 @@
-From b1ab50b1c7f17d6b38c1e3a665cca971ba16deab Mon Sep 17 00:00:00 2001
+From 8eb2ff5f6f4040f238bd40083d6bfbb711fc675c Mon Sep 17 00:00:00 2001
 From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
 Date: Fri, 27 Jan 2023 14:28:34 -0300
 Subject: [PATCH 9/9] linux: Use getdents64 on readdir64 compat implementation
@@ -246,5 +246,5 @@ index b901071aa7..88e42c5e90 100644
  
  attribute_compat_text_section
 -- 
-2.39.1
+2.39.3