summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/glibc/PKGBUILD6
-rw-r--r--testing/glibc/glibc-2.14.1-tzfile-overflow.patch2
2 files changed, 4 insertions, 4 deletions
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
index 95b1eea1b..4097d6498 100644
--- a/testing/glibc/PKGBUILD
+++ b/testing/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145148 2011-12-18 02:31:57Z allan $
+# $Id: PKGBUILD 145159 2011-12-18 10:48:43Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -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 @@ md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
'7da8c554a3b591c7401d7023b1928afc'
'c5de2a946215d647c8af5432ec4b0da0'
'55febbb72139ac7b65757df085024b83'
- '1c5fe2ad0120a40432d429f958d18965'
+ '178779bfaa1418c709f31c25eb3d8a3e'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
diff --git a/testing/glibc/glibc-2.14.1-tzfile-overflow.patch b/testing/glibc/glibc-2.14.1-tzfile-overflow.patch
index af996e7b6..9e21cbfd3 100644
--- a/testing/glibc/glibc-2.14.1-tzfile-overflow.patch
+++ b/testing/glibc/glibc-2.14.1-tzfile-overflow.patch
@@ -59,7 +59,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))