1 |
commit: 5cf00cd5c6760d2c32640fe4e1e329c1808a0ae8 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 13 08:51:31 2020 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 13 08:51:56 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=5cf00cd5 |
7 |
|
8 |
Drop sandbox-specific fixes; consolidate patches |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
... => 0001-Disable-ldconfig-during-install.patch} | 6 +- |
13 |
...entoo-support-running-tests-under-sandbox.patch | 67 ---------- |
14 |
...ps-posix-getaddrinfo.c-gaih_inet-Only-us.patch} | 24 +++- |
15 |
...dapt-to-Gentoo-specific-etc-mail-aliases.patch} | 33 ++++- |
16 |
...-locale.patch => 0004-Add-C.UTF-8-locale.patch} | 4 +- |
17 |
...0-in-conform-tests-to-survive-CC-changes.patch} | 5 +- |
18 |
...o-disable-tests-that-fail-only-in-sandbox.patch | 144 --------------------- |
19 |
...ble-test-that-fails-because-of-the-gethos.patch | 25 ---- |
20 |
...Adapt-to-Gentoo-specific-etc-mail-aliases.patch | 32 ----- |
21 |
9 files changed, 51 insertions(+), 289 deletions(-) |
22 |
|
23 |
diff --git a/9999/0001-Gentoo-disable-ldconfig-during-install.patch b/9999/0001-Disable-ldconfig-during-install.patch |
24 |
similarity index 83% |
25 |
rename from 9999/0001-Gentoo-disable-ldconfig-during-install.patch |
26 |
rename to 9999/0001-Disable-ldconfig-during-install.patch |
27 |
index c5595aa..0dbdd9a 100644 |
28 |
--- a/9999/0001-Gentoo-disable-ldconfig-during-install.patch |
29 |
+++ b/9999/0001-Disable-ldconfig-during-install.patch |
30 |
@@ -1,7 +1,7 @@ |
31 |
-From c42be799cdc293c6f454e26124f30f87d9bb69a9 Mon Sep 17 00:00:00 2001 |
32 |
+From 8831dc046682b2f3fca8a0dc831e53afdebd4469 Mon Sep 17 00:00:00 2001 |
33 |
From: Mike Frysinger <vapier@g.o> |
34 |
Date: Wed, 1 Apr 2009 02:15:48 -0400 |
35 |
-Subject: [PATCH 01/12] Gentoo: disable ldconfig during install |
36 |
+Subject: [PATCH 1/5] Disable ldconfig during install |
37 |
|
38 |
Do not bother running ldconfig on DESTDIR. It's a waste of time as we |
39 |
won't use the result (portage will rebuild the cache after install). |
40 |
@@ -15,7 +15,7 @@ https://bugs.gentoo.org/431038 |
41 |
1 file changed, 1 insertion(+) |
42 |
|
43 |
diff --git a/Makefile b/Makefile |
44 |
-index 8f0a93aceb..7c3887d5c4 100644 |
45 |
+index 6dcfe40c25..68259babda 100644 |
46 |
--- a/Makefile |
47 |
+++ b/Makefile |
48 |
@@ -116,6 +116,7 @@ install-symbolic-link: subdir_install |
49 |
|
50 |
diff --git a/9999/0002-Gentoo-support-running-tests-under-sandbox.patch b/9999/0002-Gentoo-support-running-tests-under-sandbox.patch |
51 |
deleted file mode 100644 |
52 |
index 1bc7be2..0000000 |
53 |
--- a/9999/0002-Gentoo-support-running-tests-under-sandbox.patch |
54 |
+++ /dev/null |
55 |
@@ -1,67 +0,0 @@ |
56 |
-From a4ec232302f8b30f6fc7eb7a53aadf99b3fad312 Mon Sep 17 00:00:00 2001 |
57 |
-From: "Stephanie J. Lockwood-Childs" <wormo@g.o> |
58 |
-Date: Tue, 13 Mar 2007 01:57:21 -0400 |
59 |
-Subject: [PATCH 02/12] Gentoo: support running tests under sandbox |
60 |
- |
61 |
-when glibc runs its tests, it does so by invoking the local library loader. |
62 |
-in Gentoo, we build/run inside of our "sandbox" which itself is linked against |
63 |
-libdl (so that it can load libraries and pull out symbols). the trouble |
64 |
-is that when you upgrade from an older glibc to the new one, often times |
65 |
-internal symbols change name or abi. this is normally OK as you cannot use |
66 |
-libc.so from say version 2.3.6 but libpthread.so from say version 2.5, so |
67 |
-we always say "keep all of the glibc libraries from the same build". but |
68 |
-when glibc runs its tests, it uses dynamic paths to point to its new local |
69 |
-copies of libraries. if the test doesnt use libdl, then glibc doesnt add |
70 |
-its path, and when sandbox triggers the loading of libdl, glibc does so |
71 |
-from the host system system. this gets us into the case of all libraries |
72 |
-are from the locally compiled version of glibc except for libdl.so. |
73 |
- |
74 |
-http://bugs.gentoo.org/56898 |
75 |
---- |
76 |
- Makeconfig | 2 +- |
77 |
- iconvdata/run-iconv-test.sh | 2 +- |
78 |
- nptl/tst-tls6.sh | 2 +- |
79 |
- 3 files changed, 3 insertions(+), 3 deletions(-) |
80 |
- |
81 |
-diff --git a/Makeconfig b/Makeconfig |
82 |
-index f252842979..5076902c87 100644 |
83 |
---- a/Makeconfig |
84 |
-+++ b/Makeconfig |
85 |
-@@ -728,7 +728,7 @@ comma = , |
86 |
- sysdep-library-path = \ |
87 |
- $(subst $(empty) ,:,$(strip $(patsubst -Wl$(comma)-rpath-link=%, %,\ |
88 |
- $(filter -Wl$(comma)-rpath-link=%,\ |
89 |
-- $(sysdep-LDFLAGS))))) |
90 |
-+ $(sysdep-LDFLAGS)))) $(common-objpfx)/dlfcn) |
91 |
- # $(run-via-rtld-prefix) is a command that, when prepended to the name |
92 |
- # of a program built with the newly built library, produces a command |
93 |
- # that, executed on the host for which the library is built, runs that |
94 |
-diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh |
95 |
-index 56b6630a6d..be74dbf302 100755 |
96 |
---- a/iconvdata/run-iconv-test.sh |
97 |
-+++ b/iconvdata/run-iconv-test.sh |
98 |
-@@ -31,7 +31,7 @@ temp2=$codir/iconvdata/iconv-test.yyy |
99 |
- trap "rm -f $temp1 $temp2" 1 2 3 15 |
100 |
- |
101 |
- # We have to have some directories in the library path. |
102 |
--LIBPATH=$codir:$codir/iconvdata |
103 |
-+LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn |
104 |
- |
105 |
- # How the start the iconv(1) program. |
106 |
- ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \ |
107 |
-diff --git a/nptl/tst-tls6.sh b/nptl/tst-tls6.sh |
108 |
-index e6dc20572a..a25b167b2d 100755 |
109 |
---- a/nptl/tst-tls6.sh |
110 |
-+++ b/nptl/tst-tls6.sh |
111 |
-@@ -26,7 +26,7 @@ run_program_env=$1; shift |
112 |
- logfile=$common_objpfx/nptl/tst-tls6.out |
113 |
- |
114 |
- # We have to find libc and nptl |
115 |
--library_path=${common_objpfx}:${common_objpfx}nptl |
116 |
-+library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn |
117 |
- tst_tls5="${test_via_rtld_prefix} ${common_objpfx}/nptl/tst-tls5" |
118 |
- |
119 |
- > $logfile |
120 |
--- |
121 |
-2.26.2 |
122 |
- |
123 |
|
124 |
diff --git a/9999/0004-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch b/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch |
125 |
similarity index 60% |
126 |
rename from 9999/0004-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch |
127 |
rename to 9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch |
128 |
index 4002a64..5604d9f 100644 |
129 |
--- a/9999/0004-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch |
130 |
+++ b/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch |
131 |
@@ -1,8 +1,8 @@ |
132 |
-From 493fd65c116f423e9bb0a374314775fd475575c3 Mon Sep 17 00:00:00 2001 |
133 |
+From cc789d18e5f6bb39ecca6ee8ec2872bd7a737160 Mon Sep 17 00:00:00 2001 |
134 |
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o> |
135 |
Date: Tue, 29 Aug 2017 22:58:50 +0200 |
136 |
-Subject: [PATCH 04/12] Revert " * sysdeps/posix/getaddrinfo.c (gaih_inet): |
137 |
- Only use gethostbyname4_r" |
138 |
+Subject: [PATCH 2/5] Revert " * sysdeps/posix/getaddrinfo.c (gaih_inet): Only |
139 |
+ use gethostbyname4_r" |
140 |
|
141 |
This reverts commit 8479f23aa1d5e5477a37f46823856bdafaedfa46. |
142 |
|
143 |
@@ -10,12 +10,24 @@ See for the background |
144 |
https://sourceware.org/bugzilla/show_bug.cgi?id=16826 |
145 |
https://bugs.gentoo.org/show_bug.cgi?id=600632 |
146 |
|
147 |
-This makes test resolv/tst-res_use_inet6 fail. Disable it. |
148 |
-(cherry picked from commit 06a2a073a2c6fb3e1489af96e125daca248d0a03) |
149 |
+This makes tst-nss-files-hosts-multi fail. Disable it. |
150 |
--- |
151 |
+ nss/Makefile | 1 - |
152 |
sysdeps/posix/getaddrinfo.c | 9 ++------- |
153 |
- 1 file changed, 2 insertions(+), 7 deletions(-) |
154 |
+ 2 files changed, 2 insertions(+), 8 deletions(-) |
155 |
|
156 |
+diff --git a/nss/Makefile b/nss/Makefile |
157 |
+index 97bab5bb75..7a6ddebde2 100644 |
158 |
+--- a/nss/Makefile |
159 |
++++ b/nss/Makefile |
160 |
+@@ -68,7 +68,6 @@ tests-container = \ |
161 |
+ # Tests which need libdl |
162 |
+ ifeq (yes,$(build-shared)) |
163 |
+ tests += tst-nss-files-hosts-erange |
164 |
+-tests += tst-nss-files-hosts-multi |
165 |
+ tests += tst-nss-files-hosts-getent |
166 |
+ tests += tst-nss-files-alias-leak |
167 |
+ tests += tst-nss-files-alias-truncated |
168 |
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c |
169 |
index ed04e564f9..ce9e0d342d 100644 |
170 |
--- a/sysdeps/posix/getaddrinfo.c |
171 |
|
172 |
diff --git a/9999/0010-Gentoo-Adapt-tests-to-etc-mail-alias-location.patch b/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch |
173 |
similarity index 75% |
174 |
rename from 9999/0010-Gentoo-Adapt-tests-to-etc-mail-alias-location.patch |
175 |
rename to 9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch |
176 |
index bcf87ab..13ff145 100644 |
177 |
--- a/9999/0010-Gentoo-Adapt-tests-to-etc-mail-alias-location.patch |
178 |
+++ b/9999/0003-Adapt-to-Gentoo-specific-etc-mail-aliases.patch |
179 |
@@ -1,15 +1,34 @@ |
180 |
-From 96f7387cdee162005d2373cbdcd1f7b65dfccd2c Mon Sep 17 00:00:00 2001 |
181 |
-From: "Andreas K. Huettel" <dilfridge@g.o> |
182 |
-Date: Sat, 21 Mar 2020 15:54:14 +0100 |
183 |
-Subject: [PATCH 10/12] Gentoo: Adapt tests to /etc/mail/alias location |
184 |
+From dbe134e9eed77bfbbbbf80fa97f2b02b869bcf9c Mon Sep 17 00:00:00 2001 |
185 |
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o> |
186 |
+Date: Mon, 22 Oct 2018 22:34:13 +0200 |
187 |
+Subject: [PATCH 3/5] Adapt to Gentoo-specific /etc/mail/aliases |
188 |
+MIME-Version: 1.0 |
189 |
+Content-Type: text/plain; charset=UTF-8 |
190 |
+Content-Transfer-Encoding: 8bit |
191 |
|
192 |
-Signed-off-by: Andreas K. Huettel <dilfridge@g.o> |
193 |
-(cherry picked from commit 03fb405d759b9806fa150813f04dfe1aaa658ac6) |
194 |
+Patch by pacho2 |
195 |
+ |
196 |
+Signed-off-by: Andreas K. Hüttel <dilfridge@g.o> |
197 |
+(cherry picked from commit 4e616cda056f471b799beba2b1cedc787ad4ecc0) |
198 |
--- |
199 |
+ nss/nss_files/files-alias.c | 2 +- |
200 |
nss/tst-nss-files-alias-leak.c | 18 +++++++++--------- |
201 |
support/support_chroot.c | 8 +++++++- |
202 |
- 2 files changed, 16 insertions(+), 10 deletions(-) |
203 |
+ 3 files changed, 17 insertions(+), 11 deletions(-) |
204 |
|
205 |
+diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c |
206 |
+index 6aff7b4c10..bb6d9b5765 100644 |
207 |
+--- a/nss/nss_files/files-alias.c |
208 |
++++ b/nss/nss_files/files-alias.c |
209 |
+@@ -49,7 +49,7 @@ internal_setent (FILE **stream) |
210 |
+ |
211 |
+ if (*stream == NULL) |
212 |
+ { |
213 |
+- *stream = fopen ("/etc/aliases", "rce"); |
214 |
++ *stream = fopen ("/etc/mail/aliases", "rce"); |
215 |
+ |
216 |
+ if (*stream == NULL) |
217 |
+ status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; |
218 |
diff --git a/nss/tst-nss-files-alias-leak.c b/nss/tst-nss-files-alias-leak.c |
219 |
index daebbf4ed4..095bb753a6 100644 |
220 |
--- a/nss/tst-nss-files-alias-leak.c |
221 |
|
222 |
diff --git a/9999/0008-Gentoo-Add-a-C.UTF-8-locale.patch b/9999/0004-Add-C.UTF-8-locale.patch |
223 |
similarity index 98% |
224 |
rename from 9999/0008-Gentoo-Add-a-C.UTF-8-locale.patch |
225 |
rename to 9999/0004-Add-C.UTF-8-locale.patch |
226 |
index 31903b6..deea332 100644 |
227 |
--- a/9999/0008-Gentoo-Add-a-C.UTF-8-locale.patch |
228 |
+++ b/9999/0004-Add-C.UTF-8-locale.patch |
229 |
@@ -1,7 +1,7 @@ |
230 |
-From baeb7948ba8b6cc25059cf9659d045e24cd7d879 Mon Sep 17 00:00:00 2001 |
231 |
+From 776636b6940ed6f3e08b0a67c290f241885384cb Mon Sep 17 00:00:00 2001 |
232 |
From: Mike FABIAN <mfabian@××××××.com> |
233 |
Date: Mon, 10 Aug 2015 15:58:12 +0200 |
234 |
-Subject: [PATCH 08/12] Gentoo: Add a C.UTF-8 locale |
235 |
+Subject: [PATCH 4/5] Add C.UTF-8 locale |
236 |
|
237 |
Source: |
238 |
https://src.fedoraproject.org/rpms/glibc/raw/master/f/glibc-c-utf8-locale.patch |
239 |
|
240 |
diff --git a/9999/0009-Gentoo-force-O0-in-conform-tests-to-survive-CC-chang.patch b/9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch |
241 |
similarity index 94% |
242 |
rename from 9999/0009-Gentoo-force-O0-in-conform-tests-to-survive-CC-chang.patch |
243 |
rename to 9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch |
244 |
index 9504792..02532cd 100644 |
245 |
--- a/9999/0009-Gentoo-force-O0-in-conform-tests-to-survive-CC-chang.patch |
246 |
+++ b/9999/0005-Force-O0-in-conform-tests-to-survive-CC-changes.patch |
247 |
@@ -1,8 +1,7 @@ |
248 |
-From 1c39b1dd8ad727a48cb3c9fbcd9d005f690752eb Mon Sep 17 00:00:00 2001 |
249 |
+From 84d03a910e28bb804453dad3e7600afe5e70256d Mon Sep 17 00:00:00 2001 |
250 |
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o> |
251 |
Date: Fri, 14 Dec 2018 20:43:04 +0100 |
252 |
-Subject: [PATCH 09/12] Gentoo: force -O0 in conform tests to survive $CC |
253 |
- changes |
254 |
+Subject: [PATCH 5/5] Force -O0 in conform tests to survive $CC changes |
255 |
MIME-Version: 1.0 |
256 |
Content-Type: text/plain; charset=UTF-8 |
257 |
Content-Transfer-Encoding: 8bit |
258 |
|
259 |
diff --git a/9999/0005-Gentoo-disable-tests-that-fail-only-in-sandbox.patch b/9999/0005-Gentoo-disable-tests-that-fail-only-in-sandbox.patch |
260 |
deleted file mode 100644 |
261 |
index f0b00a5..0000000 |
262 |
--- a/9999/0005-Gentoo-disable-tests-that-fail-only-in-sandbox.patch |
263 |
+++ /dev/null |
264 |
@@ -1,144 +0,0 @@ |
265 |
-From 8c012e90bf4645d37cb022d273d814b3fbc33a94 Mon Sep 17 00:00:00 2001 |
266 |
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o> |
267 |
-Date: Mon, 11 Sep 2017 13:14:46 +0200 |
268 |
-Subject: [PATCH 05/12] Gentoo: disable tests that fail only in sandbox |
269 |
- |
270 |
---- |
271 |
- elf/Makefile | 16 +--------------- |
272 |
- io/Makefile | 2 +- |
273 |
- nptl/Makefile | 7 +++++-- |
274 |
- posix/Makefile | 4 ++-- |
275 |
- resolv/Makefile | 2 -- |
276 |
- sysdeps/unix/sysv/linux/Makefile | 2 +- |
277 |
- 6 files changed, 10 insertions(+), 23 deletions(-) |
278 |
- |
279 |
-diff --git a/elf/Makefile b/elf/Makefile |
280 |
-index da689a2c7b..dcf29d47b9 100644 |
281 |
---- a/elf/Makefile |
282 |
-+++ b/elf/Makefile |
283 |
-@@ -413,8 +413,7 @@ tests-special += $(objpfx)order-cmp.out $(objpfx)tst-array1-cmp.out \ |
284 |
- $(objpfx)tst-array4-cmp.out $(objpfx)tst-array5-cmp.out \ |
285 |
- $(objpfx)tst-array5-static-cmp.out $(objpfx)order2-cmp.out \ |
286 |
- $(objpfx)tst-initorder-cmp.out \ |
287 |
-- $(objpfx)tst-initorder2-cmp.out $(objpfx)tst-unused-dep.out \ |
288 |
-- $(objpfx)tst-unused-dep-cmp.out |
289 |
-+ $(objpfx)tst-initorder2-cmp.out |
290 |
- endif |
291 |
- |
292 |
- check-abi: $(objpfx)check-abi-ld.out |
293 |
-@@ -1461,19 +1460,6 @@ $(objpfx)tst-relsort1mod2.so: $(libm) |
294 |
- $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \ |
295 |
- $(objpfx)tst-relsort1mod2.so |
296 |
- |
297 |
--$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so |
298 |
-- $(test-wrapper-env) \ |
299 |
-- LD_TRACE_LOADED_OBJECTS=1 \ |
300 |
-- LD_DEBUG=unused \ |
301 |
-- LD_PRELOAD= \ |
302 |
-- $(rtld-prefix) \ |
303 |
-- $< > $@; \ |
304 |
-- $(evaluate-test) |
305 |
-- |
306 |
--$(objpfx)tst-unused-dep-cmp.out: $(objpfx)tst-unused-dep.out |
307 |
-- cmp $< /dev/null > $@; \ |
308 |
-- $(evaluate-test) |
309 |
-- |
310 |
- $(objpfx)tst-audit11.out: $(objpfx)tst-auditmod11.so $(objpfx)tst-audit11mod1.so |
311 |
- $(objpfx)tst-audit11: $(libdl) |
312 |
- tst-audit11-ENV = LD_AUDIT=$(objpfx)tst-auditmod11.so |
313 |
-diff --git a/io/Makefile b/io/Makefile |
314 |
-index cf380f3516..b6fe301f77 100644 |
315 |
---- a/io/Makefile |
316 |
-+++ b/io/Makefile |
317 |
-@@ -73,7 +73,7 @@ tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \ |
318 |
- tst-mknodat tst-mkfifoat tst-ttyname_r bug-ftw5 \ |
319 |
- tst-posix_fallocate tst-posix_fallocate64 \ |
320 |
- tst-fts tst-fts-lfs tst-open-tmpfile \ |
321 |
-- tst-copy_file_range tst-getcwd-abspath tst-lockf \ |
322 |
-+ tst-getcwd-abspath tst-lockf \ |
323 |
- tst-ftw-lnk tst-file_change_detection tst-lchmod |
324 |
- |
325 |
- # Likewise for statx, but we do not need static linking here. |
326 |
-diff --git a/nptl/Makefile b/nptl/Makefile |
327 |
-index e554a3898d..8373b6989d 100644 |
328 |
---- a/nptl/Makefile |
329 |
-+++ b/nptl/Makefile |
330 |
-@@ -282,7 +282,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \ |
331 |
- tst-atfork1 \ |
332 |
- tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel4 tst-cancel4_1 \ |
333 |
- tst-cancel4_2 tst-cancel5 \ |
334 |
-- tst-cancel6 tst-cancel7 tst-cancel8 tst-cancel9 tst-cancel10 \ |
335 |
-+ tst-cancel6 tst-cancel8 tst-cancel9 tst-cancel10 \ |
336 |
- tst-cancel11 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 \ |
337 |
- tst-cancel16 tst-cancel17 tst-cancel18 tst-cancel19 tst-cancel20 \ |
338 |
- tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 \ |
339 |
-@@ -319,6 +319,9 @@ tests = tst-attr2 tst-attr3 tst-default-attr \ |
340 |
- tst-robust-fork tst-create-detached tst-memstream \ |
341 |
- tst-thread-exit-clobber tst-minstack-cancel tst-minstack-exit \ |
342 |
- tst-minstack-throw \ |
343 |
-+ tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ |
344 |
-+ tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \ |
345 |
-+ tst-mtx-recursive tst-call-once tst-mtx-timedlock \ |
346 |
- tst-rwlock-pwn \ |
347 |
- tst-unwind-thread |
348 |
- |
349 |
-@@ -384,7 +387,7 @@ CFLAGS-tst-cleanup2.c += -fno-builtin |
350 |
- CFLAGS-tst-cleanupx2.c += -fno-builtin |
351 |
- |
352 |
- tests += tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx5 \ |
353 |
-- tst-cancelx6 tst-cancelx7 tst-cancelx8 tst-cancelx9 tst-cancelx10 \ |
354 |
-+ tst-cancelx6 tst-cancelx8 tst-cancelx9 tst-cancelx10 \ |
355 |
- tst-cancelx11 tst-cancelx12 tst-cancelx13 tst-cancelx14 tst-cancelx15 \ |
356 |
- tst-cancelx16 tst-cancelx17 tst-cancelx18 tst-cancelx20 tst-cancelx21 \ |
357 |
- tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 |
358 |
-diff --git a/posix/Makefile b/posix/Makefile |
359 |
-index 4507d84bf1..28075ed5bf 100644 |
360 |
---- a/posix/Makefile |
361 |
-+++ b/posix/Makefile |
362 |
-@@ -68,7 +68,7 @@ routines := \ |
363 |
- streams-compat |
364 |
- |
365 |
- aux := init-posix environ |
366 |
--tests := test-errno tstgetopt testfnm runtests runptests \ |
367 |
-+tests := tstgetopt testfnm runtests runptests \ |
368 |
- tst-preadwrite tst-preadwrite64 test-vfork regexbug1 \ |
369 |
- tst-mmap tst-mmap-offset tst-getaddrinfo tst-truncate \ |
370 |
- tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \ |
371 |
-@@ -89,7 +89,7 @@ tests := test-errno tstgetopt testfnm runtests runptests \ |
372 |
- tst-execve1 tst-execve2 tst-execle1 tst-execle2 \ |
373 |
- tst-execvp3 tst-execvp4 \ |
374 |
- tst-execvpe1 tst-execvpe2 tst-execvpe3 tst-execvpe4 \ |
375 |
-- tst-execvpe5 tst-execvpe6 \ |
376 |
-+ tst-execvpe6 \ |
377 |
- tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset \ |
378 |
- bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \ |
379 |
- bug-getopt5 tst-getopt_long1 bug-regex34 bug-regex35 \ |
380 |
-diff --git a/resolv/Makefile b/resolv/Makefile |
381 |
-index f131e4b014..6ee6570345 100644 |
382 |
---- a/resolv/Makefile |
383 |
-+++ b/resolv/Makefile |
384 |
-@@ -72,8 +72,6 @@ tests += \ |
385 |
- |
386 |
- # Needs resolv_context. |
387 |
- tests-internal += \ |
388 |
-- tst-resolv-res_init \ |
389 |
-- tst-resolv-res_init-thread \ |
390 |
- tst-resolv-res_ninit \ |
391 |
- tst-resolv-threads \ |
392 |
- |
393 |
-diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile |
394 |
-index 60dc5cf9e5..158b2be0d2 100644 |
395 |
---- a/sysdeps/unix/sysv/linux/Makefile |
396 |
-+++ b/sysdeps/unix/sysv/linux/Makefile |
397 |
-@@ -95,7 +95,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ |
398 |
- bits/ipc-perm.h |
399 |
- |
400 |
- tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ |
401 |
-- tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \ |
402 |
-+ tst-quota tst-sync_file_range tst-sysconf-iov_max \ |
403 |
- test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \ |
404 |
- tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \ |
405 |
- tst-tgkill |
406 |
--- |
407 |
-2.26.2 |
408 |
- |
409 |
|
410 |
diff --git a/9999/0006-Gentoo-Disable-test-that-fails-because-of-the-gethos.patch b/9999/0006-Gentoo-Disable-test-that-fails-because-of-the-gethos.patch |
411 |
deleted file mode 100644 |
412 |
index 30b2308..0000000 |
413 |
--- a/9999/0006-Gentoo-Disable-test-that-fails-because-of-the-gethos.patch |
414 |
+++ /dev/null |
415 |
@@ -1,25 +0,0 @@ |
416 |
-From 3b6603fa966a37830261f1452d83f0aa80a1ec7d Mon Sep 17 00:00:00 2001 |
417 |
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o> |
418 |
-Date: Wed, 17 Jan 2018 01:02:19 +0100 |
419 |
-Subject: [PATCH 06/12] Gentoo: Disable test that fails because of the |
420 |
- gethostbyname4_r revert |
421 |
- |
422 |
---- |
423 |
- nss/Makefile | 1 - |
424 |
- 1 file changed, 1 deletion(-) |
425 |
- |
426 |
-diff --git a/nss/Makefile b/nss/Makefile |
427 |
-index 97bab5bb75..7a6ddebde2 100644 |
428 |
---- a/nss/Makefile |
429 |
-+++ b/nss/Makefile |
430 |
-@@ -68,7 +68,6 @@ tests-container = \ |
431 |
- # Tests which need libdl |
432 |
- ifeq (yes,$(build-shared)) |
433 |
- tests += tst-nss-files-hosts-erange |
434 |
--tests += tst-nss-files-hosts-multi |
435 |
- tests += tst-nss-files-hosts-getent |
436 |
- tests += tst-nss-files-alias-leak |
437 |
- tests += tst-nss-files-alias-truncated |
438 |
--- |
439 |
-2.26.2 |
440 |
- |
441 |
|
442 |
diff --git a/9999/0007-Gentoo-Adapt-to-Gentoo-specific-etc-mail-aliases.patch b/9999/0007-Gentoo-Adapt-to-Gentoo-specific-etc-mail-aliases.patch |
443 |
deleted file mode 100644 |
444 |
index 0196398..0000000 |
445 |
--- a/9999/0007-Gentoo-Adapt-to-Gentoo-specific-etc-mail-aliases.patch |
446 |
+++ /dev/null |
447 |
@@ -1,32 +0,0 @@ |
448 |
-From 9de1a12253bcbec66b56b5058fcc04e775f59e75 Mon Sep 17 00:00:00 2001 |
449 |
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o> |
450 |
-Date: Mon, 22 Oct 2018 22:34:13 +0200 |
451 |
-Subject: [PATCH 07/12] Gentoo: Adapt to Gentoo-specific /etc/mail/aliases |
452 |
-MIME-Version: 1.0 |
453 |
-Content-Type: text/plain; charset=UTF-8 |
454 |
-Content-Transfer-Encoding: 8bit |
455 |
- |
456 |
-Patch by pacho2 |
457 |
- |
458 |
-Signed-off-by: Andreas K. Hüttel <dilfridge@g.o> |
459 |
-(cherry picked from commit 4e616cda056f471b799beba2b1cedc787ad4ecc0) |
460 |
---- |
461 |
- nss/nss_files/files-alias.c | 2 +- |
462 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
463 |
- |
464 |
-diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c |
465 |
-index 6aff7b4c10..bb6d9b5765 100644 |
466 |
---- a/nss/nss_files/files-alias.c |
467 |
-+++ b/nss/nss_files/files-alias.c |
468 |
-@@ -49,7 +49,7 @@ internal_setent (FILE **stream) |
469 |
- |
470 |
- if (*stream == NULL) |
471 |
- { |
472 |
-- *stream = fopen ("/etc/aliases", "rce"); |
473 |
-+ *stream = fopen ("/etc/mail/aliases", "rce"); |
474 |
- |
475 |
- if (*stream == NULL) |
476 |
- status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; |
477 |
--- |
478 |
-2.26.2 |
479 |
- |