[glibc/f16] Fix typo in 767696 patch

Jeffrey Law law at fedoraproject.org
Mon Dec 19 06:13:26 UTC 2011


commit e13f8ca66c97805fb6cea90236334579e9ab1c61
Author: Jeff Law <law at redhat.com>
Date:   Mon Dec 19 06:13:12 2011 +0000

    Fix typo in 767696 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 7d5179f..8e2dae8 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 24%{?dist}.2
+Release: 24%{?dist}.3
 # 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
@@ -1138,7 +1138,7 @@ rm -f *.filelist*
 %endif
 
 %changelog
-* Sun Dec 18 2011 Jeff Law <law at redhat.com> - 2.14.90-24.fc16.2
+* Sun Dec 18 2011 Jeff Law <law at redhat.com> - 2.14.90-24.fc16.3
   - Check values from TZ file header (#767696)
   - Handle EAGAIN from FUTEX_WAIT_REQUEUE_PI (#552960)
   - Add {dist}.#


More information about the scm-commits mailing list