[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.14.1-tzfile-overflow.patch)
Allan McRae
allan at archlinux.org
Sun Dec 18 10:45:07 UTC 2011
Date: Sunday, December 18, 2011 @ 05:45:07
Author: allan
Revision: 145158
upgpkg: glibc 2.14.1-4
fix typo in upstream patch which causes timezone issues
Modified:
glibc/trunk/PKGBUILD
glibc/trunk/glibc-2.14.1-tzfile-overflow.patch
------------------------------------+
PKGBUILD | 4 ++--
glibc-2.14.1-tzfile-overflow.patch | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-18 10:42:24 UTC (rev 145157)
+++ PKGBUILD 2011-12-18 10:45:07 UTC (rev 145158)
@@ -6,7 +6,7 @@
pkgname=glibc
pkgver=2.14.1
-pkgrel=3
+pkgrel=4
_glibcdate=20111025
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
@@ -46,7 +46,7 @@
'7da8c554a3b591c7401d7023b1928afc'
'c5de2a946215d647c8af5432ec4b0da0'
'55febbb72139ac7b65757df085024b83'
- '1c5fe2ad0120a40432d429f958d18965'
+ '178779bfaa1418c709f31c25eb3d8a3e'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
Modified: glibc-2.14.1-tzfile-overflow.patch
===================================================================
--- glibc-2.14.1-tzfile-overflow.patch 2011-12-18 10:42:24 UTC (rev 145157)
+++ glibc-2.14.1-tzfile-overflow.patch 2011-12-18 10:45:07 UTC (rev 145158)
@@ -59,7 +59,7 @@
+ 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))
More information about the arch-commits
mailing list