From 68cdc08aec92abf91448a542e06fabbedbb583bf Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 31 Aug 2012 00:04:43 +0000
Subject: Fri Aug 31 00:04:43 UTC 2012

---
 core/glibc/PKGBUILD | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'core/glibc/PKGBUILD')

diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index b96b4a1a9..6039cbccb 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165343 2012-08-16 01:57:59Z allan $
+# $Id: PKGBUILD 165786 2012-08-29 23:16:00Z 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.16.0
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
@@ -23,6 +23,8 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
         glibc-2.15-fix-res_query-assert.patch
         glibc-2.15-revert-c5a0802a.patch
         glibc-2.16-rpcgen-cpp-path.patch
+        glibc-2.16-strncasecmp-segfault.patch
+        glibc-2.16-strtod-overflow.patch
         nscd.rcd
         nscd.service
         nscd.tmpfiles
@@ -33,6 +35,8 @@ md5sums=('80b181b02ab249524ec92822c0174cf7'
          '31f415b41197d85d3bbee3d1eecd06a3'
          '0a0383d50d63f1c02919fe9943b82014'
          'ea6a43915474e8276e9361eed6a01280'
+         'f042d37cc8ca3459023431809039bc88'
+         '61d322f7681a85d3293ada5c3ccc2c7e'
          '589d79041aa767a5179eaa4e2737dd3f'
          'ad8a9af15ab7eeaa23dc7ee85024af9f'
          'bccbe5619e75cf1d97312ec3681c605c'
@@ -54,6 +58,17 @@ build() {
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
   patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
 
+  # strncasecmp segfault on i686
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6db8f737
+  patch -p1 -i ${srcdir}/glibc-2.16-strncasecmp-segfault.patch
+
+  # strtod integer/buffer overflow
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=da1f4319
+  patch -p1 -i ${srcdir}/glibc-2.16-strtod-overflow.patch
+
+  # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux
+  sed -i "s#add_system_dir#do_not_add_system_dir#" sysdeps/unix/sysv/linux/x86_64/dl-cache.h
+
   cd ${srcdir}
   mkdir glibc-build
   cd glibc-build
@@ -64,7 +79,7 @@ build() {
     export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
   fi
 
-  echo "slibdir=/lib" >> configparms
+  echo "slibdir=/usr/lib" >> configparms
 
   # remove hardening options from CFLAGS for building libraries
   CFLAGS=${CFLAGS/-fstack-protector/}
@@ -102,8 +117,6 @@ check() {
 package() {
   cd ${srcdir}/glibc-build
 
-  ln -s usr/lib ${pkgdir}/lib
-
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -111,6 +124,9 @@ package() {
 
   rm -f ${pkgdir}/etc/ld.so.{cache,conf}
 
+  # eventually this will move to the filesystem package
+  ln -s usr/lib ${pkgdir}/lib
+
   install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}}
 
   install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-- 
cgit v1.2.3-54-g00ecf