diff options
Diffstat (limited to 'core/glibc/PKGBUILD')
| -rw-r--r-- | core/glibc/PKGBUILD | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 1ffcd8697..c0cf2112b 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194434 2013-09-16 11:00:09Z allan $ +# $Id: PKGBUILD 195163 2013-09-26 03:20:58Z 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=4 +pkgrel=5 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -23,6 +23,7 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} 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-strstr-hackfix.patch nscd.service nscd.tmpfiles @@ -33,6 +34,7 @@ md5sums=('88fbbceafee809e82efd52efa1e3c58f' '154da6bf5a5248f42a7bf5bf08e01a47' 'b79561ab9dce900e9bbeaf0d49927c2b' 'c7264b99d0f7e51922a4d3126182c40a' + '9749ba386b08a8fe53e7ecede9bf2dfb' '4441f6dfe7d75ced1fa75e54dd21d36e' 'd5fab2cd3abea65aa5ae696ea4a47d6b' 'da662ca76e7c8d7efbc7986ab7acea2d' @@ -48,11 +50,14 @@ prepare() { # upstream commits 1159a193, 55e17aad and b73ed247 patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch - # upstream commit 1326ba1a and two not yet committed patches + # upstream commits 1326ba1a, 141f3a77 and 303e567a # https://sourceware.org/ml/libc-alpha/2013-08/msg00394.html # https://sourceware.org/ml/libc-alpha/2013-08/msg00462.html patch -p1 -i $srcdir/glibc-2.18-strcoll-CVE-2012-4412+4424.patch + # upstream commits c61b4d41 and 0b1f8e35 + patch -p1 -i $srcdir/glibc-2.18-ptr-mangle-CVE-2013-4788.patch + # hack fix for strstr issues on x86 patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch |