1 |
commit: d82b6e3d2cc5374f55a796476462882c5549b0d2 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 21 21:41:50 2022 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 21 21:41:50 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=d82b6e3d |
7 |
|
8 |
Restore dropped bracket in 0301, rebase all |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
9999/0001-Disable-ldconfig-during-install.patch | 8 ++++---- |
13 |
...eps-posix-getaddrinfo.c-gaih_inet-Only-us.patch | 12 +++++------ |
14 |
...Adapt-to-Gentoo-specific-etc-mail-aliases.patch | 14 ++++++------- |
15 |
...O0-in-conform-tests-to-survive-CC-changes.patch | 14 ++++++------- |
16 |
.../0006-Fix-miscompilation-on-ia64-s-gcc-10.patch | 8 ++++---- |
17 |
9999/0020-make-clone3-syscall-optional.patch | 8 ++++---- |
18 |
...t-skip-entries-with-zero-d_ino-values-BZ-.patch | 10 ++++----- |
19 |
...2-linux-Use-getdents64-on-non-LFS-readdir.patch | 14 ++++++------- |
20 |
...nternal-DIR-filepos-as-off64_t-BZ-23960-B.patch | 24 +++++++++++----------- |
21 |
9999/0204-linux-Add-__readdir64_unlocked.patch | 10 ++++----- |
22 |
9999/0205-linux-Add-__old_readdir64_unlocked.patch | 12 +++++------ |
23 |
...etdents64-on-readdir64-compat-implementat.patch | 15 +++++++------- |
24 |
9999/0207-dirent-Deprecate-getdirentries.patch | 22 ++++++++++---------- |
25 |
...ault-in-getpwuid-when-stat-fails-BZ-28752.patch | 15 +++++++------- |
26 |
14 files changed, 93 insertions(+), 93 deletions(-) |
27 |
|
28 |
diff --git a/9999/0001-Disable-ldconfig-during-install.patch b/9999/0001-Disable-ldconfig-during-install.patch |
29 |
index 6080ceb..fde0cbb 100644 |
30 |
--- a/9999/0001-Disable-ldconfig-during-install.patch |
31 |
+++ b/9999/0001-Disable-ldconfig-during-install.patch |
32 |
@@ -1,7 +1,7 @@ |
33 |
-From 479864345ca9f13e439b68681e13beb3dce60f7c Mon Sep 17 00:00:00 2001 |
34 |
+From 77b6eec2fbc116152cdc0362448e89a22ea1ae83 Mon Sep 17 00:00:00 2001 |
35 |
From: Mike Frysinger <vapier@g.o> |
36 |
Date: Tue, 3 Aug 2021 00:34:59 +0200 |
37 |
-Subject: [PATCH 1/6] Disable ldconfig during install |
38 |
+Subject: [PATCH 01/14] Disable ldconfig during install |
39 |
|
40 |
Do not bother running ldconfig on DESTDIR. It's a waste of time as we |
41 |
won't use the result (portage will rebuild the cache after install). |
42 |
@@ -15,7 +15,7 @@ https://bugs.gentoo.org/431038 |
43 |
1 file changed, 1 insertion(+) |
44 |
|
45 |
diff --git a/Makefile b/Makefile |
46 |
-index f98d5a9e67..ef0077677c 100644 |
47 |
+index b1454882bd..73c3ef1e76 100644 |
48 |
--- a/Makefile |
49 |
+++ b/Makefile |
50 |
@@ -110,6 +110,7 @@ elf/ldso_install: |
51 |
@@ -27,5 +27,5 @@ index f98d5a9e67..ef0077677c 100644 |
52 |
$(elf-objpfx)ldconfig $(addprefix -r ,$(install_root)) \ |
53 |
$(slibdir) $(libdir) |
54 |
-- |
55 |
-2.31.1 |
56 |
+2.34.1 |
57 |
|
58 |
|
59 |
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 |
60 |
index b256229..d6cd1b3 100644 |
61 |
--- a/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch |
62 |
+++ b/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch |
63 |
@@ -1,8 +1,8 @@ |
64 |
-From 10aed4ee2c685613d190434649bbac896b364680 Mon Sep 17 00:00:00 2001 |
65 |
+From 93e05c56a80d3145e3552ea611f2bd8c755d5887 Mon Sep 17 00:00:00 2001 |
66 |
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o> |
67 |
Date: Tue, 29 Aug 2017 22:58:50 +0200 |
68 |
-Subject: [PATCH 2/6] Revert " * sysdeps/posix/getaddrinfo.c (gaih_inet): Only |
69 |
- use gethostbyname4_r" |
70 |
+Subject: [PATCH 02/14] Revert " * sysdeps/posix/getaddrinfo.c (gaih_inet): |
71 |
+ Only use gethostbyname4_r" |
72 |
|
73 |
This reverts commit 8479f23aa1d5e5477a37f46823856bdafaedfa46. |
74 |
|
75 |
@@ -17,7 +17,7 @@ This makes tst-nss-files-hosts-multi fail. Disable it. |
76 |
2 files changed, 2 insertions(+), 8 deletions(-) |
77 |
|
78 |
diff --git a/nss/Makefile b/nss/Makefile |
79 |
-index bccf9f2806..c90fee2e4c 100644 |
80 |
+index 552e5d03e1..35ec106e0c 100644 |
81 |
--- a/nss/Makefile |
82 |
+++ b/nss/Makefile |
83 |
@@ -74,7 +74,6 @@ tests-container = \ |
84 |
@@ -29,7 +29,7 @@ index bccf9f2806..c90fee2e4c 100644 |
85 |
tests += tst-nss-files-alias-leak |
86 |
tests += tst-nss-files-alias-truncated |
87 |
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c |
88 |
-index 838a68f022..1bb2263225 100644 |
89 |
+index 18dccd5924..2cca006f3d 100644 |
90 |
--- a/sysdeps/posix/getaddrinfo.c |
91 |
+++ b/sysdeps/posix/getaddrinfo.c |
92 |
@@ -733,13 +733,8 @@ gaih_inet (const char *name, const struct gaih_service *service, |
93 |
@@ -49,5 +49,5 @@ index 838a68f022..1bb2263225 100644 |
94 |
{ |
95 |
while (1) |
96 |
-- |
97 |
-2.31.1 |
98 |
+2.34.1 |
99 |
|
100 |
|
101 |
diff --git a/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch b/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch |
102 |
index 9588b09..32c5e4a 100644 |
103 |
--- a/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch |
104 |
+++ b/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch |
105 |
@@ -1,7 +1,7 @@ |
106 |
-From 60c8192d7a9245a2d1ad491d73b2677564d41374 Mon Sep 17 00:00:00 2001 |
107 |
+From 6e27ad8827f67f742aa53b72c141002085e7e1a8 Mon Sep 17 00:00:00 2001 |
108 |
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o> |
109 |
Date: Mon, 22 Oct 2018 22:34:13 +0200 |
110 |
-Subject: [PATCH 3/6] Adapt to Gentoo-specific /etc/mail/aliases |
111 |
+Subject: [PATCH 03/14] Adapt to Gentoo-specific /etc/mail/aliases |
112 |
MIME-Version: 1.0 |
113 |
Content-Type: text/plain; charset=UTF-8 |
114 |
Content-Transfer-Encoding: 8bit |
115 |
@@ -17,10 +17,10 @@ Signed-off-by: Andreas K. Hüttel <dilfridge@g.o> |
116 |
3 files changed, 17 insertions(+), 11 deletions(-) |
117 |
|
118 |
diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c |
119 |
-index 2a4023b9a9..42c2a76d2f 100644 |
120 |
+index 505721388f..44d835cace 100644 |
121 |
--- a/nss/nss_files/files-alias.c |
122 |
+++ b/nss/nss_files/files-alias.c |
123 |
-@@ -43,7 +43,7 @@ internal_setent (FILE **stream) |
124 |
+@@ -42,7 +42,7 @@ internal_setent (FILE **stream) |
125 |
|
126 |
if (*stream == NULL) |
127 |
{ |
128 |
@@ -30,7 +30,7 @@ index 2a4023b9a9..42c2a76d2f 100644 |
129 |
if (*stream == NULL) |
130 |
status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; |
131 |
diff --git a/nss/tst-nss-files-alias-leak.c b/nss/tst-nss-files-alias-leak.c |
132 |
-index 3b8af66294..91312d2552 100644 |
133 |
+index 576f07fa0a..29962764e2 100644 |
134 |
--- a/nss/tst-nss-files-alias-leak.c |
135 |
+++ b/nss/tst-nss-files-alias-leak.c |
136 |
@@ -45,27 +45,27 @@ prepare (int argc, char **argv) |
137 |
@@ -79,7 +79,7 @@ index 3b8af66294..91312d2552 100644 |
138 |
FILE *fp = xfopen (path, "w"); |
139 |
for (int i = 0; i < many_aliases; ++i) |
140 |
diff --git a/support/support_chroot.c b/support/support_chroot.c |
141 |
-index e1628eb53b..4c58eba6a4 100644 |
142 |
+index 4bf6fe0834..1548eba2ad 100644 |
143 |
--- a/support/support_chroot.c |
144 |
+++ b/support/support_chroot.c |
145 |
@@ -52,13 +52,19 @@ support_chroot_create (struct support_chroot_configuration conf) |
146 |
@@ -104,5 +104,5 @@ index e1628eb53b..4c58eba6a4 100644 |
147 |
/* valgrind needs a temporary directory in the chroot. */ |
148 |
{ |
149 |
-- |
150 |
-2.31.1 |
151 |
+2.34.1 |
152 |
|
153 |
|
154 |
diff --git a/9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch b/9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch |
155 |
index 1262b6b..d39eb5d 100644 |
156 |
--- a/9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch |
157 |
+++ b/9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch |
158 |
@@ -1,7 +1,7 @@ |
159 |
-From 21bbee17488159cff563f90ed83aee59703cb21e Mon Sep 17 00:00:00 2001 |
160 |
+From 16337b6a4a14c8eb7ae57341aa04d7d571f00783 Mon Sep 17 00:00:00 2001 |
161 |
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o> |
162 |
Date: Fri, 14 Dec 2018 20:43:04 +0100 |
163 |
-Subject: [PATCH 5/6] Force -O0 in conform tests to survive $CC changes |
164 |
+Subject: [PATCH 04/14] Force -O0 in conform tests to survive $CC changes |
165 |
MIME-Version: 1.0 |
166 |
Content-Type: text/plain; charset=UTF-8 |
167 |
Content-Transfer-Encoding: 8bit |
168 |
@@ -22,10 +22,10 @@ Signed-off-by: Andreas K. Hüttel <dilfridge@g.o> |
169 |
2 files changed, 7 insertions(+), 3 deletions(-) |
170 |
|
171 |
diff --git a/conform/conformtest.py b/conform/conformtest.py |
172 |
-index f0405b7186..14d342e4c4 100644 |
173 |
+index 94a7ee110f..90c81ac88e 100644 |
174 |
--- a/conform/conformtest.py |
175 |
+++ b/conform/conformtest.py |
176 |
-@@ -562,7 +562,7 @@ class HeaderTests(object): |
177 |
+@@ -566,7 +566,7 @@ class HeaderTests(object): |
178 |
o_file = os.path.join(self.temp_dir, 'test.o') |
179 |
with open(c_file, 'w') as c_file_out: |
180 |
c_file_out.write('#include <%s>\n%s' % (self.header, text)) |
181 |
@@ -34,7 +34,7 @@ index f0405b7186..14d342e4c4 100644 |
182 |
try: |
183 |
subprocess.check_call(cmd, shell=True) |
184 |
except subprocess.CalledProcessError: |
185 |
-@@ -613,7 +613,9 @@ class HeaderTests(object): |
186 |
+@@ -620,7 +620,9 @@ class HeaderTests(object): |
187 |
out_file = os.path.join(self.temp_dir, 'namespace-out') |
188 |
with open(c_file, 'w') as c_file_out: |
189 |
c_file_out.write('#include <%s>\n' % self.header) |
190 |
@@ -46,7 +46,7 @@ index f0405b7186..14d342e4c4 100644 |
191 |
subprocess.check_call(cmd, shell=True) |
192 |
bad_tokens = set() |
193 |
diff --git a/conform/linknamespace.py b/conform/linknamespace.py |
194 |
-index 66b16e244a..78c80d7645 100644 |
195 |
+index f7fe3a7a0a..ad87fd2a6d 100644 |
196 |
--- a/conform/linknamespace.py |
197 |
+++ b/conform/linknamespace.py |
198 |
@@ -157,7 +157,9 @@ def main(): |
199 |
@@ -61,5 +61,5 @@ index 66b16e244a..78c80d7645 100644 |
200 |
args.header) |
201 |
with tempfile.TemporaryDirectory() as temp_dir: |
202 |
-- |
203 |
-2.31.1 |
204 |
+2.34.1 |
205 |
|
206 |
|
207 |
diff --git a/9999/0006-Fix-miscompilation-on-ia64-s-gcc-10.patch b/9999/0006-Fix-miscompilation-on-ia64-s-gcc-10.patch |
208 |
index 9f1148b..6fb25e1 100644 |
209 |
--- a/9999/0006-Fix-miscompilation-on-ia64-s-gcc-10.patch |
210 |
+++ b/9999/0006-Fix-miscompilation-on-ia64-s-gcc-10.patch |
211 |
@@ -1,7 +1,7 @@ |
212 |
-From 83b7893377b93d84e8bea1be08686b96cb98024d Mon Sep 17 00:00:00 2001 |
213 |
+From 7fedf8c50534b2930caf2fad55cd98b9eed36e82 Mon Sep 17 00:00:00 2001 |
214 |
From: Sergei Trofimovich <slyfox@g.o> |
215 |
Date: Sat, 11 Jul 2020 20:06:51 +0300 |
216 |
-Subject: [PATCH 6/6] Fix miscompilation on ia64's gcc-10 |
217 |
+Subject: [PATCH 05/14] Fix miscompilation on ia64's gcc-10 |
218 |
MIME-Version: 1.0 |
219 |
Content-Type: text/plain; charset=UTF-8 |
220 |
Content-Transfer-Encoding: 8bit |
221 |
@@ -13,7 +13,7 @@ Signed-off-by: Andreas K. Hüttel <dilfridge@g.o> |
222 |
1 file changed, 3 insertions(+), 1 deletion(-) |
223 |
|
224 |
diff --git a/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h b/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h |
225 |
-index 24650ce31f..20294e6ff0 100644 |
226 |
+index 0d2a1d093a..b50694d6f3 100644 |
227 |
--- a/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h |
228 |
+++ b/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h |
229 |
@@ -32,7 +32,9 @@ |
230 |
@@ -28,5 +28,5 @@ index 24650ce31f..20294e6ff0 100644 |
231 |
# define DL_SYSINFO_IMPLEMENTATION \ |
232 |
asm (".text\n\t" \ |
233 |
-- |
234 |
-2.31.1 |
235 |
+2.34.1 |
236 |
|
237 |
|
238 |
diff --git a/9999/0020-make-clone3-syscall-optional.patch b/9999/0020-make-clone3-syscall-optional.patch |
239 |
index 33aa08f..4654f06 100644 |
240 |
--- a/9999/0020-make-clone3-syscall-optional.patch |
241 |
+++ b/9999/0020-make-clone3-syscall-optional.patch |
242 |
@@ -1,7 +1,7 @@ |
243 |
-From 1f714c474eb248b3fa2c84f3b0f22cc509c0e6c9 Mon Sep 17 00:00:00 2001 |
244 |
+From 57babb0afaa90263a7ea416aa9dc3734bb8ceacc Mon Sep 17 00:00:00 2001 |
245 |
From: Sam James <sam@g.o> |
246 |
Date: Wed, 1 Dec 2021 14:58:40 +0000 |
247 |
-Subject: [PATCH] clone-internal.c: make clone3 syscall optional |
248 |
+Subject: [PATCH 06/14] clone-internal.c: make clone3 syscall optional |
249 |
|
250 |
We're disabling clone3 for now _CONDITIONALLY_ (not by default) to allow |
251 |
compatibility with applications using older Electron. |
252 |
@@ -31,7 +31,7 @@ Signed-off-by: Sam James <sam@g.o> |
253 |
1 file changed, 1 insertion(+), 1 deletion(-) |
254 |
|
255 |
diff --git a/sysdeps/unix/sysv/linux/clone-internal.c b/sysdeps/unix/sysv/linux/clone-internal.c |
256 |
-index 979f7880be..c5566daf73 100644 |
257 |
+index a71effcbd3..60efe1f453 100644 |
258 |
--- a/sysdeps/unix/sysv/linux/clone-internal.c |
259 |
+++ b/sysdeps/unix/sysv/linux/clone-internal.c |
260 |
@@ -48,7 +48,7 @@ __clone_internal (struct clone_args *cl_args, |
261 |
@@ -44,5 +44,5 @@ index 979f7880be..c5566daf73 100644 |
262 |
int saved_errno = errno; |
263 |
ret = __clone3 (cl_args, sizeof (*cl_args), func, arg); |
264 |
-- |
265 |
-2.32.0 |
266 |
+2.34.1 |
267 |
|
268 |
|
269 |
diff --git a/9999/0201-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch b/9999/0201-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch |
270 |
index 5325a91..221dbd6 100644 |
271 |
--- a/9999/0201-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch |
272 |
+++ b/9999/0201-linux-Do-not-skip-entries-with-zero-d_ino-values-BZ-.patch |
273 |
@@ -1,7 +1,7 @@ |
274 |
-From 7856a2b7ae88602bc9ee65e08fe652b6a6ad5f7e Mon Sep 17 00:00:00 2001 |
275 |
+From 58b842de801f64de1d323ecceaf24b7cd30cbb87 Mon Sep 17 00:00:00 2001 |
276 |
From: Adhemerval Zanella <adhemerval.zanella@××××××.org> |
277 |
Date: Tue, 20 Oct 2020 12:18:56 -0300 |
278 |
-Subject: [PATCH 1/7] linux: Do not skip entries with zero d_ino values [BZ |
279 |
+Subject: [PATCH 07/14] linux: Do not skip entries with zero d_ino values [BZ |
280 |
#12165] |
281 |
|
282 |
According to Linux commit 2adc376c55194 (vfs: avoid creation of inode |
283 |
@@ -18,7 +18,7 @@ Checked on x86_64-linux-gnu and i686-linux-gnu. |
284 |
2 files changed, 44 insertions(+), 74 deletions(-) |
285 |
|
286 |
diff --git a/sysdeps/unix/sysv/linux/readdir.c b/sysdeps/unix/sysv/linux/readdir.c |
287 |
-index b480135164..c0619ce06f 100644 |
288 |
+index c31f349639..7743f50071 100644 |
289 |
--- a/sysdeps/unix/sysv/linux/readdir.c |
290 |
+++ b/sysdeps/unix/sysv/linux/readdir.c |
291 |
@@ -25,51 +25,36 @@ |
292 |
@@ -96,7 +96,7 @@ index b480135164..c0619ce06f 100644 |
293 |
return dp; |
294 |
} |
295 |
diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c |
296 |
-index 52b11eb9d9..3aea0b1df1 100644 |
297 |
+index e876d84b02..d990a36e4e 100644 |
298 |
--- a/sysdeps/unix/sysv/linux/readdir64.c |
299 |
+++ b/sysdeps/unix/sysv/linux/readdir64.c |
300 |
@@ -30,55 +30,40 @@ |
301 |
@@ -178,5 +178,5 @@ index 52b11eb9d9..3aea0b1df1 100644 |
302 |
#if IS_IN (libc) |
303 |
__libc_lock_unlock (dirp->lock); |
304 |
-- |
305 |
-2.32.0 |
306 |
+2.34.1 |
307 |
|
308 |
|
309 |
diff --git a/9999/0202-linux-Use-getdents64-on-non-LFS-readdir.patch b/9999/0202-linux-Use-getdents64-on-non-LFS-readdir.patch |
310 |
index 90910a6..762a943 100644 |
311 |
--- a/9999/0202-linux-Use-getdents64-on-non-LFS-readdir.patch |
312 |
+++ b/9999/0202-linux-Use-getdents64-on-non-LFS-readdir.patch |
313 |
@@ -1,7 +1,7 @@ |
314 |
-From 5180512e6c81b1b0423572594983c74c499b7e1e Mon Sep 17 00:00:00 2001 |
315 |
+From 057920ea715c979638045d2966d6a7c616f3cbc2 Mon Sep 17 00:00:00 2001 |
316 |
From: Adhemerval Zanella <adhemerval.zanella@××××××.org> |
317 |
Date: Tue, 20 Oct 2020 13:37:15 -0300 |
318 |
-Subject: [PATCH 2/7] linux: Use getdents64 on non-LFS readdir |
319 |
+Subject: [PATCH 08/14] linux: Use getdents64 on non-LFS readdir |
320 |
|
321 |
The opendir allocates a translation buffer to be used to return the |
322 |
non-LFS readdir entry. The obtained dirent64 struct is translated |
323 |
@@ -19,7 +19,7 @@ Checked on x86_64-linux-gnu and i686-linux-gnu. |
324 |
4 files changed, 101 insertions(+), 26 deletions(-) |
325 |
|
326 |
diff --git a/sysdeps/unix/sysv/linux/closedir.c b/sysdeps/unix/sysv/linux/closedir.c |
327 |
-index 4bb5274b00..1f71445ad9 100644 |
328 |
+index eee0193fc4..d876d49d78 100644 |
329 |
--- a/sysdeps/unix/sysv/linux/closedir.c |
330 |
+++ b/sysdeps/unix/sysv/linux/closedir.c |
331 |
@@ -47,6 +47,10 @@ __closedir (DIR *dirp) |
332 |
@@ -34,7 +34,7 @@ index 4bb5274b00..1f71445ad9 100644 |
333 |
|
334 |
return __close_nocancel (fd); |
335 |
diff --git a/sysdeps/unix/sysv/linux/dirstream.h b/sysdeps/unix/sysv/linux/dirstream.h |
336 |
-index b5e1db8db0..64b1495ba0 100644 |
337 |
+index a0d8acf08d..064273cc31 100644 |
338 |
--- a/sysdeps/unix/sysv/linux/dirstream.h |
339 |
+++ b/sysdeps/unix/sysv/linux/dirstream.h |
340 |
@@ -41,6 +41,11 @@ struct __dirstream |
341 |
@@ -50,7 +50,7 @@ index b5e1db8db0..64b1495ba0 100644 |
342 |
at an address that is aligned adequately enough to store |
343 |
dirent entries. Using the alignment of "void *" is not |
344 |
diff --git a/sysdeps/unix/sysv/linux/opendir.c b/sysdeps/unix/sysv/linux/opendir.c |
345 |
-index 48f254d169..d7df13575e 100644 |
346 |
+index 9e81d00630..bfd2f382a6 100644 |
347 |
--- a/sysdeps/unix/sysv/linux/opendir.c |
348 |
+++ b/sysdeps/unix/sysv/linux/opendir.c |
349 |
@@ -120,6 +120,27 @@ __alloc_dir (int fd, bool close_fd, int flags, |
350 |
@@ -82,7 +82,7 @@ index 48f254d169..d7df13575e 100644 |
351 |
#if IS_IN (libc) |
352 |
__libc_lock_init (dirp->lock); |
353 |
diff --git a/sysdeps/unix/sysv/linux/readdir.c b/sysdeps/unix/sysv/linux/readdir.c |
354 |
-index c0619ce06f..8647bb0aef 100644 |
355 |
+index 7743f50071..7b4571839e 100644 |
356 |
--- a/sysdeps/unix/sysv/linux/readdir.c |
357 |
+++ b/sysdeps/unix/sysv/linux/readdir.c |
358 |
@@ -21,42 +21,87 @@ |
359 |
@@ -200,5 +200,5 @@ index c0619ce06f..8647bb0aef 100644 |
360 |
|
361 |
struct dirent * |
362 |
-- |
363 |
-2.32.0 |
364 |
+2.34.1 |
365 |
|
366 |
|
367 |
diff --git a/9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch b/9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch |
368 |
index 06e8d14..bde1527 100644 |
369 |
--- a/9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch |
370 |
+++ b/9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch |
371 |
@@ -1,8 +1,8 @@ |
372 |
-From 7d2845e6ed10f2109d2e0f6432932b6693f0037d Mon Sep 17 00:00:00 2001 |
373 |
+From 0afb8fa52cded9c332c31c7a1e62b9f2b04acdf8 Mon Sep 17 00:00:00 2001 |
374 |
From: Adhemerval Zanella <adhemerval.zanella@××××××.org> |
375 |
Date: Mon, 13 Apr 2020 18:09:20 -0300 |
376 |
-Subject: [PATCH 3/7] linux: Set internal DIR filepos as off64_t [BZ #23960, BZ |
377 |
- #24050] |
378 |
+Subject: [PATCH 09/14] linux: Set internal DIR filepos as off64_t [BZ #23960, |
379 |
+ BZ #24050] |
380 |
|
381 |
It allows to obtain the expected entry offset on telldir and set |
382 |
it correctly on seekdir on platforms where long int is smaller |
383 |
@@ -39,7 +39,7 @@ and arm-linux-gnueabihf. |
384 |
create mode 100644 sysdeps/unix/sysv/linux/telldir.h |
385 |
|
386 |
diff --git a/dirent/Makefile b/dirent/Makefile |
387 |
-index afc7226a5b..c7f046b3f7 100644 |
388 |
+index b80f6a73ea..65119db578 100644 |
389 |
--- a/dirent/Makefile |
390 |
+++ b/dirent/Makefile |
391 |
@@ -31,7 +31,7 @@ routines := opendir closedir readdir readdir_r rewinddir \ |
392 |
@@ -216,7 +216,7 @@ index 0000000000..3e01b361e5 |
393 |
+ |
394 |
+#include <support/test-driver.c> |
395 |
diff --git a/sysdeps/unix/sysv/linux/closedir.c b/sysdeps/unix/sysv/linux/closedir.c |
396 |
-index 1f71445ad9..1845c48be0 100644 |
397 |
+index d876d49d78..8e5669963c 100644 |
398 |
--- a/sysdeps/unix/sysv/linux/closedir.c |
399 |
+++ b/sysdeps/unix/sysv/linux/closedir.c |
400 |
@@ -43,6 +43,10 @@ __closedir (DIR *dirp) |
401 |
@@ -231,7 +231,7 @@ index 1f71445ad9..1845c48be0 100644 |
402 |
__libc_lock_fini (dirp->lock); |
403 |
#endif |
404 |
diff --git a/sysdeps/unix/sysv/linux/dirstream.h b/sysdeps/unix/sysv/linux/dirstream.h |
405 |
-index 64b1495ba0..1a3362fda6 100644 |
406 |
+index 064273cc31..a284292cb2 100644 |
407 |
--- a/sysdeps/unix/sysv/linux/dirstream.h |
408 |
+++ b/sysdeps/unix/sysv/linux/dirstream.h |
409 |
@@ -21,6 +21,7 @@ |
410 |
@@ -262,7 +262,7 @@ index 64b1495ba0..1a3362fda6 100644 |
411 |
/* Directory block. We must make sure that this block starts |
412 |
at an address that is aligned adequately enough to store |
413 |
diff --git a/sysdeps/unix/sysv/linux/opendir.c b/sysdeps/unix/sysv/linux/opendir.c |
414 |
-index d7df13575e..56365f9da5 100644 |
415 |
+index bfd2f382a6..9a0b7ab4c4 100644 |
416 |
--- a/sysdeps/unix/sysv/linux/opendir.c |
417 |
+++ b/sysdeps/unix/sysv/linux/opendir.c |
418 |
@@ -150,6 +150,9 @@ __alloc_dir (int fd, bool close_fd, int flags, |
419 |
@@ -276,7 +276,7 @@ index d7df13575e..56365f9da5 100644 |
420 |
return dirp; |
421 |
} |
422 |
diff --git a/sysdeps/unix/sysv/linux/readdir.c b/sysdeps/unix/sysv/linux/readdir.c |
423 |
-index 8647bb0aef..b26d2756b9 100644 |
424 |
+index 7b4571839e..94ac4cbae7 100644 |
425 |
--- a/sysdeps/unix/sysv/linux/readdir.c |
426 |
+++ b/sysdeps/unix/sysv/linux/readdir.c |
427 |
@@ -17,6 +17,7 @@ |
428 |
@@ -288,7 +288,7 @@ index 8647bb0aef..b26d2756b9 100644 |
429 |
#if !_DIRENT_MATCHES_DIRENT64 |
430 |
#include <dirstream.h> |
431 |
diff --git a/sysdeps/unix/sysv/linux/rewinddir.c b/sysdeps/unix/sysv/linux/rewinddir.c |
432 |
-index 5b68db7167..74b336bfd8 100644 |
433 |
+index b1e8259703..0194d29e38 100644 |
434 |
--- a/sysdeps/unix/sysv/linux/rewinddir.c |
435 |
+++ b/sysdeps/unix/sysv/linux/rewinddir.c |
436 |
@@ -33,6 +33,11 @@ __rewinddir (DIR *dirp) |
437 |
@@ -304,7 +304,7 @@ index 5b68db7167..74b336bfd8 100644 |
438 |
__libc_lock_unlock (dirp->lock); |
439 |
#endif |
440 |
diff --git a/sysdeps/unix/sysv/linux/seekdir.c b/sysdeps/unix/sysv/linux/seekdir.c |
441 |
-index b128ae8e76..2fcf689dc0 100644 |
442 |
+index f4e1a9f8e0..0c3e58a2ed 100644 |
443 |
--- a/sysdeps/unix/sysv/linux/seekdir.c |
444 |
+++ b/sysdeps/unix/sysv/linux/seekdir.c |
445 |
@@ -22,14 +22,40 @@ |
446 |
@@ -354,7 +354,7 @@ index b128ae8e76..2fcf689dc0 100644 |
447 |
__libc_lock_unlock (dirp->lock); |
448 |
} |
449 |
diff --git a/sysdeps/unix/sysv/linux/telldir.c b/sysdeps/unix/sysv/linux/telldir.c |
450 |
-index b184db8d2c..a0eb1efeff 100644 |
451 |
+index b60b231e48..874905489f 100644 |
452 |
--- a/sysdeps/unix/sysv/linux/telldir.c |
453 |
+++ b/sysdeps/unix/sysv/linux/telldir.c |
454 |
@@ -18,16 +18,59 @@ |
455 |
@@ -490,5 +490,5 @@ index 0000000000..7c45886341 |
456 |
+ |
457 |
+#endif /* _TELLDIR_H */ |
458 |
-- |
459 |
-2.32.0 |
460 |
+2.34.1 |
461 |
|
462 |
|
463 |
diff --git a/9999/0204-linux-Add-__readdir64_unlocked.patch b/9999/0204-linux-Add-__readdir64_unlocked.patch |
464 |
index 29609dd..839b18d 100644 |
465 |
--- a/9999/0204-linux-Add-__readdir64_unlocked.patch |
466 |
+++ b/9999/0204-linux-Add-__readdir64_unlocked.patch |
467 |
@@ -1,7 +1,7 @@ |
468 |
-From 1524804c8133564c204340a0d618f04c585d7706 Mon Sep 17 00:00:00 2001 |
469 |
+From 333f932faec29e5c9238d3d1f8584acc25d986c0 Mon Sep 17 00:00:00 2001 |
470 |
From: Adhemerval Zanella <adhemerval.zanella@××××××.org> |
471 |
Date: Mon, 13 Apr 2020 08:35:40 -0300 |
472 |
-Subject: [PATCH 4/7] linux: Add __readdir64_unlocked |
473 |
+Subject: [PATCH 10/14] linux: Add __readdir64_unlocked |
474 |
|
475 |
And use it on readdir_r implementation. |
476 |
|
477 |
@@ -25,7 +25,7 @@ index d7567f5e86..0c6715d0e4 100644 |
478 |
libc_hidden_proto (__readdir64) |
479 |
extern int __readdir_r (DIR *__dirp, struct dirent *__entry, |
480 |
diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c |
481 |
-index 3aea0b1df1..5519487ede 100644 |
482 |
+index d990a36e4e..c4539f6d96 100644 |
483 |
--- a/sysdeps/unix/sysv/linux/readdir64.c |
484 |
+++ b/sysdeps/unix/sysv/linux/readdir64.c |
485 |
@@ -28,14 +28,10 @@ |
486 |
@@ -66,7 +66,7 @@ index 3aea0b1df1..5519487ede 100644 |
487 |
__libc_lock_unlock (dirp->lock); |
488 |
#endif |
489 |
diff --git a/sysdeps/unix/sysv/linux/readdir64_r.c b/sysdeps/unix/sysv/linux/readdir64_r.c |
490 |
-index 073a6453d1..058d401279 100644 |
491 |
+index afd7f9af0f..32962a176a 100644 |
492 |
--- a/sysdeps/unix/sysv/linux/readdir64_r.c |
493 |
+++ b/sysdeps/unix/sysv/linux/readdir64_r.c |
494 |
@@ -32,89 +32,43 @@ __readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result) |
495 |
@@ -177,5 +177,5 @@ index 073a6453d1..058d401279 100644 |
496 |
|
497 |
|
498 |
-- |
499 |
-2.32.0 |
500 |
+2.34.1 |
501 |
|
502 |
|
503 |
diff --git a/9999/0205-linux-Add-__old_readdir64_unlocked.patch b/9999/0205-linux-Add-__old_readdir64_unlocked.patch |
504 |
index c1ccb61..42c9d1d 100644 |
505 |
--- a/9999/0205-linux-Add-__old_readdir64_unlocked.patch |
506 |
+++ b/9999/0205-linux-Add-__old_readdir64_unlocked.patch |
507 |
@@ -1,7 +1,7 @@ |
508 |
-From f16c3815c6ad46450d6e58e179ddf494c52a98a4 Mon Sep 17 00:00:00 2001 |
509 |
+From b69d95b17a828f5f39b577c00ff0d02e4c0a5da6 Mon Sep 17 00:00:00 2001 |
510 |
From: Adhemerval Zanella <adhemerval.zanella@××××××.org> |
511 |
Date: Tue, 14 Apr 2020 11:14:22 -0300 |
512 |
-Subject: [PATCH 5/7] linux: Add __old_readdir64_unlocked |
513 |
+Subject: [PATCH 11/14] linux: Add __old_readdir64_unlocked |
514 |
|
515 |
And use it __old_readdir64_r. |
516 |
|
517 |
@@ -13,7 +13,7 @@ Checked on i686-linux-gnu. |
518 |
3 files changed, 35 insertions(+), 67 deletions(-) |
519 |
|
520 |
diff --git a/sysdeps/unix/sysv/linux/olddirent.h b/sysdeps/unix/sysv/linux/olddirent.h |
521 |
-index 3e672d47f5..42ab593c4d 100644 |
522 |
+index 9a22609177..00c84b9521 100644 |
523 |
--- a/sysdeps/unix/sysv/linux/olddirent.h |
524 |
+++ b/sysdeps/unix/sysv/linux/olddirent.h |
525 |
@@ -32,6 +32,8 @@ struct __old_dirent64 |
526 |
@@ -26,7 +26,7 @@ index 3e672d47f5..42ab593c4d 100644 |
527 |
struct __old_dirent64 **__result); |
528 |
extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes) |
529 |
diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c |
530 |
-index 5519487ede..8869e49150 100644 |
531 |
+index c4539f6d96..dbf6a8c54d 100644 |
532 |
--- a/sysdeps/unix/sysv/linux/readdir64.c |
533 |
+++ b/sysdeps/unix/sysv/linux/readdir64.c |
534 |
@@ -101,15 +101,11 @@ versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2); |
535 |
@@ -69,7 +69,7 @@ index 5519487ede..8869e49150 100644 |
536 |
__libc_lock_unlock (dirp->lock); |
537 |
#endif |
538 |
diff --git a/sysdeps/unix/sysv/linux/readdir64_r.c b/sysdeps/unix/sysv/linux/readdir64_r.c |
539 |
-index 058d401279..e4a0baeaf7 100644 |
540 |
+index 32962a176a..699d120b76 100644 |
541 |
--- a/sysdeps/unix/sysv/linux/readdir64_r.c |
542 |
+++ b/sysdeps/unix/sysv/linux/readdir64_r.c |
543 |
@@ -91,89 +91,44 @@ __old_readdir64_r (DIR *dirp, struct __old_dirent64 *entry, |
544 |
@@ -180,5 +180,5 @@ index 058d401279..e4a0baeaf7 100644 |
545 |
|
546 |
compat_symbol (libc, __old_readdir64_r, readdir64_r, GLIBC_2_1); |
547 |
-- |
548 |
-2.32.0 |
549 |
+2.34.1 |
550 |
|
551 |
|
552 |
diff --git a/9999/0206-linux-Use-getdents64-on-readdir64-compat-implementat.patch b/9999/0206-linux-Use-getdents64-on-readdir64-compat-implementat.patch |
553 |
index 90f5d89..889266d 100644 |
554 |
--- a/9999/0206-linux-Use-getdents64-on-readdir64-compat-implementat.patch |
555 |
+++ b/9999/0206-linux-Use-getdents64-on-readdir64-compat-implementat.patch |
556 |
@@ -1,7 +1,8 @@ |
557 |
-From 46b9383118182cb2ac2e81637e00fde6c21097bb Mon Sep 17 00:00:00 2001 |
558 |
+From a5aee8e0e844f9f9cf8df0a41e67cddf8de7540f Mon Sep 17 00:00:00 2001 |
559 |
From: Adhemerval Zanella <adhemerval.zanella@××××××.org> |
560 |
Date: Tue, 20 Oct 2020 16:00:43 -0300 |
561 |
-Subject: [PATCH 6/7] linux: Use getdents64 on readdir64 compat implementation |
562 |
+Subject: [PATCH 12/14] linux: Use getdents64 on readdir64 compat |
563 |
+ implementation |
564 |
|
565 |
It uses a similar strategy from the non-LFS readdir that also |
566 |
uses getdents64 internally and uses a translation buffer to return |
567 |
@@ -18,7 +19,7 @@ Checked on i686-linux-gnu. |
568 |
4 files changed, 79 insertions(+), 135 deletions(-) |
569 |
|
570 |
diff --git a/sysdeps/unix/sysv/linux/getdents64.c b/sysdeps/unix/sysv/linux/getdents64.c |
571 |
-index 6323e003b3..38285e9f4b 100644 |
572 |
+index 510a586859..92481526c5 100644 |
573 |
--- a/sysdeps/unix/sysv/linux/getdents64.c |
574 |
+++ b/sysdeps/unix/sysv/linux/getdents64.c |
575 |
@@ -36,97 +36,4 @@ weak_alias (__getdents64, getdents64) |
576 |
@@ -120,7 +121,7 @@ index 6323e003b3..38285e9f4b 100644 |
577 |
-# endif /* SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) */ |
578 |
#endif /* _DIRENT_MATCHES_DIRENT64 */ |
579 |
diff --git a/sysdeps/unix/sysv/linux/olddirent.h b/sysdeps/unix/sysv/linux/olddirent.h |
580 |
-index 42ab593c4d..b7c51d5ccc 100644 |
581 |
+index 00c84b9521..68aafd7c02 100644 |
582 |
--- a/sysdeps/unix/sysv/linux/olddirent.h |
583 |
+++ b/sysdeps/unix/sysv/linux/olddirent.h |
584 |
@@ -36,8 +36,6 @@ extern struct __old_dirent64 *__old_readdir64_unlocked (DIR *__dirp) |
585 |
@@ -133,7 +134,7 @@ index 42ab593c4d..b7c51d5ccc 100644 |
586 |
struct __old_dirent64 *** __namelist, |
587 |
int (*__selector) (const struct __old_dirent64 *), |
588 |
diff --git a/sysdeps/unix/sysv/linux/opendir.c b/sysdeps/unix/sysv/linux/opendir.c |
589 |
-index 56365f9da5..de722c98e1 100644 |
590 |
+index 9a0b7ab4c4..df40b0a64e 100644 |
591 |
--- a/sysdeps/unix/sysv/linux/opendir.c |
592 |
+++ b/sysdeps/unix/sysv/linux/opendir.c |
593 |
@@ -23,6 +23,11 @@ |
594 |
@@ -166,7 +167,7 @@ index 56365f9da5..de722c98e1 100644 |
595 |
dirp->tbuffer = malloc (tbuffer_size); |
596 |
if (dirp->tbuffer == NULL) |
597 |
diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c |
598 |
-index 8869e49150..7ecc8c1b16 100644 |
599 |
+index dbf6a8c54d..4b41299c6c 100644 |
600 |
--- a/sysdeps/unix/sysv/linux/readdir64.c |
601 |
+++ b/sysdeps/unix/sysv/linux/readdir64.c |
602 |
@@ -99,57 +99,83 @@ versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2); |
603 |
@@ -293,5 +294,5 @@ index 8869e49150..7ecc8c1b16 100644 |
604 |
|
605 |
attribute_compat_text_section |
606 |
-- |
607 |
-2.32.0 |
608 |
+2.34.1 |
609 |
|
610 |
|
611 |
diff --git a/9999/0207-dirent-Deprecate-getdirentries.patch b/9999/0207-dirent-Deprecate-getdirentries.patch |
612 |
index f01ab67..42e3002 100644 |
613 |
--- a/9999/0207-dirent-Deprecate-getdirentries.patch |
614 |
+++ b/9999/0207-dirent-Deprecate-getdirentries.patch |
615 |
@@ -1,7 +1,7 @@ |
616 |
-From 7b990b41ea23c0464c60e6a9f0707adfb46ae587 Mon Sep 17 00:00:00 2001 |
617 |
+From 96f2c068b5aa972b23cfe25d3c8042fed1056607 Mon Sep 17 00:00:00 2001 |
618 |
From: Adhemerval Zanella <adhemerval.zanella@××××××.org> |
619 |
Date: Fri, 17 Apr 2020 09:59:51 -0300 |
620 |
-Subject: [PATCH 7/7] dirent: Deprecate getdirentries |
621 |
+Subject: [PATCH 13/14] dirent: Deprecate getdirentries |
622 |
|
623 |
The interface has some issues: |
624 |
|
625 |
@@ -23,12 +23,12 @@ The idea is to eventually move the symbols to compat ones. |
626 |
3 files changed, 20 insertions(+), 4 deletions(-) |
627 |
|
628 |
diff --git a/NEWS b/NEWS |
629 |
-index d9b344027b..45e51ae810 100644 |
630 |
+index 626eeabf5d..ed5b7b641f 100644 |
631 |
--- a/NEWS |
632 |
+++ b/NEWS |
633 |
-@@ -7,6 +7,12 @@ using `glibc' in the "product" field. |
634 |
- |
635 |
- Version 2.34.1 |
636 |
+@@ -25,6 +25,12 @@ Security related changes: |
637 |
+ |
638 |
+ [Add security related changes here] |
639 |
|
640 |
+Deprecated and removed features, and other changes affecting compatibility: |
641 |
+ |
642 |
@@ -38,9 +38,9 @@ index d9b344027b..45e51ae810 100644 |
643 |
+ |
644 |
The following bugs are resolved with this release: |
645 |
|
646 |
- [12889] nptl: Fix race between pthread_kill and thread exit |
647 |
+ [The release manager will add the list generated by |
648 |
diff --git a/dirent/dirent.h b/dirent/dirent.h |
649 |
-index 1d1fab7e55..eed030b379 100644 |
650 |
+index 218f1ed44b..b2737bc53b 100644 |
651 |
--- a/dirent/dirent.h |
652 |
+++ b/dirent/dirent.h |
653 |
@@ -348,29 +348,35 @@ extern int alphasort64 (const struct dirent64 **__e1, |
654 |
@@ -84,10 +84,10 @@ index 1d1fab7e55..eed030b379 100644 |
655 |
#endif /* Use misc. */ |
656 |
|
657 |
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile |
658 |
-index 76ad06361c..2bfb6e254b 100644 |
659 |
+index 7122f55975..c9b43898b2 100644 |
660 |
--- a/sysdeps/unix/sysv/linux/Makefile |
661 |
+++ b/sysdeps/unix/sysv/linux/Makefile |
662 |
-@@ -314,6 +314,10 @@ tests += tst-getdents64 |
663 |
+@@ -338,6 +338,10 @@ tests += tst-getdents64 |
664 |
ifeq ($(have-GLIBC_2.1.3)$(build-shared),yesyes) |
665 |
tests += tst-readdir64-compat |
666 |
endif |
667 |
@@ -99,5 +99,5 @@ index 76ad06361c..2bfb6e254b 100644 |
668 |
|
669 |
ifeq ($(subdir),nis) |
670 |
-- |
671 |
-2.32.0 |
672 |
+2.34.1 |
673 |
|
674 |
|
675 |
diff --git a/9999/0301-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch b/9999/0301-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch |
676 |
index 85cb24a..48036b3 100644 |
677 |
--- a/9999/0301-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch |
678 |
+++ b/9999/0301-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch |
679 |
@@ -1,7 +1,7 @@ |
680 |
-From aa1d70e59ee6ad1503bc853da75afb35d51381be Mon Sep 17 00:00:00 2001 |
681 |
+From 7032e8bf35b229ff759286435f1f51b5588b56ed Mon Sep 17 00:00:00 2001 |
682 |
From: Adhemerval Zanella <adhemerval.zanella@××××××.org> |
683 |
Date: Sat, 12 Feb 2022 19:40:58 +0100 |
684 |
-Subject: [PATCH] Fix segfault in getpwuid when stat fails (BZ #28752) |
685 |
+Subject: [PATCH 14/14] Fix segfault in getpwuid when stat fails (BZ #28752) |
686 |
|
687 |
[azanella proposed this patch to sam when discussing the issue, |
688 |
but it's not anywhere upstream yet- dilfridge] |
689 |
@@ -10,14 +10,14 @@ Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28752 |
690 |
Bug: https://bugs.gentoo.org/828070 |
691 |
(cherry picked from commit 1bcdcd4fec9bfe2f1d3fef67a43825903f6a5f2b) |
692 |
--- |
693 |
- nss/nss_database.c | 10 +++++----- |
694 |
- 1 file changed, 5 insertions(+), 5 deletions(-) |
695 |
+ nss/nss_database.c | 9 +++++---- |
696 |
+ 1 file changed, 5 insertions(+), 4 deletions(-) |
697 |
|
698 |
diff --git a/nss/nss_database.c b/nss/nss_database.c |
699 |
-index d56c5b798d..35846d7ebc 100644 |
700 |
+index d56c5b798d..133682b858 100644 |
701 |
--- a/nss/nss_database.c |
702 |
+++ b/nss/nss_database.c |
703 |
-@@ -424,11 +424,11 @@ nss_database_check_reload_and_get (struct nss_database_state *local, |
704 |
+@@ -424,10 +424,11 @@ nss_database_check_reload_and_get (struct nss_database_state *local, |
705 |
errors here are very unlikely, but the chance that we're entering |
706 |
a container is also very unlikely, so we err on the side of both |
707 |
very unlikely things not happening at the same time. */ |
708 |
@@ -25,15 +25,14 @@ index d56c5b798d..35846d7ebc 100644 |
709 |
- || (local->root_ino != 0 |
710 |
- && (str.st_ino != local->root_ino |
711 |
- || str.st_dev != local->root_dev))) |
712 |
-- { |
713 |
+ if (__stat64_time64 ("/", &str) != 0) |
714 |
+ return false; |
715 |
+ |
716 |
+ if (local->root_ino != 0 && (str.st_ino != local->root_ino |
717 |
+ || str.st_dev != local->root_dev)) |
718 |
+ { |
719 |
/* Change detected; disable reloading and return current state. */ |
720 |
atomic_store_release (&local->data.reload_disabled, 1); |
721 |
- *result = local->data.services[database_index]; |
722 |
-- |
723 |
2.34.1 |