diff --git a/glibc-nodate.patch b/glibc-nodate.patch index 441713f..d54f631 100644 --- a/glibc-nodate.patch +++ b/glibc-nodate.patch @@ -1,7 +1,7 @@ -Index: glibc-2.20.90/nscd/nscd_stat.c +Index: glibc-2.21/nscd/nscd_stat.c =================================================================== ---- glibc-2.20.90.orig/nscd/nscd_stat.c -+++ glibc-2.20.90/nscd/nscd_stat.c +--- glibc-2.21.orig/nscd/nscd_stat.c ++++ glibc-2.21/nscd/nscd_stat.c @@ -36,8 +36,13 @@ #endif /* HAVE_SELINUX */ @@ -30,3 +30,18 @@ Index: glibc-2.20.90/nscd/nscd_stat.c data.debug_level = debug_level; data.runtime = time (NULL) - start_time; data.client_queued = client_queued; +@@ -196,7 +206,13 @@ receive_print_stats (void) + + /* Read as much data as we expect. */ + if (TEMP_FAILURE_RETRY (read (fd, &data, sizeof (data))) != sizeof (data) +- || (memcmp (data.version, compilation, sizeof (compilation)) != 0 ++ || ( ++#ifdef __TIMESTAMP__ ++ /* Skip day of the week. */ ++ memcmp (data.version, __TIMESTAMP__ + 4, sizeof (compilation)) != 0 ++#else ++ memcmp (data.version, compilation, sizeof (compilation)) != 0 ++#endif + /* Yes, this is an assignment! */ + && (errno = EINVAL))) + { diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes index a3bc6d9..2091e10 100644 --- a/glibc-testsuite.changes +++ b/glibc-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 22 09:13:48 UTC 2015 - schwab@suse.de + +- glibc-nodate.patch: fix verification of timestamp + ------------------------------------------------------------------- Tue Jul 21 07:50:22 UTC 2015 - meissner@suse.com diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec index 063d916..5c759bf 100644 --- a/glibc-testsuite.spec +++ b/glibc-testsuite.spec @@ -249,6 +249,8 @@ Patch1007: resolv-nameserver-handling.patch Patch1008: nss-separate-state-getXXent.patch # PATCH-FIX-UPSTREAM aarch64: Increase MINSIGSTKSZ and SIGSTKSZ (BZ #16850) Patch1009: aarch64-sigstksz.patch +# PATCH-FIX-UPSTREAM malloc: Do not corrupt the top of a threaded heap if top chunk is MINSIZE (BZ #18502) +Patch1010: heap-top-corruption.patch ### # Patches awaiting upstream approval @@ -265,8 +267,6 @@ Patch2005: glibc-memset-nontemporal.diff Patch2006: ibm93x-redundant-shift-si.patch # PATCH-FIX-UPSTREAM Don't require rtld lock to store static TLS offset in the DTV (BZ #18457) Patch2007: pthread-join-deadlock.patch -# PATCH-FIX-UPSTREAM malloc: Do not corrupt the top of a threaded heap if top chunk is MINSIZE (BZ #18502) -Patch2008: heap-top-corruption.patch # Non-glibc patches # PATCH-FIX-OPENSUSE Remove debianisms from manpages @@ -476,6 +476,7 @@ rm nscd/s-stamp %patch1007 -p1 %patch1008 -p1 %patch1009 -p1 +%patch1010 -p1 %patch2000 -p1 %patch2002 -p1 @@ -483,7 +484,6 @@ rm nscd/s-stamp %patch2005 -p1 %patch2006 -p1 %patch2007 -p1 -%patch2008 -p1 %patch3000 diff --git a/glibc-utils.changes b/glibc-utils.changes index a3bc6d9..2091e10 100644 --- a/glibc-utils.changes +++ b/glibc-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 22 09:13:48 UTC 2015 - schwab@suse.de + +- glibc-nodate.patch: fix verification of timestamp + ------------------------------------------------------------------- Tue Jul 21 07:50:22 UTC 2015 - meissner@suse.com diff --git a/glibc-utils.spec b/glibc-utils.spec index b923b2d..3405071 100644 --- a/glibc-utils.spec +++ b/glibc-utils.spec @@ -248,6 +248,8 @@ Patch1007: resolv-nameserver-handling.patch Patch1008: nss-separate-state-getXXent.patch # PATCH-FIX-UPSTREAM aarch64: Increase MINSIGSTKSZ and SIGSTKSZ (BZ #16850) Patch1009: aarch64-sigstksz.patch +# PATCH-FIX-UPSTREAM malloc: Do not corrupt the top of a threaded heap if top chunk is MINSIZE (BZ #18502) +Patch1010: heap-top-corruption.patch ### # Patches awaiting upstream approval @@ -264,8 +266,6 @@ Patch2005: glibc-memset-nontemporal.diff Patch2006: ibm93x-redundant-shift-si.patch # PATCH-FIX-UPSTREAM Don't require rtld lock to store static TLS offset in the DTV (BZ #18457) Patch2007: pthread-join-deadlock.patch -# PATCH-FIX-UPSTREAM malloc: Do not corrupt the top of a threaded heap if top chunk is MINSIZE (BZ #18502) -Patch2008: heap-top-corruption.patch # Non-glibc patches # PATCH-FIX-OPENSUSE Remove debianisms from manpages @@ -476,6 +476,7 @@ rm nscd/s-stamp %patch1007 -p1 %patch1008 -p1 %patch1009 -p1 +%patch1010 -p1 %patch2000 -p1 %patch2002 -p1 @@ -483,7 +484,6 @@ rm nscd/s-stamp %patch2005 -p1 %patch2006 -p1 %patch2007 -p1 -%patch2008 -p1 %patch3000 diff --git a/glibc.changes b/glibc.changes index a3bc6d9..2091e10 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 22 09:13:48 UTC 2015 - schwab@suse.de + +- glibc-nodate.patch: fix verification of timestamp + ------------------------------------------------------------------- Tue Jul 21 07:50:22 UTC 2015 - meissner@suse.com diff --git a/glibc.spec b/glibc.spec index 1d4b401..a3c1874 100644 --- a/glibc.spec +++ b/glibc.spec @@ -249,6 +249,8 @@ Patch1007: resolv-nameserver-handling.patch Patch1008: nss-separate-state-getXXent.patch # PATCH-FIX-UPSTREAM aarch64: Increase MINSIGSTKSZ and SIGSTKSZ (BZ #16850) Patch1009: aarch64-sigstksz.patch +# PATCH-FIX-UPSTREAM malloc: Do not corrupt the top of a threaded heap if top chunk is MINSIZE (BZ #18502) +Patch1010: heap-top-corruption.patch ### # Patches awaiting upstream approval @@ -265,8 +267,6 @@ Patch2005: glibc-memset-nontemporal.diff Patch2006: ibm93x-redundant-shift-si.patch # PATCH-FIX-UPSTREAM Don't require rtld lock to store static TLS offset in the DTV (BZ #18457) Patch2007: pthread-join-deadlock.patch -# PATCH-FIX-UPSTREAM malloc: Do not corrupt the top of a threaded heap if top chunk is MINSIZE (BZ #18502) -Patch2008: heap-top-corruption.patch # Non-glibc patches # PATCH-FIX-OPENSUSE Remove debianisms from manpages @@ -476,6 +476,7 @@ rm nscd/s-stamp %patch1007 -p1 %patch1008 -p1 %patch1009 -p1 +%patch1010 -p1 %patch2000 -p1 %patch2002 -p1 @@ -483,7 +484,6 @@ rm nscd/s-stamp %patch2005 -p1 %patch2006 -p1 %patch2007 -p1 -%patch2008 -p1 %patch3000