diff options
Diffstat (limited to 'core/glibc/PKGBUILD')
| -rw-r--r-- | core/glibc/PKGBUILD | 77 |
1 files changed, 27 insertions, 50 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 175e7a3b2..9b5f36e95 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151829 2012-03-03 08:49:00Z allan $ +# $Id: PKGBUILD 155407 2012-04-03 11:10:25Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.15 -pkgrel=7 +pkgrel=10 _glibcdate=20111227 _glibcportsver=2.15 _glibcportsdate=20120127 @@ -15,16 +15,17 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.1.6' 'tzdata') +depends=('linux-api-headers>=3.3' 'tzdata') makedepends=('gcc>=4.6') backup=(etc/gai.conf etc/locale.gen etc/nscd.conf) options=('!strip') install=glibc.install -source=(http://mirrors.kernel.org/archlinux/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz +source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.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 @@ -51,41 +52,10 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${pkgname}-${pkgver}_${_ 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 nscd locale.gen.txt locale-gen) -md5sums=('6ffdf5832192b92f98bdd125317c0dfc' - '935995663b89924a98d20a636045949a' - '4dadb9203b69a3210d53514bb46f41c3' - '40cd342e21f71f5e49e32622b25acc52' - 'e60e33591c9ec1447e4cddadcbb9cf3a' - '6970bcfeb3bf88913436d5112d16f588' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - '31f415b41197d85d3bbee3d1eecd06a3' - 'b3526cbd5e29773560dba725db99af5a' - '3c219ddfb619b6df903cac4cc42c611d' - '7ae3e426251ae33e73dbad71f9c91378' - 'f0782ddbf38e0b30ec6b85348816046f' - '3d844b53b2dbb7c996e39c7ad932f55d' - '41ae047ac88e8f6f547c70b0a0bc3b72' - 'fccb89f6628f59752278e125c35941f8' - 'c4cd34f20ccd37817f6c1374bd4ee68e' - '94b61302a7ca6c5764d013dc7738fcfe' - 'a9ffadcfd2d357f91fee0b861fd4a7c6' - '2c46b8e294de24c531f2253ff69aeef3' - '7a2998a04ebfcf8bf820540f490ce714' - '0d77d20fa7fe2f87ad945cb9edb4d91d' - 'bfdefac3d705f41fbf84b1de1dc945af' - 'dded423e264cdd178500f3e8ad62fe66' - '340deaa582a95ddde86edb624c3bfea0' - '6bbac50e6ff82187654e6a0a7bd849e7' - 'c483504cf404ed0b44480af627813a97' - '1419d61fd1dbc6cdc48bb59da86fa66f' - '7ff501435078b1a2622124fbeaafc921' - 'b587ee3a70c9b3713099295609afde49' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') mksource() { git clone http://sourceware.org/git/glibc.git @@ -110,11 +80,13 @@ 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/ @@ -127,9 +99,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 @@ -137,25 +109,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 @@ -196,8 +168,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 @@ -227,6 +198,11 @@ build() { sed -i "s/_MIPS_SIM_ABIN32/_MIPS_SIM_NABI32/" ports/sysdeps/unix/sysv/linux/mips/Makefile fi + # 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 + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -236,6 +212,7 @@ build() { if [[ ${CARCH} = "i686" ]]; then # 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" elif [[ ${CARCH} = "mips64el" ]]; then # mips64el is only supported out of tree. |