diff options
| author | root <root@rshg054.dnsready.net> | 2013-08-17 01:48:49 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-08-17 01:48:49 -0700 |
| commit | 74952c750361d72d7b2d14179d4e88b6ce0a0c7e (patch) | |
| tree | 881e3676cf3b53e4c90d21b37b94a008eda1832f /core/glibc/PKGBUILD | |
| parent | 6a3f02abeeecab3efb4442e39e28e05897f25316 (diff) | |
Sat Aug 17 01:47:45 PDT 2013
Diffstat (limited to 'core/glibc/PKGBUILD')
| -rw-r--r-- | core/glibc/PKGBUILD | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 897537c1c..554227997 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193065 2013-08-15 12:08:14Z allan $ +# $Id: PKGBUILD 193120 2013-08-16 21:44:47Z 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.18 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -20,24 +20,36 @@ backup=(etc/gai.conf options=('!strip') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} + glibc-2.18-readdir_r-CVE-2013-4237.patch + glibc-2.18-strstr-hackfix.patch nscd.service nscd.tmpfiles locale.gen.txt locale-gen) md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'SKIP' + '154da6bf5a5248f42a7bf5bf08e01a47' + '4441f6dfe7d75ced1fa75e54dd21d36e' 'd5fab2cd3abea65aa5ae696ea4a47d6b' 'da662ca76e7c8d7efbc7986ab7acea2d' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} + + # upstream commit 91ce4085 + patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch + + # hack fix for strstr issues on x86 + patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch - cd ${srcdir} - mkdir glibc-build - cd glibc-build + mkdir ${srcdir}/glibc-build +} + +build() { + cd ${srcdir}/glibc-build if [[ ${CARCH} = "i686" ]]; then # Hack to fix NPTL issues with Xen, only required on 32bit platforms |