summaryrefslogtreecommitdiff
path: root/testing/glibc/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'testing/glibc/PKGBUILD')
-rw-r--r--testing/glibc/PKGBUILD40
1 files changed, 12 insertions, 28 deletions
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
index 4097d6498..8ecb4bbab 100644
--- a/testing/glibc/PKGBUILD
+++ b/testing/glibc/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 145159 2011-12-18 10:48:43Z allan $
+# $Id: PKGBUILD 145684 2011-12-27 10:22:05Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
# NOTE: valgrind requires rebuilt with each major glibc version
pkgname=glibc
-pkgver=2.14.1
-pkgrel=4
-_glibcdate=20111025
+pkgver=2.15
+pkgrel=1
+_glibcdate=20111227
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
license=('GPL' 'LGPL')
groups=('base')
-depends=('linux-api-headers>=3.1' 'tzdata')
+depends=('linux-api-headers>=3.1.6' 'tzdata')
makedepends=('gcc>=4.6')
backup=(etc/gai.conf
etc/locale.gen
@@ -24,29 +24,23 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
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
nscd
locale.gen.txt
locale-gen)
-md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
+md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'4dadb9203b69a3210d53514bb46f41c3'
'0c5540efc51c0b93996c51b57a8540ae'
'40cd342e21f71f5e49e32622b25acc52'
- 'a3ac6f318d680347bb6e2805d42b73b2'
'b042647ea7d6f22ad319e12e796bd13e'
- '7d0154b7e17ea218c9fa953599d24cc4'
'6970bcfeb3bf88913436d5112d16f588'
'7da8c554a3b591c7401d7023b1928afc'
'c5de2a946215d647c8af5432ec4b0da0'
'55febbb72139ac7b65757df085024b83'
- '178779bfaa1418c709f31c25eb3d8a3e'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -54,7 +48,8 @@ md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
mksource() {
git clone git://sourceware.org/git/glibc.git
pushd glibc
- git checkout -b glibc-2.14-arch origin/release/2.14/master
+ #git checkout -b glibc-2.15-arch origin/release/2.15/master
+ git checkout -b glibc-2.15-arch origin/master
popd
tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
}
@@ -72,24 +67,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
@@ -100,10 +88,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
-
install -dm755 ${pkgdir}/etc
touch ${pkgdir}/etc/ld.so.conf
@@ -195,8 +179,8 @@ package() {
cd $pkgdir
strip $STRIP_BINARIES sbin/{ldconfig,sln} \
- usr/bin/{gencat,getconf,getent,iconv,locale} \
- usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
+ usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \
+ usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \
usr/lib/getconf/* \
usr/sbin/{iconvconfig,nscd}
[[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
@@ -204,7 +188,7 @@ package() {
strip $STRIP_STATIC usr/lib/*.a
strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
- lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
+ lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
lib/{libmemusage,libpcprofile,libSegFault}.so \
usr/lib/{pt_chown,{audit,gconv}/*.so}