From 608a49084f8c6599f8adef56b6c1480c3e293c04 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 5 Apr 2012 00:01:23 +0000 Subject: Thu Apr 5 00:01:22 UTC 2012 --- multilib/lib32-glibc/PKGBUILD | 49 ++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 19 deletions(-) (limited to 'multilib/lib32-glibc/PKGBUILD') diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index b260cafd4..cf034c7d9 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67033 2012-03-03 08:49:11Z allan $ +# $Id: PKGBUILD 68827 2012-04-03 11:11:51Z allan $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.15 -pkgrel=7 +pkgrel=10 _glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -19,7 +19,8 @@ depends=("glibc>=$pkgver") makedepends=('gcc-multilib>=4.6') options=('!strip' '!emptydirs') source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch + glibc-2.15-do-not-install-timezone-files.patch + glibc-2.15-do-not-install-timezone-files-2.patch glibc-__i686.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.14-libdl-crash.patch @@ -46,10 +47,12 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.15-non-signalling-comparisons.patch glibc-2.15-rintf-rounding.patch glibc-2.15-nearbyintf-rounding.patch + glibc-2.15-confstr-local-buffer-extent.patch lib32-glibc.conf) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' - '4dadb9203b69a3210d53514bb46f41c3' - '40cd342e21f71f5e49e32622b25acc52' + '7ef69c530a15106de93e4de2df2d393e' + 'b6c619e5cf91829a15ce34dccef676d5' + 'addfddd648a4bf832eb126aba944ebae' 'e60e33591c9ec1447e4cddadcbb9cf3a' '6970bcfeb3bf88913436d5112d16f588' 'c5de2a946215d647c8af5432ec4b0da0' @@ -69,23 +72,26 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7a2998a04ebfcf8bf820540f490ce714' '0d77d20fa7fe2f87ad945cb9edb4d91d' 'bfdefac3d705f41fbf84b1de1dc945af' - 'dded423e264cdd178500f3e8ad62fe66' + '3443e89c1e98089cd6c3e3c23f0c3d85' '340deaa582a95ddde86edb624c3bfea0' '6bbac50e6ff82187654e6a0a7bd849e7' 'c483504cf404ed0b44480af627813a97' '1419d61fd1dbc6cdc48bb59da86fa66f' '7ff501435078b1a2622124fbeaafc921' + '8d1023a51e0932681b46440d5f8551ee' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { cd ${srcdir}/glibc # timezone data is in separate package (tzdata) - patch -p1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch + # http://sourceware.org/git/?p=glibc.git;a=commit;h=482ff4da + patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files.patch + # http://sourceware.org/git/?p=glibc.git;a=commit;h=a458e7fe + patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files-2.patch - # 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... + # undefine __i686 + # http://sourceware.org/glibc/wiki/Release/2.15#Build_Failures patch -p1 -i ${srcdir}/glibc-__i686.patch # http://www.exploit-db.com/exploits/15274/ @@ -98,9 +104,9 @@ build() { # re-export RPC interface until libtirpc is ready as a replacement # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (fedora branch) - patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch + patch -p1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (fedora branch) - patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + patch -p1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch # fix res_query assertion # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 @@ -108,25 +114,25 @@ build() { # fix up regcomp/regexec # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 - patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch + patch -p1 -i ${srcdir}/glibc-2.15-regex.patch # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (fedora branch) - patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch + patch -p1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch # 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 + patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch # fix realloc usage in vfscanf # http://sourceware.org/git/?p=glibc.git;a=commit;h=20b38e03 - patch -Np1 -i ${srcdir}/glibc-2.15-scanf.patch + patch -p1 -i ${srcdir}/glibc-2.15-scanf.patch # fix ifunc relocations # http://sourceware.org/git/?p=glibc.git;a=commit;h=6ee65ed6 - patch -Np1 -i ${srcdir}/glibc-2.15-ifunc.patch + patch -p1 -i ${srcdir}/glibc-2.15-ifunc.patch # fix AVX detection # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09 @@ -167,8 +173,7 @@ build() { patch -p1 -i ${srcdir}/glibc-2.15-feraiseexcept-plt.patch # vfprintf nargs overflow - CVE-2012-0864 - # http://sourceware.org/bugzilla/show_bug.cgi?id=13656 - # http://sourceware.org/ml/libc-alpha/2012-02/msg00328.html + # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c1f4834 patch -p1 -i ${srcdir}/glibc-2.15-vfprintf-nargs.patch # avoid out ouf bounds read in __libc_res_nquerydomain @@ -191,6 +196,11 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47 patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch + # fix varaible scope issue in confstr + # http://sourceware.org/git/?p=glibc.git;a=commit;h=ac4c54f0 + # http://sourceware.org/git/?p=glibc.git;a=commit;h=d6a403f9 + patch -p1 -i ${srcdir}/glibc-2.15-confstr-local-buffer-extent.patch + cd ${srcdir} mkdir glibc-build cd glibc-build @@ -198,6 +208,7 @@ build() { export CC="gcc -m32" # Hack to fix NPTL issues with Xen, only required on 32bit platforms + # TODO: make separate glibc-xen package for i686 export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" echo "slibdir=/usr/lib32" >> configparms -- cgit v1.2.3-54-g00ecf