summaryrefslogtreecommitdiffstats
path: root/abs/core/glibc/PKGBUILD
diff options
context:
space:
mode:
authorCecil <knoppmyth@gmail.com>2011-07-21 06:43:24 (GMT)
committerCecil <knoppmyth@gmail.com>2011-07-21 06:43:24 (GMT)
commitb82dab737eaa8d38fa8e3ac3689a16619f9160b4 (patch)
treecd7b882b3f0ba686deb39c1b653d98fafe092100 /abs/core/glibc/PKGBUILD
parent9b099f713d930c76cdf81e27a7956ff3c74dc697 (diff)
parent09ec7e57ac7f9907122de23be187b1f05d19a18f (diff)
downloadlinhes_pkgbuild-b82dab737eaa8d38fa8e3ac3689a16619f9160b4.zip
linhes_pkgbuild-b82dab737eaa8d38fa8e3ac3689a16619f9160b4.tar.gz
linhes_pkgbuild-b82dab737eaa8d38fa8e3ac3689a16619f9160b4.tar.bz2
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/glibc/PKGBUILD')
-rw-r--r--abs/core/glibc/PKGBUILD100
1 files changed, 75 insertions, 25 deletions
diff --git a/abs/core/glibc/PKGBUILD b/abs/core/glibc/PKGBUILD
index af54ae4..1c9d578 100644
--- a/abs/core/glibc/PKGBUILD
+++ b/abs/core/glibc/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 87193 2010-08-11 00:55:29Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id$
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
# NOTE: valgrind requires rebuilt with each new glibc version
pkgname=glibc
-pkgver=2.12.1
-pkgrel=2
-_glibcdate=20100811
+pkgver=2.14
+pkgrel=4
+_glibcdate=20110617
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
license=('GPL' 'LGPL')
groups=('base')
-depends=('linux-api-headers>=2.6.34' 'tzdata')
+depends=('linux-api-headers>=2.6.39' 'tzdata')
makedepends=('gcc>=4.4')
-replaces=('glibc-xen')
backup=(etc/locale.gen
etc/nscd.conf)
options=('!strip')
@@ -25,21 +23,37 @@ 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-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
nscd
locale.gen.txt
- locale-gen)
-md5sums=('3f0d64de5a9fc5614d8acc0f1d5846ed'
+ locale-gen)
+md5sums=('e441d745609d93c907b72548ba646dad'
'4dadb9203b69a3210d53514bb46f41c3'
'0c5540efc51c0b93996c51b57a8540ae'
'40cd342e21f71f5e49e32622b25acc52'
+ 'a3ac6f318d680347bb6e2805d42b73b2'
+ 'b042647ea7d6f22ad319e12e796bd13e'
+ '7d0154b7e17ea218c9fa953599d24cc4'
+ 'cea62cc6b903d222c5f26e05a3c0e0e6'
+ '46e56492cccb1c9172ed3a235cf43c6c'
+ 'c5de2a946215d647c8af5432ec4b0da0'
+ '55febbb72139ac7b65757df085024b83'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
+
mksource() {
git clone git://sourceware.org/git/glibc.git
pushd glibc
- git checkout -b glibc-2.12-arch origin/release/2.12/master
+ git checkout -b glibc-2.14-arch origin/release/2.14/master
popd
tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
}
@@ -57,9 +71,37 @@ 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
+
+ # 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...)
+ patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
+ # 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
+
install -dm755 ${pkgdir}/etc
touch ${pkgdir}/etc/ld.so.conf
+ cd ${srcdir}
mkdir glibc-build
cd glibc-build
@@ -70,24 +112,31 @@ build() {
echo "slibdir=/lib" >> configparms
- ../configure --prefix=/usr \
- --enable-add-ons=nptl,libidn --without-cvs \
- --enable-kernel=2.6.18 --disable-profile \
- --with-headers=/usr/include --libexecdir=/usr/lib \
- --enable-bind-now --with-tls --with-__thread \
- --libdir=/usr/lib --without-gd --disable-multi-arch
+ ${srcdir}/glibc/configure --prefix=/usr \
+ --libdir=/usr/lib --libexecdir=/usr/lib \
+ --with-headers=/usr/include \
+ --enable-add-ons=nptl,libidn \
+ --enable-kernel=2.6.27 \
+ --with-tls --with-__thread \
+ --enable-bind-now --without-gd \
+ --without-cvs --disable-profile \
+ --disable-multi-arch
make
}
+check() {
+ cd ${srcdir}/glibc-build
+
+ # some errors are expected - manually check log files
+ make -k check || true
+}
+
package() {
- cd ${srcdir}/glibc/glibc-build
+ cd ${srcdir}/glibc-build
make install_root=${pkgdir} install
- # provided by kernel-headers
- #rm ${pkgdir}/usr/include/scsi/scsi.h
-
- rm ${pkgdir}/etc/ld.so.conf
+ rm -f ${pkgdir}/etc/ld.so.{cache,conf}
install -dm755 ${pkgdir}/etc/rc.d
install -dm755 ${pkgdir}/usr/sbin
@@ -95,6 +144,7 @@ package() {
install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
+ install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf
sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
@@ -108,8 +158,8 @@ package() {
if [[ ${CARCH} = "x86_64" ]]; then
# fix for the linker
- sed -i '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' ${pkgdir}/usr/bin/ldd
- #Comply with multilib binaries, they look for the linker in /lib64
+ sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
+ # Comply with multilib binaries, they look for the linker in /lib64
mkdir ${pkgdir}/lib64
cd ${pkgdir}/lib64
ln -v -s ../lib/ld* .
@@ -124,7 +174,7 @@ package() {
usr/bin/{gencat,getconf,getent,iconv,locale} \
usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
usr/lib/getconf/* \
- usr/sbin/{iconvconfig,nscd,rpcinfo}
+ usr/sbin/{iconvconfig,nscd}
[[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
strip $STRIP_STATIC usr/lib/*.a \
@@ -134,5 +184,5 @@ package() {
lib/libnss_{compat,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,gconv/*.so}
+ usr/lib/{pt_chown,{audit,gconv}/*.so}
}