summaryrefslogtreecommitdiff
path: root/core/glibc/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'core/glibc/PKGBUILD')
-rw-r--r--core/glibc/PKGBUILD29
1 files changed, 7 insertions, 22 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 0eafa46ff..897537c1c 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 187027 2013-06-03 11:15:09Z allan $
+# $Id: PKGBUILD 193065 2013-08-15 12:08:14Z 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.17
-pkgrel=6
+pkgver=2.18
+pkgrel=1
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
@@ -20,20 +20,14 @@ backup=(etc/gai.conf
options=('!strip')
install=glibc.install
source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
- glibc-2.17-sync-with-linux37.patch
- glibc-2.17-getaddrinfo-stack-overflow.patch
- glibc-2.17-regexp-matcher-overrun.patch
nscd.service
nscd.tmpfiles
locale.gen.txt
locale-gen)
-md5sums=('87bf675c8ee523ebda4803e8e1cec638'
+md5sums=('88fbbceafee809e82efd52efa1e3c58f'
'SKIP'
- 'fb99380d94598cc76d793deebf630022'
- '56d5f2c09503a348281a20ae404b7de3'
- '200acc05961b084ee00dde919e64f82d'
- 'c1e07c0bec0fe89791bfd9d13fc85edf'
- 'bccbe5619e75cf1d97312ec3681c605c'
+ 'd5fab2cd3abea65aa5ae696ea4a47d6b'
+ 'da662ca76e7c8d7efbc7986ab7acea2d'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -41,15 +35,6 @@ md5sums=('87bf675c8ee523ebda4803e8e1cec638'
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- # combination of upstream commits 318cd0b, b540704 and fc1abbe
- patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch
-
- # CVE-2013-1914 - upstream commit 1cef1b19
- patch -p1 -i ${srcdir}/glibc-2.17-getaddrinfo-stack-overflow.patch
-
- # CVE-2013-0242 - upstream commit a445af0b
- patch -p1 -i ${srcdir}/glibc-2.17-regexp-matcher-overrun.patch
-
cd ${srcdir}
mkdir glibc-build
cd glibc-build
@@ -146,5 +131,5 @@ package() {
usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
- usr/lib/{pt_chown,{audit,gconv}/*.so}
+ usr/lib/{audit,gconv}/*.so
}