diff --git a/SOURCES/glibc-arm-hardfloat-3.patch b/SOURCES/glibc-arm-hardfloat-3.patch index 43fe9be..d9bebf3 100644 --- a/SOURCES/glibc-arm-hardfloat-3.patch +++ b/SOURCES/glibc-arm-hardfloat-3.patch @@ -1,3 +1,5 @@ +(Not needed anymore.) + diff -Nru glibc-2.17-c758a686/elf/dl-load.c glibc-2.17-c758a686/elf/dl-load.c --- glibc-2.17-c758a686/elf/dl-load.c 2012-06-06 13:07:41.727524312 -0600 +++ glibc-2.17-c758a686/elf/dl-load.c 2012-06-06 13:11:19.308681002 -0600 diff --git a/SOURCES/glibc-fedora-gai-canonical.patch b/SOURCES/glibc-fedora-gai-canonical.patch index e268e72..7f767ae 100644 --- a/SOURCES/glibc-fedora-gai-canonical.patch +++ b/SOURCES/glibc-fedora-gai-canonical.patch @@ -1,15 +1,11 @@ -From bf18f175afdb59cdcd1016995b351e2bbb1d6ba7 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Tue, 21 Jun 2011 17:28:57 +0200 -Subject: [PATCH] Don't use gethostbyaddr to determine canonical name +Upstream commit, fixing [BZ #15218]: -* sysdeps/posix/getaddrinfo.c (gaih_inet): Don't use gethostbyaddr -to determine canonical name. +commit b957ced8890a4438c8efe2c15e5abf4e327f25cf +Author: Andreas Schwab +Date: Tue Oct 15 10:21:13 2013 +0200 + + Don't use gethostbyaddr to determine canonical name ---- - ChangeLog | 5 +++ - sysdeps/posix/getaddrinfo.c | 77 +++---------------------------------------- - 2 files changed, 10 insertions(+), 72 deletions(-) --- glibc-2.17-c758a686/sysdeps/posix/getaddrinfo.c +++ glibc-2.17-c758a686/sysdeps/posix/getaddrinfo.c diff --git a/SOURCES/glibc-fedora-getrlimit-PLT.patch b/SOURCES/glibc-fedora-getrlimit-PLT.patch index 760d8c0..43cabea 100644 --- a/SOURCES/glibc-fedora-getrlimit-PLT.patch +++ b/SOURCES/glibc-fedora-getrlimit-PLT.patch @@ -1,20 +1,10 @@ -From 70d0a630700f602a457832383161d261fe222db5 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Thu, 1 Jul 2010 13:14:26 +0200 -Subject: [PATCH] Fix PLT reference +Related upstream commit: -* include/sys/resource.h (__getrlimit): Add hidden proto. -* sysdeps/unix/sysv/linux/i386/getrlimit.c: Add libc_hidden_weak. -* sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def. -* resource/getrlimit.c: Likewise. +commit c5c2b7c3fd823fc5c4a52506292a90eba60b0c62 +Author: Joseph Myers +Date: Sat Dec 6 23:40:48 2014 +0000 ---- - ChangeLog | 7 +++++++ - include/sys/resource.h | 1 + - resource/getrlimit.c | 1 + - sysdeps/mach/hurd/getrlimit.c | 1 + - sysdeps/unix/sysv/linux/i386/getrlimit.c | 1 + - 5 files changed, 11 insertions(+), 0 deletions(-) + Fix pthreads getrlimit, gettimeofday namespace (bug 17682). --- glibc-2.17-c758a686/include/sys/resource.h +++ glibc-2.17-c758a686/include/sys/resource.h diff --git a/SOURCES/glibc-fedora-include-bits-ldbl.patch b/SOURCES/glibc-fedora-include-bits-ldbl.patch index 63e6a14..0aa3c0f 100644 --- a/SOURCES/glibc-fedora-include-bits-ldbl.patch +++ b/SOURCES/glibc-fedora-include-bits-ldbl.patch @@ -1,3 +1,9 @@ +Only needed for glibc builds with -mlong-double-64: + + https://sourceware.org/ml/libc-alpha/2017-08/msg01139.html + +This means the patch is no longer needed. + From 5eb4509a6651d19c7a28c4506d6aa582c9ee095a Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 1 Feb 2006 09:30:43 +0000 diff --git a/SOURCES/glibc-fedora-ldd.patch b/SOURCES/glibc-fedora-ldd.patch index fb3ff29..28f18d3 100644 --- a/SOURCES/glibc-fedora-ldd.patch +++ b/SOURCES/glibc-fedora-ldd.patch @@ -1,14 +1,10 @@ -From 83e5edd390eabe8f8e8e0d051f929b77a30c0767 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Fri, 18 Mar 2011 16:22:52 +0100 -Subject: [PATCH] ldd: never run file directly +Upstream commit: -* elf/ldd.bash.in: Never run file directly. +commit eedca9772e99c72ab4c3c34e43cc764250aa3e3c (HEAD -> master) +Author: Andreas Schwab +Date: Wed Aug 16 15:59:55 2017 +0200 ---- - ChangeLog | 4 ++++ - elf/ldd.bash.in | 14 +------------- - 2 files changed, 5 insertions(+), 13 deletions(-) + ldd: never run file directly --- glibc-2.17-c758a686/elf/ldd.bash.in +++ glibc-2.17-c758a686/elf/ldd.bash.in diff --git a/SOURCES/glibc-fedora-ppc-unwind.patch b/SOURCES/glibc-fedora-ppc-unwind.patch index 1068fd8..28a1e58 100644 --- a/SOURCES/glibc-fedora-ppc-unwind.patch +++ b/SOURCES/glibc-fedora-ppc-unwind.patch @@ -1,3 +1,6 @@ +(This patch is no longer needed because we currently build all of +glibc with -fno-asynchronous-unwind-tables.) + glibc-2.3.3-1478-g37582bc * Thu Nov 30 2006 Jakub Jelinek 2.5.90-9 diff --git a/SOURCES/glibc-fedora-regcomp-sw11561.patch b/SOURCES/glibc-fedora-regcomp-sw11561.patch index 372f9b3..3366dd9 100644 --- a/SOURCES/glibc-fedora-regcomp-sw11561.patch +++ b/SOURCES/glibc-fedora-regcomp-sw11561.patch @@ -1,3 +1,11 @@ +Upstream commit: + +commit 7e2f0d2d77e4bc273fe00f99d970605d8e38d4d6 +Author: Andreas Schwab +Date: Mon Feb 4 10:16:33 2013 +0100 + + Fix handling of collating symbols in regexps + From c1b97d6d896b1f22fdf5d28471ef7859ec840a57 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 1 Sep 2010 17:26:15 +0200 diff --git a/SOURCES/glibc-fedora-uname-getrlimit.patch b/SOURCES/glibc-fedora-uname-getrlimit.patch index b8338b3..3529d0c 100644 --- a/SOURCES/glibc-fedora-uname-getrlimit.patch +++ b/SOURCES/glibc-fedora-uname-getrlimit.patch @@ -1,22 +1,13 @@ -From cde99cd2b7b16a6113acb054e89d490047932a9f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Thu, 8 Apr 2010 11:18:26 +0200 -Subject: [PATCH] Don't call uname or getrlimit in libpthread init function +Related upstream commit: -* sysdeps/unix/sysv/linux/i386/Versions: Export __uname under -GLIBC_PRIVATE. -* nptl/Versions: Export __getrlimit under GLIBC_PRIVATE. -* sysdeps/unix/sysv/linux/i386/smp.h: Call __uname instead of uname. -* nptl/nptl-init.c: Call __getrlimit instead of getrlimit. +commit c5c2b7c3fd823fc5c4a52506292a90eba60b0c62 +Author: Joseph Myers +Date: Sat Dec 6 23:40:48 2014 +0000 ---- - ChangeLog | 8 ++++++++ - nptl/Versions | 1 + - nptl/nptl-init.c | 2 +- - nptl/sysdeps/unix/sysv/linux/i386/Versions | 6 ++++++ - nptl/sysdeps/unix/sysv/linux/i386/smp.h | 2 +- - 5 files changed, 17 insertions(+), 2 deletions(-) - create mode 100644 nptl/sysdeps/unix/sysv/linux/i386/Versions + Fix pthreads getrlimit, gettimeofday namespace (bug 17682). + +The uname call is again present in Fedora because UTS namespaces can +be used nowadays to change the uname result. --- glibc-2.17-c758a686/nptl/Version +++ glibc-2.17-c758a686/nptl/Versions diff --git a/SOURCES/glibc-rh1000923.patch b/SOURCES/glibc-rh1000923.patch index 0db02a3..afc6f63 100644 --- a/SOURCES/glibc-rh1000923.patch +++ b/SOURCES/glibc-rh1000923.patch @@ -1,3 +1,11 @@ +commit 595aba70a4c676f7efaf6a012f54cd22aa189c5b +Author: Siddhesh Poyarekar +Date: Mon Aug 26 15:42:29 2013 +0530 + + Initialize res_hconf in nscd + + Fixes BZ #15890. + diff -pruN glibc-2.17-c758a686/nscd/aicache.c glibc-2.17-c758a686/nscd/aicache.c --- glibc-2.17-c758a686/nscd/aicache.c 2013-08-11 04:22:55.000000000 +0530 +++ glibc-2.17-c758a686/nscd/aicache.c 2013-08-26 11:10:25.843470413 +0530 diff --git a/SOURCES/glibc-rh1025934.patch b/SOURCES/glibc-rh1025934.patch index a89696a..37758d9 100644 --- a/SOURCES/glibc-rh1025934.patch +++ b/SOURCES/glibc-rh1025934.patch @@ -1,3 +1,11 @@ +Mostly equivalent upstream commit: + +commit 0699f766b10c86912b75f35bef697106b70c1cf6 +Author: Carlos O'Donell +Date: Thu Apr 10 18:31:53 2014 -0400 + + nscd: Make SELinux checks dynamic. + diff --git glibc-2.17-c758a686/nscd/selinux.c glibc-2.17-c758a686/nscd/selinux.c index 0866c44..ba55b04 100644 --- glibc-2.17-c758a686/nscd/selinux.c diff --git a/SOURCES/glibc-rh1039970.patch b/SOURCES/glibc-rh1039970.patch index 1898fa5..85f8b91 100644 --- a/SOURCES/glibc-rh1039970.patch +++ b/SOURCES/glibc-rh1039970.patch @@ -1,3 +1,9 @@ +commit 9a3c6a6ff602c88d7155139a7d7d0000b7b7e946 +Author: Siddhesh Poyarekar +Date: Thu Jan 2 10:05:27 2014 +0530 + + Fix return code from getent netgroup when the netgroup is not found (bz #16366) + diff -pruN glibc-2.17-c758a686/nscd/netgroupcache.c glibc-2.17-c758a686/nscd/netgroupcache.c --- glibc-2.17-c758a686/nscd/netgroupcache.c 2013-12-03 20:41:12.000000000 -0500 +++ glibc-2.17-c758a686/nscd/netgroupcache.c 2013-12-19 08:36:52.253000000 -0500 diff --git a/SOURCES/glibc-rh1046199.patch b/SOURCES/glibc-rh1046199.patch index 64505c5..b00c985 100644 --- a/SOURCES/glibc-rh1046199.patch +++ b/SOURCES/glibc-rh1046199.patch @@ -1,3 +1,9 @@ +commit d41242129ba693cdbc8db85b846fcaccf9f0b7c4 +Author: Siddhesh Poyarekar +Date: Thu Jan 2 10:03:12 2014 +0530 + + Fix infinite loop in nscd when netgroup is empty (bz #16365) + diff -pruN glibc-2.17-c758a686/nscd/netgroupcache.c glibc-2.17-c758a686/nscd/netgroupcache.c --- glibc-2.17-c758a686/nscd/netgroupcache.c 2013-12-20 04:38:40.432000000 -0500 +++ glibc-2.17-c758a686/nscd/netgroupcache.c 2013-12-20 04:37:29.945000000 -0500 diff --git a/SOURCES/glibc-rh1070806.patch b/SOURCES/glibc-rh1070806.patch index 0d896a2..9f5fa3d 100644 --- a/SOURCES/glibc-rh1070806.patch +++ b/SOURCES/glibc-rh1070806.patch @@ -1,3 +1,14 @@ +Comprehensive stack protector support was added to upstream glibc with +this commit: + +commit cecbc7967f0bcac718b6f8f8942b58403c0e917c +Author: Nick Alcock +Date: Mon Dec 26 10:09:10 2016 +0100 + + Enable -fstack-protector=* when requested by configure [BZ #7065] + +It is a superset of the functionality in this patch. + diff -urN glibc-2.17-c758a686/config.make.in glibc-2.17-c758a686/config.make.in --- glibc-2.17-c758a686/config.make.in 2014-02-27 10:33:11.466763885 -0500 +++ glibc-2.17-c758a686/config.make.in 2014-02-27 10:36:44.481320149 -0500 diff --git a/SOURCES/glibc-rh1120490.patch b/SOURCES/glibc-rh1120490.patch index 938938f..c2ab741 100644 --- a/SOURCES/glibc-rh1120490.patch +++ b/SOURCES/glibc-rh1120490.patch @@ -1,6 +1,6 @@ -commit d0df3cfd9ffa32b85abae180127dc2a57db51f03 +commit 602f80ec8b966cfad3b61914cbe14ee606cedf6e Author: Siddhesh Poyarekar -Date: Tue Sep 16 21:57:25 2014 +0530 +Date: Tue Sep 16 22:16:01 2014 +0530 Make __extern_always_inline usable on clang++ again diff --git a/SOURCES/glibc-rh1133812-1.patch b/SOURCES/glibc-rh1133812-1.patch index fedf8a9..963e6a4 100644 --- a/SOURCES/glibc-rh1133812-1.patch +++ b/SOURCES/glibc-rh1133812-1.patch @@ -1,3 +1,12 @@ +commit a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8 +Author: Florian Weimer +Date: Tue Aug 26 19:38:59 2014 +0200 + + __gconv_translit_find: Disable function [BZ #17187] + + This functionality has never worked correctly, and the implementation + contained a security vulnerability (CVE-2014-5119). + 2014-08-21 Florian Weimer [BZ #17187] diff --git a/SOURCES/glibc-rh1150282.patch b/SOURCES/glibc-rh1150282.patch index 4970cf8..59de1df 100644 --- a/SOURCES/glibc-rh1150282.patch +++ b/SOURCES/glibc-rh1150282.patch @@ -1,3 +1,19 @@ +This patch provides a compatibility kludge for legacy applications +which do not provide proper stack alignment. It cannot be upstreamed. + +The kludge is active for both i386 and x86-64, but it is actually only +needed on i386. + +In Fedora, the same effect was achieved by disabling multi-arch +altogether: + + https://bugzilla.redhat.com/show_bug.cgi?id=1471427 + +Further discussion is on this internal bug: + + https://bugzilla.redhat.com/show_bug.cgi?id=1478332 + + --- glibc-2.17-c758a686/sysdeps/x86_64/multiarch/ifunc-impl-list.c 2012-12-24 20:02:13.000000000 -0700 +++ glibc-2.17-c758a686/sysdeps/x86_64/multiarch/ifunc-impl-list.c 2015-04-20 09:04:11.826569951 -0600 @@ -212,6 +212,8 @@ diff --git a/SOURCES/glibc-rh1156331.patch b/SOURCES/glibc-rh1156331.patch index bf4833a..39ea469 100644 --- a/SOURCES/glibc-rh1156331.patch +++ b/SOURCES/glibc-rh1156331.patch @@ -1,6 +1,6 @@ -commit e276f4f310a89a925dd59e583f7a1bef2114d9a7 +commit be349d7042de84c3c5157a5c1fbcad580aed33e1 Author: Siddhesh Poyarekar -Date: Tue Nov 25 21:15:16 2014 +0530 +Date: Thu Dec 4 08:08:37 2014 +0530 ftell: seek to end only when there are unflushed bytes (BZ #17647) @@ -20,13 +20,13 @@ Date: Tue Nov 25 21:15:16 2014 +0530 patch and succeeds with it, and that there are no additional regressions due to it. - [BZ #17647] - * libio/fileops.c (do_ftell): Seek only when there are - unflushed writes. - * libio/wfileops.c (do_ftell_wide): Likewise. - * libio/tst-ftell-active-handler.c (do_ftruncate_test): New - test case. - (do_one_test): Call it. + [BZ #17647] + * libio/fileops.c (do_ftell): Seek only when there are + unflushed writes. + * libio/wfileops.c (do_ftell_wide): Likewise. + * libio/tst-ftell-active-handler.c (do_ftruncate_test): New + test case. + (do_one_test): Call it. diff --git glibc-2.17-c758a686/libio/fileops.c glibc-2.17-c758a686/libio/fileops.c index e0d7b76..1fc5719 100644 diff --git a/SOURCES/glibc-rh1161666.patch b/SOURCES/glibc-rh1161666.patch index 797e97c..5285181 100644 --- a/SOURCES/glibc-rh1161666.patch +++ b/SOURCES/glibc-rh1161666.patch @@ -1,3 +1,20 @@ +commit 533bb7c2ae156ff2d49b2e0b20b33810ba5e2721 +Author: Siddhesh Poyarekar +Date: Wed Nov 12 19:30:24 2014 +0530 + + Fix stack alignment when loader is invoked directly + + The s390 ABI requires the stack pointer to be aligned at 8-bytes. + When a program is invoked as an argument to the dynamic linker, + _dl_start_user adjusts the stack to remove the dynamic linker + arguments so that the program sees only its name and arguments. This + may result in the stack being misaligned since each argument shift is + only a word and not a double-word. + + This is now fixed shifting argv and envp down instead of shifting argc + up and reclaiming the stack. This requires _dl_argv to be adjusted + and hence, is no longer relro. + diff --git glibc-2.17-c758a686/sysdeps/s390/s390-32/dl-machine.h glibc-2.17-c758a686/sysdeps/s390/s390-32/dl-machine.h index c56185c..79f8ef9 100644 --- glibc-2.17-c758a686/sysdeps/s390/s390-32/dl-machine.h diff --git a/SOURCES/glibc-rh1165192.patch b/SOURCES/glibc-rh1165192.patch index 488ac49..2ae1a66 100644 --- a/SOURCES/glibc-rh1165192.patch +++ b/SOURCES/glibc-rh1165192.patch @@ -1,14 +1,9 @@ -# -# EMARGOED!!! -- EMBARGOED!!! -- EMBARGOED!!! -# EMARGOED!!! -- EMBARGOED!!! -- EMBARGOED!!! -# EMARGOED!!! -- EMBARGOED!!! -- EMBARGOED!!! -# Release date is RHEL 7.1 RC. -# CVE-2014-8121: -# Unexpected closing of nss_files databases after lookups causes denial of service -# EMARGOED!!! -- EMBARGOED!!! -- EMBARGOED!!! -# EMARGOED!!! -- EMBARGOED!!! -- EMBARGOED!!! -# EMARGOED!!! -- EMBARGOED!!! -- EMBARGOED!!! -# +commit 03d2730b44cc2236318fd978afa2651753666c55 +Author: Florian Weimer +Date: Wed Apr 29 14:41:25 2015 +0200 + + CVE-2014-8121: Do not close NSS files database during iteration [BZ #18007] + diff -up glibc-2.17-c758a686/nss/Makefile.rh1165192 glibc-2.17-c758a686/nss/Makefile --- glibc-2.17-c758a686/nss/Makefile.rh1165192 2015-01-14 21:22:57.558006945 +0100 +++ glibc-2.17-c758a686/nss/Makefile 2015-01-14 21:44:59.657777124 +0100 diff --git a/SOURCES/glibc-rh1165212.patch b/SOURCES/glibc-rh1165212.patch index d5a5a7d..359a7d2 100644 --- a/SOURCES/glibc-rh1165212.patch +++ b/SOURCES/glibc-rh1165212.patch @@ -23,6 +23,14 @@ # being posted for review here: # https://sourceware.org/ml/libc-alpha/2014-12/msg00483.html +This was committed upstream as: + +commit ccdb048df457d581f6ac7ede8b0c7a593a891dfa +Author: Carlos O'Donell +Date: Wed Jan 21 01:51:10 2015 -0500 + + Fix recursive dlopen. + --- glibc-2.17-c758a686/dlfcn/Makefile 2012-12-24 22:02:13.000000000 -0500 +++ glibc-2.17-c758a686/dlfcn/Makefile 2015-06-22 12:44:41.000000000 -0400 @@ -35,12 +35,12 @@ endif diff --git a/SOURCES/glibc-rh1173238.patch b/SOURCES/glibc-rh1173238.patch index 8e45327..fd16686 100644 --- a/SOURCES/glibc-rh1173238.patch +++ b/SOURCES/glibc-rh1173238.patch @@ -1,3 +1,5 @@ +Cannot be upstreamed. rtkaio was removed from Fedora. + diff -u --new-file glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librtkaio-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librtkaio-le.abilist --- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librtkaio-le.abilist 1969-12-31 19:00:00.000000000 -0500 +++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librtkaio-le.abilist 2015-04-28 19:44:03.038050864 -0400 diff --git a/SOURCES/glibc-rh1186491.patch b/SOURCES/glibc-rh1186491.patch index cba9121..31dc1b5 100644 --- a/SOURCES/glibc-rh1186491.patch +++ b/SOURCES/glibc-rh1186491.patch @@ -1,3 +1,6 @@ +Patch not applicable to upstream, but the test failures not visible +there anymore. (The math tests have been reorganized.) + --- glibc-2.17-c758a686/math/libm-test.inc 2015-01-22 10:53:11.015331338 -0500 +++ glibc-2.17-c758a686/math/libm-test.inc 2015-01-26 16:46:24.631769811 -0500 @@ -521,7 +521,7 @@ diff --git a/SOURCES/glibc-rh1193797.patch b/SOURCES/glibc-rh1193797.patch index 1827403..52b1251 100644 --- a/SOURCES/glibc-rh1193797.patch +++ b/SOURCES/glibc-rh1193797.patch @@ -1,3 +1,9 @@ +commit cf9313e7d1dd42addd6cf8c9277f0f18a62cdeff +Author: Carlos O'Donell +Date: Fri Mar 13 09:49:24 2015 -0400 + + Enhance nscd's inotify support (Bug 14906). + --- glibc-2.17-c758a686/nscd/cache.c 2012-12-24 22:02:13.000000000 -0500 +++ glibc-2.17-c758a686/nscd/cache.c 2015-05-13 13:45:57.259958374 -0400 @@ -272,28 +272,38 @@ diff --git a/SOURCES/glibc-rh1216246.patch b/SOURCES/glibc-rh1216246.patch index ad64b2d..0dd0bc4 100644 --- a/SOURCES/glibc-rh1216246.patch +++ b/SOURCES/glibc-rh1216246.patch @@ -1,7 +1,11 @@ -# -# Posted upstream 2015-06-18: -# https://www.sourceware.org/ml/libc-alpha/2015-06/msg00629.html -# +commit 8b59c73386ddb64331ee03c29925a18dae547733 +Author: Carlos O'Donell +Date: Wed Jul 8 02:42:11 2015 -0400 + + Fix ruserok scalability with large ~/.rhosts file. + + Fixes bug 18557. + diff --git glibc-2.17-c758a686/inet/rcmd.c glibc-2.17-c758a686/inet/rcmd.c index 98b3735..91623b0 100644 --- glibc-2.17-c758a686/inet/rcmd.c diff --git a/SOURCES/glibc-rh1221046.patch b/SOURCES/glibc-rh1221046.patch index 69f07d8..38a3d59 100644 --- a/SOURCES/glibc-rh1221046.patch +++ b/SOURCES/glibc-rh1221046.patch @@ -1,3 +1,11 @@ +Superseded by this upstream patch: + +commit a06b40cdf5ba0d2ab4f9b4c77d21e45ff284fac7 +Author: Szabolcs Nagy +Date: Tue May 26 22:27:23 2015 +0530 + + struct stat is not posix conform + Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h =================================================================== --- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h diff --git a/SOURCES/glibc-rh1234449-2.patch b/SOURCES/glibc-rh1234449-2.patch index 5d3dea5..7939344 100644 --- a/SOURCES/glibc-rh1234449-2.patch +++ b/SOURCES/glibc-rh1234449-2.patch @@ -32,6 +32,26 @@ Date: Wed Sep 18 13:15:12 2013 -0700 (__tzset_parse_tz): Parse negative time of day. (A subset of these changes were applied as part of this patch.) +commit 3cc652e951c71785032019fec82e3b8543d85305 +Author: Mike Frysinger +Date: Fri Sep 18 13:49:08 2015 -0400 + + timezone: fix parallel check failures + + The XT testdata install rules expect the testdata dir to already exist in + the build tree, but it doesn't actually create it. Instead, it relies on + the build-testdata define happening to be executed before it (which runs + zic which creates the dir). When we run in parallel though, it's easy to + hit a failure: + $ cd timezone + $ rm -rf $objdir/timezone/testdata + $ make check -j + ... + cp testdata/XT1 .../timezone/testdata/XT1 + cp: cannot create regular file '.../timezone/testdata/XT1': No such file or directory + Makefile:116: recipe for target '.../timezone/testdata/XT1' failed + make: *** [.../timezone/testdata/XT1] Error 1 + make: *** Waiting for unfinished jobs.... diff --git a/time/tzfile.c b/time/tzfile.c --- a/time/tzfile.c @@ -679,25 +699,6 @@ index 7a5e31c..2268f8e 100644 + +The subdirectory testdata contains manually edited data files for +regression testing purposes. -diff --git a/timezone/testdata/XT1 b/timezone/testdata/XT1 -new file mode 100644 -index 0000000..67d7ee0 -Binary files /dev/null and b/timezone/testdata/XT1 differ -diff --git a/timezone/testdata/XT2 b/timezone/testdata/XT2 -new file mode 100644 -index 0000000..069189e -Binary files /dev/null and b/timezone/testdata/XT2 differ -diff --git a/timezone/testdata/XT3 b/timezone/testdata/XT3 -new file mode 100644 -index 0000000..fbf5eff -Binary files /dev/null and b/timezone/testdata/XT3 differ -diff --git a/timezone/testdata/XT4 b/timezone/testdata/XT4 -new file mode 100644 -index 0000000..990a976 -Binary files /dev/null and b/timezone/testdata/XT4 differ -diff --git a/timezone/tst-tzset.c b/timezone/tst-tzset.c -new file mode 100644 -index 0000000..aefcc76 --- /dev/null +++ b/timezone/tst-tzset.c @@ -0,0 +1,200 @@ @@ -901,3 +902,39 @@ index 0000000..aefcc76 + + return errors > 0; +} +diff --git a/timezone/Makefile b/timezone/Makefile +index 81d4a3e..bfb3463 100644 +--- a/timezone/Makefile ++++ b/timezone/Makefile +@@ -113,6 +113,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps) + $(build-testdata) + + $(testdata)/XT%: testdata/XT% ++ $(make-target-directory) + cp $< $@ + + $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make +diff -Nrup -a a/timezone/testdata/XT1 b/timezone/testdata/XT1 +--- a/timezone/testdata/XT1 1969-12-31 19:00:00.000000000 -0500 ++++ b/timezone/testdata/XT1 2017-09-14 10:19:11.382923956 -0400 +@@ -0,0 +1,2 @@ ++TZif2