commit: c56aedc889ea22901113925b3e037c2019966a14 Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org> AuthorDate: Fri Jul 29 12:17:57 2022 +0000 Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org> CommitDate: Fri Jul 29 12:17:57 2022 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=c56aedc8
Rebase for the imminent 2.36 release Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> 9999/0001-Disable-ldconfig-during-install.patch | 6 +++--- ...02-Adapt-to-Gentoo-specific-etc-mail-aliases.patch} | 4 ++-- ...ce-O0-in-conform-tests-to-survive-CC-changes.patch} | 4 ++-- ... => 0004-Fix-miscompilation-on-ia64-s-gcc-10.patch} | 6 +++--- ...-not-skip-entries-with-zero-d_ino-values-BZ-.patch} | 4 ++-- ...0006-linux-Use-getdents64-on-non-LFS-readdir.patch} | 4 ++-- ...t-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch} | 4 ++-- ...patch => 0008-linux-Add-__readdir64_unlocked.patch} | 4 ++-- ...h => 0009-linux-Add-__old_readdir64_unlocked.patch} | 4 ++-- ...e-getdents64-on-readdir64-compat-implementat.patch} | 4 ++-- ...patch => 0011-dirent-Deprecate-getdirentries.patch} | 18 +++++++++--------- ...lone-internal.c-make-clone3-syscall-optional.patch} | 6 +++--- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/9999/0001-Disable-ldconfig-during-install.patch b/9999/0001-Disable-ldconfig-during-install.patch index 65e2357..7bc6628 100644 --- a/9999/0001-Disable-ldconfig-during-install.patch +++ b/9999/0001-Disable-ldconfig-during-install.patch @@ -1,7 +1,7 @@ -From 4ec3b3446cac3917499fba2c3067dc39bb24bf83 Mon Sep 17 00:00:00 2001 +From 4917be423cb1a70a66e90e39a73e986b011d7687 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vap...@gentoo.org> Date: Tue, 3 Aug 2021 00:34:59 +0200 -Subject: [PATCH 01/14] Disable ldconfig during install +Subject: [PATCH 01/12] Disable ldconfig during install Do not bother running ldconfig on DESTDIR. It's a waste of time as we won't use the result (portage will rebuild the cache after install). @@ -15,7 +15,7 @@ https://bugs.gentoo.org/431038 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index b1454882bd..73c3ef1e76 100644 +index 179dd478ff..763d6a084a 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,7 @@ elf/ldso_install: diff --git a/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch b/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch similarity index 96% rename from 9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch rename to 9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch index a9d0605..56b9db3 100644 --- a/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch +++ b/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch @@ -1,7 +1,7 @@ -From 4a1235321c3749726d4f0b3ed0f0769a40d714f9 Mon Sep 17 00:00:00 2001 +From a66ccda34dd319ce19255a029b746362d5773d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfri...@gentoo.org> Date: Mon, 22 Oct 2018 22:34:13 +0200 -Subject: [PATCH 03/14] Adapt to Gentoo-specific /etc/mail/aliases +Subject: [PATCH 02/12] Adapt to Gentoo-specific /etc/mail/aliases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/9999/0004-Force-O0-in-conform-tests-to-survive-CC-changes.patch b/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch similarity index 95% rename from 9999/0004-Force-O0-in-conform-tests-to-survive-CC-changes.patch rename to 9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch index ce101ab..95fc2c5 100644 --- a/9999/0004-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 6f332b192b1e0a502d904c608630e3392dd69d15 Mon Sep 17 00:00:00 2001 +From 68476d32783ea64c21bbd6d166a69fa881a3f22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfri...@gentoo.org> Date: Fri, 14 Dec 2018 20:43:04 +0100 -Subject: [PATCH 04/14] Force -O0 in conform tests to survive $CC changes +Subject: [PATCH 03/12] Force -O0 in conform tests to survive $CC changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/9999/0005-Fix-miscompilation-on-ia64-s-gcc-10.patch b/9999/0004-Fix-miscompilation-on-ia64-s-gcc-10.patch similarity index 87% rename from 9999/0005-Fix-miscompilation-on-ia64-s-gcc-10.patch rename to 9999/0004-Fix-miscompilation-on-ia64-s-gcc-10.patch index 9024676..b742135 100644 --- a/9999/0005-Fix-miscompilation-on-ia64-s-gcc-10.patch +++ b/9999/0004-Fix-miscompilation-on-ia64-s-gcc-10.patch @@ -1,7 +1,7 @@ -From da8126c1493016b2c9aed0c34b240619b7aee075 Mon Sep 17 00:00:00 2001 +From 88e7fe55212b0110dca46b5d3a4b7be8db404598 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich <sly...@gentoo.org> Date: Sat, 11 Jul 2020 20:06:51 +0300 -Subject: [PATCH 05/14] Fix miscompilation on ia64's gcc-10 +Subject: [PATCH 04/12] Fix miscompilation on ia64's gcc-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,7 +13,7 @@ Signed-off-by: Andreas K. Hüttel <dilfri...@gentoo.org> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h b/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h -index 0d2a1d093a..b50694d6f3 100644 +index aa1de6b361..f6472f1942 100644 --- a/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h +++ b/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h @@ -32,7 +32,9 @@ diff --git a/9999/0006-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch b/9999/0005-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch similarity index 97% rename from 9999/0006-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch rename to 9999/0005-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch index eae612d..33f9869 100644 --- a/9999/0006-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch +++ b/9999/0005-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch @@ -1,7 +1,7 @@ -From 2a131fefbe72a749fe28b426a37b499bf7255cdf Mon Sep 17 00:00:00 2001 +From ad50ce9ae10cdd50bd620ae6ef67fe3b11896913 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zane...@linaro.org> Date: Tue, 20 Oct 2020 12:18:56 -0300 -Subject: [PATCH 06/14] linux: Do not skip entries with zero d_ino values [BZ +Subject: [PATCH 05/12] linux: Do not skip entries with zero d_ino values [BZ #12165] According to Linux commit 2adc376c55194 (vfs: avoid creation of inode diff --git a/9999/0007-linux-Use-getdents64-on-non-LFS-readdir.patch b/9999/0006-linux-Use-getdents64-on-non-LFS-readdir.patch similarity index 98% rename from 9999/0007-linux-Use-getdents64-on-non-LFS-readdir.patch rename to 9999/0006-linux-Use-getdents64-on-non-LFS-readdir.patch index 6f8081f..b588195 100644 --- a/9999/0007-linux-Use-getdents64-on-non-LFS-readdir.patch +++ b/9999/0006-linux-Use-getdents64-on-non-LFS-readdir.patch @@ -1,7 +1,7 @@ -From bda59ff47746fdec69cf4a695d6aeaa4aae2acf8 Mon Sep 17 00:00:00 2001 +From 5e92232132d809ca1a4dde473e3b9d061754db90 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zane...@linaro.org> Date: Tue, 20 Oct 2020 13:37:15 -0300 -Subject: [PATCH 07/14] linux: Use getdents64 on non-LFS readdir +Subject: [PATCH 06/12] 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 diff --git a/9999/0008-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch b/9999/0007-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch similarity index 99% rename from 9999/0008-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch rename to 9999/0007-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch index 68d9ce0..a239bbc 100644 --- a/9999/0008-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch +++ b/9999/0007-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch @@ -1,7 +1,7 @@ -From 90aa2d426422b6acc0e7f2b9d8afa2718098601b Mon Sep 17 00:00:00 2001 +From a9813305234d6163d86aa78c062017f05b7a79d6 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zane...@linaro.org> Date: Mon, 13 Apr 2020 18:09:20 -0300 -Subject: [PATCH 08/14] linux: Set internal DIR filepos as off64_t [BZ #23960, +Subject: [PATCH 07/12] linux: Set internal DIR filepos as off64_t [BZ #23960, BZ #24050] It allows to obtain the expected entry offset on telldir and set diff --git a/9999/0009-linux-Add-__readdir64_unlocked.patch b/9999/0008-linux-Add-__readdir64_unlocked.patch similarity index 97% rename from 9999/0009-linux-Add-__readdir64_unlocked.patch rename to 9999/0008-linux-Add-__readdir64_unlocked.patch index 2453183..540ddf7 100644 --- a/9999/0009-linux-Add-__readdir64_unlocked.patch +++ b/9999/0008-linux-Add-__readdir64_unlocked.patch @@ -1,7 +1,7 @@ -From 91dd23b0cf7a3aa11fae6cd3e71e9d49409f17b0 Mon Sep 17 00:00:00 2001 +From 81cdcf158a683bb9c999967de2e332e5c5881bc9 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zane...@linaro.org> Date: Mon, 13 Apr 2020 08:35:40 -0300 -Subject: [PATCH 09/14] linux: Add __readdir64_unlocked +Subject: [PATCH 08/12] linux: Add __readdir64_unlocked And use it on readdir_r implementation. diff --git a/9999/0010-linux-Add-__old_readdir64_unlocked.patch b/9999/0009-linux-Add-__old_readdir64_unlocked.patch similarity index 97% rename from 9999/0010-linux-Add-__old_readdir64_unlocked.patch rename to 9999/0009-linux-Add-__old_readdir64_unlocked.patch index d795095..52af81a 100644 --- a/9999/0010-linux-Add-__old_readdir64_unlocked.patch +++ b/9999/0009-linux-Add-__old_readdir64_unlocked.patch @@ -1,7 +1,7 @@ -From fa48dff4045e66ef9c65b33e80dbfb1390500b6b Mon Sep 17 00:00:00 2001 +From 82605e1450880ac7d40f1b5d12eecbf2f0815535 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zane...@linaro.org> Date: Tue, 14 Apr 2020 11:14:22 -0300 -Subject: [PATCH 10/14] linux: Add __old_readdir64_unlocked +Subject: [PATCH 09/12] linux: Add __old_readdir64_unlocked And use it __old_readdir64_r. diff --git a/9999/0011-linux-Use-getdents64-on-readdir64-compat-implementat.patch b/9999/0010-linux-Use-getdents64-on-readdir64-compat-implementat.patch similarity index 98% rename from 9999/0011-linux-Use-getdents64-on-readdir64-compat-implementat.patch rename to 9999/0010-linux-Use-getdents64-on-readdir64-compat-implementat.patch index 616e44d..5bbea04 100644 --- a/9999/0011-linux-Use-getdents64-on-readdir64-compat-implementat.patch +++ b/9999/0010-linux-Use-getdents64-on-readdir64-compat-implementat.patch @@ -1,7 +1,7 @@ -From 201d65ca12185f171be7b532b16bc315af7d45c3 Mon Sep 17 00:00:00 2001 +From 7a72e18a7b710feea5375578450e11a106336102 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zane...@linaro.org> Date: Tue, 20 Oct 2020 16:00:43 -0300 -Subject: [PATCH 11/14] linux: Use getdents64 on readdir64 compat +Subject: [PATCH 10/12] linux: Use getdents64 on readdir64 compat implementation It uses a similar strategy from the non-LFS readdir that also diff --git a/9999/0012-dirent-Deprecate-getdirentries.patch b/9999/0011-dirent-Deprecate-getdirentries.patch similarity index 90% rename from 9999/0012-dirent-Deprecate-getdirentries.patch rename to 9999/0011-dirent-Deprecate-getdirentries.patch index 8be7591..c7abd61 100644 --- a/9999/0012-dirent-Deprecate-getdirentries.patch +++ b/9999/0011-dirent-Deprecate-getdirentries.patch @@ -1,7 +1,7 @@ -From 40ec9c0d2bdeee4192885f7781167afdeeee899d Mon Sep 17 00:00:00 2001 +From fe14184069e952f57e74f1e599816d0403205ac0 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zane...@linaro.org> Date: Fri, 17 Apr 2020 09:59:51 -0300 -Subject: [PATCH 12/14] dirent: Deprecate getdirentries +Subject: [PATCH 11/12] dirent: Deprecate getdirentries The interface has some issues: @@ -23,10 +23,10 @@ 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 4b6d9de2b5..b00c803a1c 100644 +index bc1aac1270..56c4d3ed7e 100644 --- a/NEWS +++ b/NEWS -@@ -25,6 +25,12 @@ Security related changes: +@@ -93,6 +93,12 @@ Security related changes: [Add security related changes here] @@ -84,13 +84,13 @@ index c47d3273b2..1c299e5be8 100644 #endif /* Use misc. */ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile -index ca953804d0..26794e4fef 100644 +index a139a16532..237b8ca80a 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile -@@ -341,6 +341,10 @@ tests += tst-getdents64 - ifeq ($(have-GLIBC_2.1.3)$(build-shared),yesyes) - tests += tst-readdir64-compat - endif +@@ -365,6 +365,10 @@ tests += \ + tst-getdents64 \ + tst-readdir64-compat \ + # tests + +# Avoid the warning for the weak_alias for _DIRENT_MATCHES_DIRENT64 +CFLAGS-getdirentries64.o = -Wno-deprecated-declarations diff --git a/9999/0020-make-clone3-syscall-optional.patch b/9999/0012-clone-internal.c-make-clone3-syscall-optional.patch similarity index 92% rename from 9999/0020-make-clone3-syscall-optional.patch rename to 9999/0012-clone-internal.c-make-clone3-syscall-optional.patch index 4654f06..bfa21c8 100644 --- a/9999/0020-make-clone3-syscall-optional.patch +++ b/9999/0012-clone-internal.c-make-clone3-syscall-optional.patch @@ -1,7 +1,7 @@ -From 57babb0afaa90263a7ea416aa9dc3734bb8ceacc Mon Sep 17 00:00:00 2001 +From e6af617accd984ce1897c1578478f8680e5a24a0 Mon Sep 17 00:00:00 2001 From: Sam James <s...@gentoo.org> Date: Wed, 1 Dec 2021 14:58:40 +0000 -Subject: [PATCH 06/14] clone-internal.c: make clone3 syscall optional +Subject: [PATCH 12/12] clone-internal.c: make clone3 syscall optional We're disabling clone3 for now _CONDITIONALLY_ (not by default) to allow compatibility with applications using older Electron. @@ -44,5 +44,5 @@ index a71effcbd3..60efe1f453 100644 int saved_errno = errno; ret = __clone3 (cl_args, sizeof (*cl_args), func, arg); -- -2.34.1 +2.35.1
