diff options
Diffstat (limited to 'multilib-testing')
| -rw-r--r-- | multilib-testing/lib32-glibc/PKGBUILD | 24 | ||||
| -rw-r--r-- | multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch | 72 |
2 files changed, 88 insertions, 8 deletions
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index 61b3494d5..59f17da2a 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59996 2011-12-03 03:13:45Z heftig $ +# $Id: PKGBUILD 60806 2011-12-18 13:40:00Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.14.1 -pkgrel=2 +pkgrel=4 _glibcdate=20111025 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -29,6 +29,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.14-revert-4768ae77.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch + glibc-2.14.1-tzfile-overflow.patch lib32-glibc.conf) md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1' '4dadb9203b69a3210d53514bb46f41c3' @@ -41,6 +42,7 @@ md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1' '7da8c554a3b591c7401d7023b1928afc' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' + '178779bfaa1418c709f31c25eb3d8a3e' 'a8f4549c716cd37244fbf1ed059497f8') build() { @@ -84,6 +86,10 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + # http://sourceware.org/bugzilla/show_bug.cgi?id=13506 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=97ac2654 + patch -Np1 -i ${srcdir}/glibc-2.14.1-tzfile-overflow.patch + cd ${srcdir} mkdir glibc-build cd glibc-build @@ -139,17 +145,19 @@ package() { # We need one 32 bit specific header file find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete - # manually strip files as stripping libpthread-*.so and libthread_db.so - # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks - # valgrind on x86_64 + # Do not strip the following files for improved debugging support + # ("improved" as in not breaking gdb and valgrind...): + # ld-${pkgver}.so + # libc-${pkgver}.so + # libpthread-${pkgver}.so + # libthread_db-1.0.so cd $pkgdir strip $STRIP_BINARIES usr/lib32/getconf/* - strip $STRIP_STATIC usr/lib32/*.a \ - lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so + strip $STRIP_STATIC usr/lib32/*.a - strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ + strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \ lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ lib32/{libmemusage,libpcprofile,libSegFault}.so \ diff --git a/multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch b/multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch new file mode 100644 index 000000000..9e21cbfd3 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch @@ -0,0 +1,72 @@ +diff --git a/time/tzfile.c b/time/tzfile.c +index 144e20b..402389c 100644 +--- a/time/tzfile.c ++++ b/time/tzfile.c +@@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap) + goto read_again; + } + ++ if (__builtin_expect (num_transitions ++ > ((SIZE_MAX - (__alignof__ (struct ttinfo) - 1)) ++ / (sizeof (time_t) + 1)), 0)) ++ goto lose; + total_size = num_transitions * (sizeof (time_t) + 1); + total_size = ((total_size + __alignof__ (struct ttinfo) - 1) + & ~(__alignof__ (struct ttinfo) - 1)); + types_idx = total_size; +- total_size += num_types * sizeof (struct ttinfo) + chars; ++ if (__builtin_expect (num_types ++ > (SIZE_MAX - total_size) / sizeof (struct ttinfo), 0)) ++ goto lose; ++ total_size += num_types * sizeof (struct ttinfo); ++ if (__builtin_expect (chars > SIZE_MAX - total_size, 0)) ++ goto lose; ++ total_size += chars; ++ if (__builtin_expect (__alignof__ (struct leap) - 1 ++ > SIZE_MAX - total_size, 0)) ++ goto lose; + total_size = ((total_size + __alignof__ (struct leap) - 1) + & ~(__alignof__ (struct leap) - 1)); + leaps_idx = total_size; ++ if (__builtin_expect (num_leaps ++ > (SIZE_MAX - total_size) / sizeof (struct leap), 0)) ++ goto lose; + total_size += num_leaps * sizeof (struct leap); +- tzspec_len = (sizeof (time_t) == 8 && trans_width == 8 +- ? st.st_size - (ftello (f) +- + num_transitions * (8 + 1) +- + num_types * 6 +- + chars +- + num_leaps * 12 +- + num_isstd +- + num_isgmt) - 1 : 0); ++ tzspec_len = 0; ++ if (sizeof (time_t) == 8 && trans_width == 8) ++ { ++ off_t rem = st.st_size - ftello (f); ++ if (__builtin_expect (rem < 0 ++ || (size_t) rem < (num_transitions * (8 + 1) ++ + num_types * 6 ++ + chars), 0)) ++ goto lose; ++ tzspec_len = (size_t) rem - (num_transitions * (8 + 1) ++ + num_types * 6 ++ + chars); ++ if (__builtin_expect (num_leaps > SIZE_MAX / 12 ++ || tzspec_len < num_leaps * 12, 0)) ++ goto lose; ++ tzspec_len -= num_leaps * 12; ++ if (__builtin_expect (tzspec_len < num_isstd, 0)) ++ goto lose; ++ tzspec_len -= num_isstd; ++ 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)) ++ goto lose; ++ } ++ if (__builtin_expect (SIZE_MAX - total_size - tzspec_len < extra, 0)) ++ goto lose; + + /* Allocate enough memory including the extra block requested by the + caller. */ |