From 5cd3c62bce23c2b25c28b22da71f664b48703ad2 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Dec 2011 23:14:43 +0000 Subject: Wed Dec 28 23:14:43 UTC 2011 --- multilib-testing/lib32-glibc/PKGBUILD | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) (limited to 'multilib-testing/lib32-glibc') diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index 59f17da2a..cf07c0b27 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 60806 2011-12-18 13:40:00Z heftig $ +# $Id: PKGBUILD 61269 2011-12-27 21:40:57Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Jan de Groot # Contributor: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuild with each new glibc version +# NOTE: valgrind requires rebuilt with each major glibc version _pkgbasename=glibc pkgname=lib32-$_pkgbasename -pkgver=2.14.1 -pkgrel=4 -_glibcdate=20111025 +pkgver=2.15 +pkgrel=1 +_glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') url="http://www.gnu.org/software/libc" @@ -22,27 +22,21 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.10-dont-build-timezone.patch glibc-2.10-bz4781.patch glibc-__i686.patch - glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch - glibc-2.13-futex.patch glibc-2.14-libdl-crash.patch 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' +md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '4dadb9203b69a3210d53514bb46f41c3' '0c5540efc51c0b93996c51b57a8540ae' '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' 'b042647ea7d6f22ad319e12e796bd13e' - '7d0154b7e17ea218c9fa953599d24cc4' '6970bcfeb3bf88913436d5112d16f588' '7da8c554a3b591c7401d7023b1928afc' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' - '178779bfaa1418c709f31c25eb3d8a3e' 'a8f4549c716cd37244fbf1ed059497f8') build() { @@ -58,24 +52,17 @@ build() { # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html patch -Np1 -i ${srcdir}/glibc-__i686.patch - # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 - # using Fedora "fix" as patch in that bug report causes breakages... - patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch - # http://www.exploit-db.com/exploits/15274/ # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch # Revert commit causing issues with crappy DNS servers... # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER! - # Note that both these patches do not fix the issue completely: + # Note that both these patches appear not to fix the issue completely: # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch @@ -86,10 +73,6 @@ 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 @@ -140,7 +123,7 @@ package() { cd ${srcdir}/glibc-build make install_root=${pkgdir} install - rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}} + rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share},var} # We need one 32 bit specific header file find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete @@ -158,7 +141,7 @@ package() { strip $STRIP_STATIC usr/lib32/*.a strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \ - lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ + lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ lib32/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib32/{pt_chown,{audit,gconv}/*.so} -- cgit v1.2.3-54-g00ecf