diff options
Diffstat (limited to 'multilib-testing/lib32-glibc/PKGBUILD')
-rw-r--r-- | multilib-testing/lib32-glibc/PKGBUILD | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index 84b6714ed..6b8124e27 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63464 2012-02-04 11:00:52Z heftig $ +# $Id: PKGBUILD 64480 2012-02-14 08:41:39Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <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.15 -pkgrel=5 +pkgrel=6 _glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -33,8 +33,11 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.15-scanf.patch glibc-2.15-ifunc.patch glibc-2.15-avx.patch + glibc-2.15-strcasecmp-disable-avx.patch glibc-2.15-gb18030.patch glibc-2.15-revert-netlink-cache.patch + glibc-2.15-arena.patch + glibc-2.15-negative-result-cache.patch lib32-glibc.conf) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '4dadb9203b69a3210d53514bb46f41c3' @@ -51,8 +54,11 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '39353f53168f4a7509ba5fe0d9f218b8' '136eb969f5d6bb6f5155f72a1a7cf23e' '41ae047ac88e8f6f547c70b0a0bc3b72' + 'fccb89f6628f59752278e125c35941f8' 'c4cd34f20ccd37817f6c1374bd4ee68e' '6771b0b2bb8aa3870a259fd2f46c424f' + 'a9ffadcfd2d357f91fee0b861fd4a7c6' + '2c46b8e294de24c531f2253ff69aeef3' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -64,8 +70,9 @@ build() { # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 + # Undefine __i686 for gcc <= 4.6 # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html + # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting... patch -Np1 -i ${srcdir}/glibc-__i686.patch # http://www.exploit-db.com/exploits/15274/ @@ -99,6 +106,8 @@ build() { # revert commit c5a0802a - causes various hangs # https://bugzilla.redhat.com/show_bug.cgi?id=769421 + # Note: fedora may have actual fix (not submitted upstream yet...) + # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch # fix realloc usage in vfscanf @@ -113,6 +122,8 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09 # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f patch -Np1 -i ${srcdir}/glibc-2.15-avx.patch + # and "fix" strcasecmp + patch -Np1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch # fix GB18030 charmap # http://sourceware.org/bugzilla/show_bug.cgi?id=11837 @@ -121,10 +132,18 @@ build() { patch -Np1 -i ${srcdir}/glibc-2.15-gb18030.patch # fix crash in __nscd_get_mapping if nscd not running - # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 + # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment) # reverts commit 3a2c0242 and other necessary following changes... patch -Np1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch + # handle ARENA_TEST correctly + # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892 + patch -Np1 -i ${srcdir}/glibc-2.15-arena.patch + + # Do not cache negative results in nscd if these are transient + # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e + patch -Np1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch + cd ${srcdir} mkdir glibc-build |