Wed Dec 28 23:14:43 UTC 2011

6 files changed, 109 insertions, 60 deletions

diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD
index a1b61d31f..1e1c947a6 100644
--- a/testing/binutils/PKGBUILD
+++ b/testing/binutils/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 144110 2011-12-04 03:46:03Z allan $
+# $Id: PKGBUILD 145694 2011-12-27 21:27:15Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
 pkgver=2.22
-pkgrel=2
-_date=20111201
+pkgrel=4
+_date=20111227
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils/"
@@ -17,7 +17,7 @@ checkdepends=('dejagnu')
 options=('!libtool' '!distcc' '!ccache')
 install=binutils.install
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-md5sums=('77c15027ac112c65fd5f73ca91b0651c')
+md5sums=('c2377089c15bb1a1bfaeca8d0e59dd4d')
 
 mksource() {
   mkdir ${pkgname}-${_date}
@@ -44,6 +44,17 @@ build() {
   make configure-host
 
   make tooldir=${pkgdir}/usr
+
+  # Rebuild libiberty.a with -fPIC
+  cp -a libiberty libiberty-pic
+  make -C libiberty-pic clean
+  make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
+
+  # Rebuild libbfd.a with -fPIC
+  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
+  cp -a bfd bfd-pic
+  make -C bfd-pic clean
+  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
 }
 
 check() {
@@ -61,16 +72,9 @@ package() {
   install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
   install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
 
-  # Rebuild libiberty.a with -fPIC
-  make -C libiberty clean
-  make CFLAGS="$CFLAGS -fPIC" -C libiberty
-  install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib
-
-  # Rebuild libbfd.a with -fPIC
-  make -C bfd clean
-  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
-  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd
-  install -m644 bfd/libbfd.a ${pkgdir}/usr/lib
+  # install libraries rebuilt with -fPIC
+  install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
+  install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
 
   # Remove Windows/Novell specific man pages
   rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD
index d57464ec6..f6565fe7a 100644
--- a/testing/gcc/PKGBUILD
+++ b/testing/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144107 2011-12-04 02:41:48Z allan $
+# $Id: PKGBUILD 145688 2011-12-27 10:32:51Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,9 +6,9 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.6.2
-pkgrel=3
-_snapshot=4.6-20111125
-_libstdcppmanver=20110814		# Note: check source directory name when updating this
+pkgrel=5
+_snapshot=4.6-20111223
+_libstdcppmanver=20111215		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -18,15 +18,13 @@ checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs')
 source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
 	gcc_pure64.patch
-	gcc-hash-style-both.patch
-	gcc-pr49720.patch)
-md5sums=('922b0ee688669c188d237bbd21d42d07'
-         'ce920d2550ff7e042b9f091d27764d8f'
+	gcc-hash-style-both.patch)
+md5sums=('4755b9f6ac0abecbaa2097ed9738406a'
+         '450772ce32daed97d7383199f8797f33'
          '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f'
-         'f9d7e5b792c59175f3da3f8421447512')
+         '4df25b623799b148a0703eaeec8fdf3f')
 
 if [ -n "${_snapshot}" ]; then
   _basedir="${srcdir}/gcc-${_snapshot}"
@@ -48,9 +46,6 @@ build() {
   fi
   patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
 
-  # fix compiler segfault in binutils testsuite
-  patch -Np1 -i ${srcdir}/gcc-pr49720.patch
-
   echo ${pkgver} > gcc/BASE-VER
 
   cd ${srcdir}
@@ -180,7 +175,7 @@ EOF
 
   # install the libstdc++ man pages
   install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+  install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/
 
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
index 4097d6498..8ecb4bbab 100644
--- a/testing/glibc/PKGBUILD
+++ b/testing/glibc/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 145159 2011-12-18 10:48:43Z allan $
+# $Id: PKGBUILD 145684 2011-12-27 10:22:05Z 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.14.1
-pkgrel=4
-_glibcdate=20111025
+pkgver=2.15
+pkgrel=1
+_glibcdate=20111227
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers>=3.1' 'tzdata')
+depends=('linux-api-headers>=3.1.6' 'tzdata')
 makedepends=('gcc>=4.6')
 backup=(etc/gai.conf
         etc/locale.gen
@@ -24,29 +24,23 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
         glibc-2.10-dont-build-timezone.patch
         glibc-2.10-bz4781.patch
         glibc-__i686.patch
-        glibc-2.12.1-static-shared-getpagesize.patch
         glibc-2.12.2-ignore-origin-of-privileged-program.patch
-        glibc-2.13-futex.patch
         glibc-2.14-libdl-crash.patch
         glibc-2.14-revert-4768ae77.patch
         glibc-2.14-reexport-rpc-interface.patch
         glibc-2.14-reinstall-nis-rpc-headers.patch
-        glibc-2.14.1-tzfile-overflow.patch
         nscd
         locale.gen.txt
         locale-gen)
-md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
+md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '4dadb9203b69a3210d53514bb46f41c3'
          '0c5540efc51c0b93996c51b57a8540ae'
          '40cd342e21f71f5e49e32622b25acc52'
-         'a3ac6f318d680347bb6e2805d42b73b2'
          'b042647ea7d6f22ad319e12e796bd13e'
-         '7d0154b7e17ea218c9fa953599d24cc4'
          '6970bcfeb3bf88913436d5112d16f588'
          '7da8c554a3b591c7401d7023b1928afc'
          'c5de2a946215d647c8af5432ec4b0da0'
          '55febbb72139ac7b65757df085024b83'
-         '178779bfaa1418c709f31c25eb3d8a3e'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -54,7 +48,8 @@ md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
 mksource() {
   git clone git://sourceware.org/git/glibc.git
   pushd glibc
-  git checkout -b glibc-2.14-arch origin/release/2.14/master
+  #git checkout -b glibc-2.15-arch origin/release/2.15/master
+  git checkout -b glibc-2.15-arch origin/master
   popd
   tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
 }
@@ -72,24 +67,17 @@ build() {
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
   patch -Np1 -i ${srcdir}/glibc-__i686.patch
 
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
-  # using Fedora "fix" as patch in that bug report causes breakages...
-  patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
-
   # http://www.exploit-db.com/exploits/15274/
   # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
 
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
-  patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
-
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
   # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
   patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
   # Revert commit causing issues with crappy DNS servers...
   # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches do not fix the issue completely:
+  # Note that both these patches appear not to fix the issue completely:
   # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
@@ -100,10 +88,6 @@ build() {
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
 
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13506
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=97ac2654
-  patch -Np1 -i ${srcdir}/glibc-2.14.1-tzfile-overflow.patch
-
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -195,8 +179,8 @@ package() {
 
   cd $pkgdir
   strip $STRIP_BINARIES sbin/{ldconfig,sln} \
-                        usr/bin/{gencat,getconf,getent,iconv,locale} \
-                        usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
+                        usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \
+                        usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \
                         usr/lib/getconf/* \
                         usr/sbin/{iconvconfig,nscd}
   [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
@@ -204,7 +188,7 @@ package() {
   strip $STRIP_STATIC usr/lib/*.a
 
   strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
-                      lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
+                      lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
                       lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
                       lib/{libmemusage,libpcprofile,libSegFault}.so \
                       usr/lib/{pt_chown,{audit,gconv}/*.so}
diff --git a/testing/linux-api-headers/PKGBUILD b/testing/linux-api-headers/PKGBUILD
index 7cb4c6034..83acaeff6 100644
--- a/testing/linux-api-headers/PKGBUILD
+++ b/testing/linux-api-headers/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144067 2011-12-02 21:02:11Z allan $
+# $Id: PKGBUILD 145682 2011-12-27 10:17:45Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-api-headers
-pkgver=3.1.4
+pkgver=3.1.6
 _basever=3.1
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
@@ -20,7 +20,7 @@ source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz
         #http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign
 	#http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign
 md5sums=('edbdc798f23ae0f8045c82f6fa22c536'
-         'ffb768bb3c42c94876f3f84aa6f779e5')
+         'b59adeac6d593fe993e964ea9e259c42')
 
 build() {
   cd ${srcdir}/linux-${_basever}
diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD
new file mode 100644
index 000000000..216379b31
--- /dev/null
+++ b/testing/valgrind/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 145691 2011-12-27 10:54:37Z allan $
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+pkgname=valgrind
+pkgver=3.7.0
+pkgrel=2
+pkgdesc="A tool to help find memory-management problems in programs"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://valgrind.org/"
+depends=('glibc>=2.15' 'glibc<2.16' 'perl')
+makedepends=('gdb')
+options=('!emptydirs')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.7.0-glibc-2.15.patch)
+md5sums=('a855fda56edf05614f099dca316d1775'
+         'f534b79b358cdced0319b375aafde4d5')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
+  else
+    ./configure --prefix=/usr --mandir=/usr/share/man
+  fi
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch b/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch
new file mode 100644
index 000000000..fa400b953
--- /dev/null
+++ b/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch
@@ -0,0 +1,30 @@
+diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
+--- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
++++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
+@@ -6402,6 +6402,17 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.15)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
++$as_echo "2.15 family" >&6; }
++
++$as_echo "#define GLIBC_2_15 1" >>confdefs.h
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
++
+      darwin)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+@@ -6422,7 +6433,7 @@
+      *)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
+ $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
+-	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
++	as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
+ 	as_fn_error "or Darwin libc" "$LINENO" 5
+ 	;;
+ esac