[glibc/f15] Fix typo in last patch

Jeffrey Law law at fedoraproject.org
Mon Dec 19 06:14:31 UTC 2011


commit 85a5aa968908d7bd5ab5eb3b3b35ba51288fb572
Author: Jeff Law <law at redhat.com>
Date:   Mon Dec 19 06:14:25 2011 +0000

    Fix typo in last patch

 glibc-rh767696.patch |    2 +-
 glibc.spec           |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/glibc-rh767696.patch b/glibc-rh767696.patch
index 0536efa..66493ac 100644
--- a/glibc-rh767696.patch
+++ b/glibc-rh767696.patch
@@ -69,7 +69,7 @@ index 144e20b..402389c 100644
 +      if (__builtin_expect (tzspec_len < num_isstd, 0))
 +	goto lose;
 +      tzspec_len -= num_isstd;
-+      if (__builtin_expect (tzspec == 0 || tzspec_len - 1 < num_isgmt, 0))
++      if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
 +	goto lose;
 +      tzspec_len -= num_isgmt + 1;
 +      if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))
diff --git a/glibc.spec b/glibc.spec
index 8c5f257..10dd146 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -27,7 +27,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 3
+Release: 4
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1079,7 +1079,7 @@ rm -f *.filelist*
 %endif
 
 %changelog
-* Sun Dec 19 2011 Jeff Law  <law at redhat.com> - 2.14.1-3
+* Sun Dec 19 2011 Jeff Law  <law at redhat.com> - 2.14.1-4
 - Check values from TZ file header (#767696)
 
 * Fri Oct 28 2011 Andreas Schwab <schwab at redhat.com> - 2.14.1-2


More information about the scm-commits mailing list