diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-26 23:06:14 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-26 23:06:14 +0000 |
| commit | 715631caf52784c47c8ed3aeb6cbdba2715a08db (patch) | |
| tree | d1923d66cba8dcf90112f81ca31009202cff25a3 /multilib-testing | |
| parent | 8999fa1750304fb2367fb7743e49e013405e88be (diff) | |
Sun Jun 26 23:06:14 UTC 2011
Diffstat (limited to 'multilib-testing')
| -rw-r--r-- | multilib-testing/lib32-glibc/PKGBUILD | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index 59e7e0d74..276d465cd 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49882 2011-06-21 19:12:48Z heftig $ +# $Id: PKGBUILD 50168 2011-06-25 17:22:07Z 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 -pkgrel=3 +pkgrel=4 _glibcdate=20110617 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -26,7 +26,8 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch glibc-2.14-libdl-crash.patch - glibc-2.14-fix-resolver-crash-typo.patch + #glibc-2.14-fix-resolver-crash-typo.patch + glibc-2.14-revert-4462fad3.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch lib32-glibc.conf) @@ -38,7 +39,7 @@ md5sums=('e441d745609d93c907b72548ba646dad' 'b042647ea7d6f22ad319e12e796bd13e' '7d0154b7e17ea218c9fa953599d24cc4' 'cea62cc6b903d222c5f26e05a3c0e0e6' - '73bfaafe25b93f357cf6a3b5eeb70e1b' + '46e56492cccb1c9172ed3a235cf43c6c' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' '6e052f1cb693d5d3203f50f9d4e8c33b') @@ -71,8 +72,11 @@ build() { # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 (FS#24615) - patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch + # This fixes the main segfault but not the assert fail (FS#24615) + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 + #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch + # resort to reverting the bad commit completely for the moment + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch # re-export RPC interface until libtirpc is ready as a replacement # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) |