Sun Aug 21 23:14:34 UTC 2011

12 files changed, 62 insertions, 34 deletions

diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 790948675..6e37940ad 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 129398 2011-06-27 11:06:48Z allan $
+# $Id: PKGBUILD 135920 2011-08-20 07:14:19Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
 pkgver=2.21.1
-pkgrel=1
+pkgrel=2
 _date=20110627
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD
index 39645a7e5..3542e0f0d 100644
--- a/core/cloog/PKGBUILD
+++ b/core/cloog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119094 2011-04-10 21:37:04Z allan $
+# $Id: PKGBUILD 135904 2011-08-20 07:13:54Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=cloog
 pkgver=0.16.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Library that generates loops for scanning polyhedra"
 arch=('i686' 'x86_64')
 url="http://www.bastoul.net/cloog/"
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index ecba694b3..a5ac9be2b 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130912 2011-07-09 03:10:41Z allan $
+# $Id: PKGBUILD 135922 2011-08-20 07:14:22Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.6.1
-pkgrel=2
+pkgrel=3
 #_snapshot=4.6-20110603
 _libstdcppmanver=20110201		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
@@ -66,6 +66,14 @@ build() {
       --disable-multilib --disable-libstdcxx-pch \
       --enable-checking=release
   make
+  
+  # rebuild libssp without -fstack-protector and -D_FORTIFY_SOURCE=2
+  # adjusting Makefile.in prior to build still results in these leaking through (yay libtool...)
+  cd $CHOST/libssp
+  sed -i -e "s#-fstack-protector#-fno-stack-protector#" \
+         -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile
+  make clean
+  make
 }
 
 check() {
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index f3a040236..0008d80ac 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128661 2011-06-25 11:56:19Z allan $
+# $Id: PKGBUILD 135924 2011-08-20 07:14:27Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,15 +6,15 @@
 
 pkgname=glibc
 pkgver=2.14
-pkgrel=4
+pkgrel=5
 _glibcdate=20110617
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers>=2.6.39' 'tzdata')
-makedepends=('gcc>=4.4')
+depends=('linux-api-headers>=3.0' 'tzdata')
+makedepends=('gcc>=4.6')
 backup=(etc/locale.gen
         etc/nscd.conf)
 options=('!strip')
@@ -112,6 +112,10 @@ build() {
 
   echo "slibdir=/lib" >> configparms
 
+  # remove hardening options from CFLAGS for building libraries
+  CFLAGS=${CFLAGS/-fstack-protector/}
+  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+
   ${srcdir}/glibc/configure --prefix=/usr \
       --libdir=/usr/lib --libexecdir=/usr/lib \
       --with-headers=/usr/include \
@@ -121,8 +125,19 @@ build() {
       --enable-bind-now --without-gd \
       --without-cvs --disable-profile \
       --disable-multi-arch
-        
+
+  # build libraries with hardening disabled
+  echo "build-programs=no" >> configparms
   make
+  
+  # re-enable hardening for programs
+  sed -i "s#=no#=yes#" configparms
+  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  make
+
+  # remove harding in preparation to run test-suite
+  sed -i '2,4d' configparms
 }
 
 check() {
diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD
index c8b486dec..60ed858b2 100644
--- a/core/gmp/PKGBUILD
+++ b/core/gmp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131961 2011-07-18 11:43:05Z allan $
+# $Id: PKGBUILD 135906 2011-08-20 07:13:57Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gmp
 pkgver=5.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A free library for arbitrary precision arithmetic"
 arch=('i686' 'x86_64')
 url="http://gmplib.org/"
diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD
index bba92fb24..c6912f4fc 100644
--- a/core/isl/PKGBUILD
+++ b/core/isl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119089 2011-04-10 21:34:57Z allan $
+# $Id: PKGBUILD 135908 2011-08-20 07:13:59Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=isl
 pkgver=0.06
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
 arch=('i686' 'x86_64')
 url="http://www.kotnet.org/~skimo/isl/"
diff --git a/core/libmpc/PKGBUILD b/core/libmpc/PKGBUILD
index 58dc50c42..f482d4104 100644
--- a/core/libmpc/PKGBUILD
+++ b/core/libmpc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 129838 2011-06-29 04:23:14Z allan $
+# $Id: PKGBUILD 135910 2011-08-20 07:14:03Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=libmpc
 pkgver=0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
 arch=('i686' 'x86_64')
 url="http://www.multiprecision.org/"
diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD
index 0a3f8da6e..cc3c67a28 100644
--- a/core/linux-api-headers/PKGBUILD
+++ b/core/linux-api-headers/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 126765 2011-06-07 07:31:07Z allan $
+# $Id: PKGBUILD 135918 2011-08-20 07:14:16Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-api-headers
-pkgver=2.6.39.1
-_basever=2.6.39
+pkgver=3.0.1
+_basever=3.0
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
 arch=('i686' 'x86_64')
@@ -14,10 +14,10 @@ license=('GPL2')
 provides=("kernel-headers=${pkgver}")
 conflicts=('kernel-headers')
 replaces=('kernel-headers')
-source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2
-	http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2)
-md5sums=('1aab7a741abe08d42e8eccf20de61e05'
-         '215f7ebaafe1175dbc5d1e439c9a96d5')
+source=(http://www.kernel.org/pub/linux/kernel/v${_basever}/linux-${_basever}.tar.bz2
+	http://www.kernel.org/pub/linux/kernel/v${_basever}/patch-${pkgver}.bz2)
+md5sums=('398e95866794def22b12dfbc15ce89c0'
+         'ac49f7907f1fc85fbab92d0f1aa1552a')
 
 build() {
   cd ${srcdir}/linux-${_basever}
diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD
index 3f593116a..d55d4897d 100644
--- a/core/mpfr/PKGBUILD
+++ b/core/mpfr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128942 2011-06-25 14:51:58Z allan $
+# $Id: PKGBUILD 135912 2011-08-20 07:14:08Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -7,7 +7,7 @@ pkgname=mpfr
 _pkgver=3.0.1
 _patchlevel=p4
 pkgver=${_pkgver}.${_patchlevel}
-pkgrel=1
+pkgrel=2
 pkgdesc="Multiple-precision floating-point library"
 arch=('i686' 'x86_64')
 url="http://www.mpfr.org/"
diff --git a/core/ppl/PKGBUILD b/core/ppl/PKGBUILD
index ba8477680..953f1da9b 100644
--- a/core/ppl/PKGBUILD
+++ b/core/ppl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129854 2011-06-29 04:31:09Z allan $
+# $Id: PKGBUILD 135914 2011-08-20 07:14:11Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: ezzetabi <ezzetabi at gawab dot com>
 
 pkgname=ppl
 pkgver=0.11.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
 arch=('i686' 'x86_64')
 url="http://www.cs.unipr.it/ppl"
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index fee69d2c1..7bccb05d4 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124889 2011-05-24 21:47:33Z eric $
+# $Id: PKGBUILD 135926 2011-08-20 07:14:30Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_ver=1.8.1p2
+_ver=1.8.2
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -15,7 +15,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 options=('!libtool' '!makeflags')
 source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz
         sudo.pam)
-md5sums=('e8330f0e63b0ecb2e12b5c76922818cc'
+md5sums=('000f458e7391be9fdf459a9ad6a4912a'
          '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
 
 build() {
diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD
index ee91eff75..d1f16c1b2 100644
--- a/core/zlib/PKGBUILD
+++ b/core/zlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100000 2010-11-19 17:40:38Z pierre $
+# $Id: PKGBUILD 135916 2011-08-20 07:14:14Z allan $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zlib
 pkgver=1.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -18,7 +18,7 @@ md5sums=('c735eab2d659a96e5a594c9e8541ad63'
 build() {
 	cd ${srcdir}/zlib-$pkgver
 	# see http://bugs.archlinux.org/task/19280
-	patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch || return 1
+	patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch
 	# work around gcc bug; see https://bugs.archlinux.org/task/20647
 	export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK"
 	./configure --prefix=/usr
@@ -27,6 +27,11 @@ build() {
 	grep -A 24 '^  Copyright' zlib.h > LICENSE
 }
 
+check() {
+	cd ${srcdir}/zlib-$pkgver
+	make check
+}
+
 package() {
 	cd ${srcdir}/zlib-$pkgver
 	make install DESTDIR=${pkgdir}