diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-26 01:22:45 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-26 01:22:45 -0700 |
| commit | 24152c3ea77087edccf017c13d44904a75799ff7 (patch) | |
| tree | 65e25106816e5071dd5b2edc2270e0138c23dc7c /core/glibc/PKGBUILD | |
| parent | 5a3821aec094b38a412cf5e6997c08b6428d6f77 (diff) | |
Sat Oct 26 01:21:13 PDT 2013
Diffstat (limited to 'core/glibc/PKGBUILD')
| -rw-r--r-- | core/glibc/PKGBUILD | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index c0cf2112b..a5cbade42 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,12 +1,14 @@ -# $Id: PKGBUILD 195163 2013-09-26 03:20:58Z allan $ +# $Id: PKGBUILD 197285 2013-10-25 01:09:19Z 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 +# NOTE: adjust version in install script when locale files are updated + pkgname=glibc pkgver=2.18 -pkgrel=5 +pkgrel=8 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -17,13 +19,14 @@ makedepends=('gcc>=4.7') backup=(etc/gai.conf etc/locale.gen etc/nscd.conf) -options=('!strip') +options=('!strip' 'staticlibs') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} + glibc-2.18-make-4.patch glibc-2.18-readdir_r-CVE-2013-4237.patch - glibc-2.18-malloc-corrupt-CVE-2013-4332.patch - glibc-2.18-strcoll-CVE-2012-4412+4424.patch - glibc-2.18-ptr-mangle-CVE-2013-4788.patch + glibc-2.18-malloc-corrupt-CVE-2013-4332.patch + glibc-2.18-strcoll-CVE-2012-4412+4424.patch + glibc-2.18-ptr-mangle-CVE-2013-4788.patch glibc-2.18-strstr-hackfix.patch nscd.service nscd.tmpfiles @@ -31,6 +34,7 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} locale-gen) md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'SKIP' + 'e1883c2d1b01ff73650db5f5bb5a5a52' '154da6bf5a5248f42a7bf5bf08e01a47' 'b79561ab9dce900e9bbeaf0d49927c2b' 'c7264b99d0f7e51922a4d3126182c40a' @@ -39,11 +43,14 @@ md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'd5fab2cd3abea65aa5ae696ea4a47d6b' 'da662ca76e7c8d7efbc7986ab7acea2d' '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') + 'b5fd017036fb91199ee76f670da8c15b') prepare() { cd ${srcdir}/${pkgname}-${pkgver} - + + # compatibility with make-4.0 (submitted upstream) + patch -p1 -i $srcdir/glibc-2.18-make-4.patch + # upstream commit 91ce4085 patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch @@ -108,7 +115,7 @@ build() { } check() { - # bug to file - the linker commands need to be reordered + # the linker commands need to be reordered - fixed in 2.19 LDFLAGS=${LDFLAGS/--as-needed,/} cd ${srcdir}/glibc-build @@ -140,6 +147,11 @@ package() { sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + # remove the static libraries that have a shared counterpart + cd $pkgdir/usr/lib + # note: keep libc, libdl, libm, libpthread for binutils testsuite + rm lib{anl,BrokenLocale,crypt,nsl,resolv,rt,util}.a + # Do not strip the following files for improved debugging support # ("improved" as in not breaking gdb and valgrind...): # ld-${pkgver}.so |