From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DED3E15808B for ; Sat, 16 Apr 2022 11:54:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27E31E0985; Sat, 16 Apr 2022 11:54:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 508D6E0995 for ; Sat, 16 Apr 2022 11:54:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12215341971 for ; Sat, 16 Apr 2022 11:54:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7804B303 for ; Sat, 16 Apr 2022 11:54:11 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1650110028.825c8462d8704328bf7c1e1c4416c9a191f85b6a.dilfridge@gentoo> Subject: [gentoo-commits] proj/toolchain/glibc-patches:master commit in: 9999/ X-VCS-Repository: proj/toolchain/glibc-patches X-VCS-Files: 9999/0001-Disable-ldconfig-during-install.patch 9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch 9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch 9999/0004-Force-O0-in-conform-tests-to-survive-CC-changes.patch 9999/0005-Fix-miscompilation-on-ia64-s-gcc-10.patch 9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch 9999/0006-Fix-miscompilation-on-ia64-s-gcc-10.patch 9999/0006-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch 9999/0007-linux-Use-getdents64-on-non-LFS-readdir.patch 9999/0008-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch 9999/0009-linux-Add-__readdir64_unlocked.patch 9999/0010-linux-Add-__old_readdir64_unlocked.patch 9999/0011-linux-Use-getdents64-on-readdir64-compat-implementat.patch 9999/0012-dirent-Deprecate-getdirentries.patch 9999/0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch 9999/0014-Drop-glibc-lock-when-returning-early.patch 9999/0201-linux-Do-not-skip-entries-with-zero-d_ino -values-BZ-.patch 9999/0202-linux-Use-getdents64-on-non-LFS-readdir.patch 9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch 9999/0204-linux-Add-__readdir64_unlocked.patch 9999/0205-linux-Add-__old_readdir64_unlocked.patch 9999/0206-linux-Use-getdents64-on-readdir64-compat-implementat.patch 9999/0207-dirent-Deprecate-getdirentries.patch 9999/0301-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch 9999/0302-Drop-glibc-lock-when-returning-early.patch X-VCS-Directories: 9999/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 825c8462d8704328bf7c1e1c4416c9a191f85b6a X-VCS-Branch: master Date: Sat, 16 Apr 2022 11:54:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 94394a4b-1f82-4896-accd-c079abea43e1 X-Archives-Hash: 485b5b0f9b911e662c5ca8d84d593dea commit: 825c8462d8704328bf7c1e1c4416c9a191f85b6a Author: WANG Xuerui gentoo org> AuthorDate: Sat Apr 16 07:28:10 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 16 11:53:48 2022 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=825c8462 Rebase all Signed-off-by: WANG Xuerui gentoo.org> Signed-off-by: Andreas K. Hüttel gentoo.org> 9999/0001-Disable-ldconfig-during-install.patch | 4 +- ...eps-posix-getaddrinfo.c-gaih_inet-Only-us.patch | 43 +++++++++++----------- ...Adapt-to-Gentoo-specific-etc-mail-aliases.patch | 4 +- ...0-in-conform-tests-to-survive-CC-changes.patch} | 4 +- ...0005-Fix-miscompilation-on-ia64-s-gcc-10.patch} | 4 +- ...-skip-entries-with-zero-d_ino-values-BZ-.patch} | 6 +-- ...-linux-Use-getdents64-on-non-LFS-readdir.patch} | 6 +-- ...ternal-DIR-filepos-as-off64_t-BZ-23960-B.patch} | 6 +-- ...h => 0009-linux-Add-__readdir64_unlocked.patch} | 6 +-- ... 0010-linux-Add-__old_readdir64_unlocked.patch} | 6 +-- ...tdents64-on-readdir64-compat-implementat.patch} | 6 +-- ...h => 0012-dirent-Deprecate-getdirentries.patch} | 16 ++++---- ...ult-in-getpwuid-when-stat-fails-BZ-28752.patch} | 6 +-- ...014-Drop-glibc-lock-when-returning-early.patch} | 6 +-- 14 files changed, 61 insertions(+), 62 deletions(-) diff --git a/9999/0001-Disable-ldconfig-during-install.patch b/9999/0001-Disable-ldconfig-during-install.patch index fde0cbb..65e2357 100644 --- a/9999/0001-Disable-ldconfig-during-install.patch +++ b/9999/0001-Disable-ldconfig-during-install.patch @@ -1,4 +1,4 @@ -From 77b6eec2fbc116152cdc0362448e89a22ea1ae83 Mon Sep 17 00:00:00 2001 +From 4ec3b3446cac3917499fba2c3067dc39bb24bf83 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 3 Aug 2021 00:34:59 +0200 Subject: [PATCH 01/14] Disable ldconfig during install @@ -27,5 +27,5 @@ index b1454882bd..73c3ef1e76 100644 $(elf-objpfx)ldconfig $(addprefix -r ,$(install_root)) \ $(slibdir) $(libdir) -- -2.34.1 +2.35.1 diff --git a/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch b/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch index d6cd1b3..59c2b86 100644 --- a/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch +++ b/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch @@ -1,4 +1,4 @@ -From 93e05c56a80d3145e3552ea611f2bd8c755d5887 Mon Sep 17 00:00:00 2001 +From afd71f4f5c995d68a00f0d34210d80eaf08dbed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Tue, 29 Aug 2017 22:58:50 +0200 Subject: [PATCH 02/14] Revert " * sysdeps/posix/getaddrinfo.c (gaih_inet): @@ -13,14 +13,14 @@ See for the background This makes tst-nss-files-hosts-multi fail. Disable it. --- nss/Makefile | 1 - - sysdeps/posix/getaddrinfo.c | 9 ++------- - 2 files changed, 2 insertions(+), 8 deletions(-) + sysdeps/posix/getaddrinfo.c | 8 ++------ + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nss/Makefile b/nss/Makefile -index 552e5d03e1..35ec106e0c 100644 +index d8b06b44fb..e3639f78ec 100644 --- a/nss/Makefile +++ b/nss/Makefile -@@ -74,7 +74,6 @@ tests-container = \ +@@ -85,7 +85,6 @@ tests-container := \ # Tests which need libdl ifeq (yes,$(build-shared)) tests += tst-nss-files-hosts-erange @@ -29,25 +29,24 @@ index 552e5d03e1..35ec106e0c 100644 tests += tst-nss-files-alias-leak tests += tst-nss-files-alias-truncated diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c -index 18dccd5924..2cca006f3d 100644 +index bcff909b2f..09954dee22 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c -@@ -733,13 +733,8 @@ gaih_inet (const char *name, const struct gaih_service *service, - while (!no_more) - { - no_data = 0; -- nss_gethostbyname4_r *fct4 = NULL; +@@ -623,12 +623,8 @@ get_nss_addresses (const char *name, const struct addrinfo *req, + } + + no_data = 0; +- nss_gethostbyname4_r *fct4 = NULL; - -- /* gethostbyname4_r sends out parallel A and AAAA queries and -- is thus only suitable for PF_UNSPEC. */ -- if (req->ai_family == PF_UNSPEC) -- fct4 = __nss_lookup_function (nip, "gethostbyname4_r"); -- -+ nss_gethostbyname4_r *fct4 -+ = __nss_lookup_function (nip, "gethostbyname4_r"); - if (fct4 != NULL) - { - while (1) +- /* gethostbyname4_r sends out parallel A and AAAA queries and +- is thus only suitable for PF_UNSPEC. */ +- if (req->ai_family == PF_UNSPEC) +- fct4 = __nss_lookup_function (nip, "gethostbyname4_r"); ++ nss_gethostbyname4_r *fct4 ++ = __nss_lookup_function (nip, "gethostbyname4_r"); + + if (fct4 != NULL) + { -- -2.34.1 +2.35.1 diff --git a/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch b/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch index 32c5e4a..a9d0605 100644 --- a/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch +++ b/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch @@ -1,4 +1,4 @@ -From 6e27ad8827f67f742aa53b72c141002085e7e1a8 Mon Sep 17 00:00:00 2001 +From 4a1235321c3749726d4f0b3ed0f0769a40d714f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Mon, 22 Oct 2018 22:34:13 +0200 Subject: [PATCH 03/14] Adapt to Gentoo-specific /etc/mail/aliases @@ -104,5 +104,5 @@ index 4bf6fe0834..1548eba2ad 100644 /* valgrind needs a temporary directory in the chroot. */ { -- -2.34.1 +2.35.1 diff --git a/9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch b/9999/0004-Force-O0-in-conform-tests-to-survive-CC-changes.patch similarity index 97% rename from 9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch rename to 9999/0004-Force-O0-in-conform-tests-to-survive-CC-changes.patch index d39eb5d..ce101ab 100644 --- a/9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch +++ b/9999/0004-Force-O0-in-conform-tests-to-survive-CC-changes.patch @@ -1,4 +1,4 @@ -From 16337b6a4a14c8eb7ae57341aa04d7d571f00783 Mon Sep 17 00:00:00 2001 +From 6f332b192b1e0a502d904c608630e3392dd69d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 14 Dec 2018 20:43:04 +0100 Subject: [PATCH 04/14] Force -O0 in conform tests to survive $CC changes @@ -61,5 +61,5 @@ index f7fe3a7a0a..ad87fd2a6d 100644 args.header) with tempfile.TemporaryDirectory() as temp_dir: -- -2.34.1 +2.35.1 diff --git a/9999/0006-Fix-miscompilation-on-ia64-s-gcc-10.patch b/9999/0005-Fix-miscompilation-on-ia64-s-gcc-10.patch similarity index 94% rename from 9999/0006-Fix-miscompilation-on-ia64-s-gcc-10.patch rename to 9999/0005-Fix-miscompilation-on-ia64-s-gcc-10.patch index 6fb25e1..9024676 100644 --- a/9999/0006-Fix-miscompilation-on-ia64-s-gcc-10.patch +++ b/9999/0005-Fix-miscompilation-on-ia64-s-gcc-10.patch @@ -1,4 +1,4 @@ -From 7fedf8c50534b2930caf2fad55cd98b9eed36e82 Mon Sep 17 00:00:00 2001 +From da8126c1493016b2c9aed0c34b240619b7aee075 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 11 Jul 2020 20:06:51 +0300 Subject: [PATCH 05/14] Fix miscompilation on ia64's gcc-10 @@ -28,5 +28,5 @@ index 0d2a1d093a..b50694d6f3 100644 # define DL_SYSINFO_IMPLEMENTATION \ asm (".text\n\t" \ -- -2.34.1 +2.35.1 diff --git a/9999/0201-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch b/9999/0006-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch similarity index 97% rename from 9999/0201-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch rename to 9999/0006-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch index 221dbd6..eae612d 100644 --- a/9999/0201-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch +++ b/9999/0006-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch @@ -1,7 +1,7 @@ -From 58b842de801f64de1d323ecceaf24b7cd30cbb87 Mon Sep 17 00:00:00 2001 +From 2a131fefbe72a749fe28b426a37b499bf7255cdf Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 20 Oct 2020 12:18:56 -0300 -Subject: [PATCH 07/14] linux: Do not skip entries with zero d_ino values [BZ +Subject: [PATCH 06/14] linux: Do not skip entries with zero d_ino values [BZ #12165] According to Linux commit 2adc376c55194 (vfs: avoid creation of inode @@ -178,5 +178,5 @@ index e876d84b02..d990a36e4e 100644 #if IS_IN (libc) __libc_lock_unlock (dirp->lock); -- -2.34.1 +2.35.1 diff --git a/9999/0202-linux-Use-getdents64-on-non-LFS-readdir.patch b/9999/0007-linux-Use-getdents64-on-non-LFS-readdir.patch similarity index 97% rename from 9999/0202-linux-Use-getdents64-on-non-LFS-readdir.patch rename to 9999/0007-linux-Use-getdents64-on-non-LFS-readdir.patch index 762a943..6f8081f 100644 --- a/9999/0202-linux-Use-getdents64-on-non-LFS-readdir.patch +++ b/9999/0007-linux-Use-getdents64-on-non-LFS-readdir.patch @@ -1,7 +1,7 @@ -From 057920ea715c979638045d2966d6a7c616f3cbc2 Mon Sep 17 00:00:00 2001 +From bda59ff47746fdec69cf4a695d6aeaa4aae2acf8 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 20 Oct 2020 13:37:15 -0300 -Subject: [PATCH 08/14] linux: Use getdents64 on non-LFS readdir +Subject: [PATCH 07/14] linux: Use getdents64 on non-LFS readdir The opendir allocates a translation buffer to be used to return the non-LFS readdir entry. The obtained dirent64 struct is translated @@ -200,5 +200,5 @@ index 7743f50071..7b4571839e 100644 struct dirent * -- -2.34.1 +2.35.1 diff --git a/9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch b/9999/0008-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch similarity index 99% rename from 9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch rename to 9999/0008-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch index bde1527..68d9ce0 100644 --- a/9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch +++ b/9999/0008-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch @@ -1,7 +1,7 @@ -From 0afb8fa52cded9c332c31c7a1e62b9f2b04acdf8 Mon Sep 17 00:00:00 2001 +From 90aa2d426422b6acc0e7f2b9d8afa2718098601b Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 13 Apr 2020 18:09:20 -0300 -Subject: [PATCH 09/14] linux: Set internal DIR filepos as off64_t [BZ #23960, +Subject: [PATCH 08/14] linux: Set internal DIR filepos as off64_t [BZ #23960, BZ #24050] It allows to obtain the expected entry offset on telldir and set @@ -490,5 +490,5 @@ index 0000000000..7c45886341 + +#endif /* _TELLDIR_H */ -- -2.34.1 +2.35.1 diff --git a/9999/0204-linux-Add-__readdir64_unlocked.patch b/9999/0009-linux-Add-__readdir64_unlocked.patch similarity index 97% rename from 9999/0204-linux-Add-__readdir64_unlocked.patch rename to 9999/0009-linux-Add-__readdir64_unlocked.patch index 839b18d..2453183 100644 --- a/9999/0204-linux-Add-__readdir64_unlocked.patch +++ b/9999/0009-linux-Add-__readdir64_unlocked.patch @@ -1,7 +1,7 @@ -From 333f932faec29e5c9238d3d1f8584acc25d986c0 Mon Sep 17 00:00:00 2001 +From 91dd23b0cf7a3aa11fae6cd3e71e9d49409f17b0 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 13 Apr 2020 08:35:40 -0300 -Subject: [PATCH 10/14] linux: Add __readdir64_unlocked +Subject: [PATCH 09/14] linux: Add __readdir64_unlocked And use it on readdir_r implementation. @@ -177,5 +177,5 @@ index afd7f9af0f..32962a176a 100644 -- -2.34.1 +2.35.1 diff --git a/9999/0205-linux-Add-__old_readdir64_unlocked.patch b/9999/0010-linux-Add-__old_readdir64_unlocked.patch similarity index 97% rename from 9999/0205-linux-Add-__old_readdir64_unlocked.patch rename to 9999/0010-linux-Add-__old_readdir64_unlocked.patch index 42c9d1d..d795095 100644 --- a/9999/0205-linux-Add-__old_readdir64_unlocked.patch +++ b/9999/0010-linux-Add-__old_readdir64_unlocked.patch @@ -1,7 +1,7 @@ -From b69d95b17a828f5f39b577c00ff0d02e4c0a5da6 Mon Sep 17 00:00:00 2001 +From fa48dff4045e66ef9c65b33e80dbfb1390500b6b Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 14 Apr 2020 11:14:22 -0300 -Subject: [PATCH 11/14] linux: Add __old_readdir64_unlocked +Subject: [PATCH 10/14] linux: Add __old_readdir64_unlocked And use it __old_readdir64_r. @@ -180,5 +180,5 @@ index 32962a176a..699d120b76 100644 compat_symbol (libc, __old_readdir64_r, readdir64_r, GLIBC_2_1); -- -2.34.1 +2.35.1 diff --git a/9999/0206-linux-Use-getdents64-on-readdir64-compat-implementat.patch b/9999/0011-linux-Use-getdents64-on-readdir64-compat-implementat.patch similarity index 98% rename from 9999/0206-linux-Use-getdents64-on-readdir64-compat-implementat.patch rename to 9999/0011-linux-Use-getdents64-on-readdir64-compat-implementat.patch index 889266d..616e44d 100644 --- a/9999/0206-linux-Use-getdents64-on-readdir64-compat-implementat.patch +++ b/9999/0011-linux-Use-getdents64-on-readdir64-compat-implementat.patch @@ -1,7 +1,7 @@ -From a5aee8e0e844f9f9cf8df0a41e67cddf8de7540f Mon Sep 17 00:00:00 2001 +From 201d65ca12185f171be7b532b16bc315af7d45c3 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 20 Oct 2020 16:00:43 -0300 -Subject: [PATCH 12/14] linux: Use getdents64 on readdir64 compat +Subject: [PATCH 11/14] linux: Use getdents64 on readdir64 compat implementation It uses a similar strategy from the non-LFS readdir that also @@ -294,5 +294,5 @@ index dbf6a8c54d..4b41299c6c 100644 attribute_compat_text_section -- -2.34.1 +2.35.1 diff --git a/9999/0207-dirent-Deprecate-getdirentries.patch b/9999/0012-dirent-Deprecate-getdirentries.patch similarity index 90% rename from 9999/0207-dirent-Deprecate-getdirentries.patch rename to 9999/0012-dirent-Deprecate-getdirentries.patch index 42e3002..8be7591 100644 --- a/9999/0207-dirent-Deprecate-getdirentries.patch +++ b/9999/0012-dirent-Deprecate-getdirentries.patch @@ -1,7 +1,7 @@ -From 96f2c068b5aa972b23cfe25d3c8042fed1056607 Mon Sep 17 00:00:00 2001 +From 40ec9c0d2bdeee4192885f7781167afdeeee899d Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 17 Apr 2020 09:59:51 -0300 -Subject: [PATCH 13/14] dirent: Deprecate getdirentries +Subject: [PATCH 12/14] dirent: Deprecate getdirentries The interface has some issues: @@ -23,7 +23,7 @@ The idea is to eventually move the symbols to compat ones. 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS -index 626eeabf5d..ed5b7b641f 100644 +index 4b6d9de2b5..b00c803a1c 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,12 @@ Security related changes: @@ -40,10 +40,10 @@ index 626eeabf5d..ed5b7b641f 100644 [The release manager will add the list generated by diff --git a/dirent/dirent.h b/dirent/dirent.h -index 218f1ed44b..b2737bc53b 100644 +index c47d3273b2..1c299e5be8 100644 --- a/dirent/dirent.h +++ b/dirent/dirent.h -@@ -348,29 +348,35 @@ extern int alphasort64 (const struct dirent64 **__e1, +@@ -350,29 +350,35 @@ extern int alphasort64 (const struct dirent64 **__e1, /* Read directory entries from FD into BUF, reading at most NBYTES. Reading starts at offset *BASEP, and *BASEP is updated with the new position after reading. Returns the number of bytes read; zero when at @@ -84,10 +84,10 @@ index 218f1ed44b..b2737bc53b 100644 #endif /* Use misc. */ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile -index 7122f55975..c9b43898b2 100644 +index ca953804d0..26794e4fef 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile -@@ -338,6 +338,10 @@ tests += tst-getdents64 +@@ -341,6 +341,10 @@ tests += tst-getdents64 ifeq ($(have-GLIBC_2.1.3)$(build-shared),yesyes) tests += tst-readdir64-compat endif @@ -99,5 +99,5 @@ index 7122f55975..c9b43898b2 100644 ifeq ($(subdir),nis) -- -2.34.1 +2.35.1 diff --git a/9999/0301-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch b/9999/0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch similarity index 91% rename from 9999/0301-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch rename to 9999/0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch index 48036b3..32fd8a6 100644 --- a/9999/0301-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch +++ b/9999/0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch @@ -1,7 +1,7 @@ -From 7032e8bf35b229ff759286435f1f51b5588b56ed Mon Sep 17 00:00:00 2001 +From ce54d71af85a735b3ddf29bde1f6ee6e0844d352 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Sat, 12 Feb 2022 19:40:58 +0100 -Subject: [PATCH 14/14] Fix segfault in getpwuid when stat fails (BZ #28752) +Subject: [PATCH 13/14] Fix segfault in getpwuid when stat fails (BZ #28752) [azanella proposed this patch to sam when discussing the issue, but it's not anywhere upstream yet- dilfridge] @@ -34,5 +34,5 @@ index d56c5b798d..133682b858 100644 /* Change detected; disable reloading and return current state. */ atomic_store_release (&local->data.reload_disabled, 1); -- -2.34.1 +2.35.1 diff --git a/9999/0302-Drop-glibc-lock-when-returning-early.patch b/9999/0014-Drop-glibc-lock-when-returning-early.patch similarity index 89% rename from 9999/0302-Drop-glibc-lock-when-returning-early.patch rename to 9999/0014-Drop-glibc-lock-when-returning-early.patch index 4eab4ea..ccb544e 100644 --- a/9999/0302-Drop-glibc-lock-when-returning-early.patch +++ b/9999/0014-Drop-glibc-lock-when-returning-early.patch @@ -1,7 +1,7 @@ -From fd939e8740a97b3ffc5816cebb7be947c7b560af Mon Sep 17 00:00:00 2001 +From f0967c21f82d9b6db6faa41315f668f56e38562f Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 7 Mar 2022 01:59:53 +0100 -Subject: [PATCH] Drop glibc lock when returning early +Subject: [PATCH 14/14] Drop glibc lock when returning early MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -32,5 +32,5 @@ index 133682b858..5f58baf34b 100644 if (local->root_ino != 0 && (str.st_ino != local->root_ino || str.st_dev != local->root_dev)) -- -2.34.1 +2.35.1