Sat Jul 28 00:02:21 UTC 2012

2 files changed, 260 insertions, 4 deletions

diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index bf8d65e97..ad9b7dc46 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163013 2012-07-05 13:49:57Z allan $
+# $Id: PKGBUILD 164063 2012-07-26 04:17:07Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
 pkgver=3.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,14 +13,17 @@ depends=('glibc>=2.16' 'glibc<2.17' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        valgrind-3.7.0-glibc-2.16.patch)
+        valgrind-3.7.0-glibc-2.16.patch
+        valgrind-3.7.0-supp.patch)
 md5sums=('a855fda56edf05614f099dca316d1775'
-         '8362c9c10b8d7d08d1be628a717cfba7')
+         '8362c9c10b8d7d08d1be628a717cfba7'
+         '6cf8d3ace0cdc4c7fd69d61ca0692577')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   
   patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch
+  patch -Np1 -i ${srcdir}/valgrind-3.7.0-supp.patch
 
   if [ "${CARCH}" = "x86_64" ]; then
     ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
diff --git a/extra/valgrind/valgrind-3.7.0-supp.patch b/extra/valgrind/valgrind-3.7.0-supp.patch
new file mode 100644
index 000000000..63a71de0e
--- /dev/null
+++ b/extra/valgrind/valgrind-3.7.0-supp.patch
@@ -0,0 +1,253 @@
+--- valgrind-orig/exp-sgcheck.supp	2011-10-27 07:24:45.000000000 +1000
++++ valgrind-new/exp-sgcheck.supp	2012-07-12 21:49:58.290123661 +1000
+@@ -1,8 +1,8 @@
+ {
+    ld-2.X possibly applying relocations
+    exp-sgcheck:SorG
+-   obj:/*lib*/ld-2.*so*
+-   obj:/*lib*/ld-2.*so*
++   obj:*/*lib*/ld-2.*so*
++   obj:*/*lib*/ld-2.*so*
+ }
+ 
+ # I'm pretty sure this is a false positive caused by the sg_ stuff
+--- valgrind-orig/glibc-2.34567-NPTL-helgrind.supp	2011-10-27 07:24:45.000000000 +1000
++++ valgrind-new/glibc-2.34567-NPTL-helgrind.supp	2012-07-12 21:50:03.663270525 +1000
+@@ -27,7 +27,7 @@
+ #{
+ #   helgrind-glibc2X-001
+ #   Helgrind:Race
+-#   obj:/lib*/ld-2.*so*
++#   obj:*/lib*/ld-2.*so*
+ #}
+ 
+ # helgrind-glibc2X-002 was merged into helgrind-glibc2X-001
+@@ -37,13 +37,13 @@
+ {
+    helgrind-glibc2X-004
+    Helgrind:Race
+-   obj:/lib*/libc-2.*so*
++   obj:*/lib*/libc-2.*so*
+ }
+ 
+ {
+    helgrind-glibc2X-005
+    Helgrind:Race
+-   obj:/lib*/libpthread-2.*so*
++   obj:*/lib*/libpthread-2.*so*
+ }
+ 
+ # helgrind-glibc2X-006 was merged into helgrind-glibc2X-005
+@@ -78,14 +78,14 @@
+ {
+    helgrind-glibc2X-101
+    Helgrind:Race
+-   obj:/lib*/libpthread-2.*so*
++   obj:*/lib*/libpthread-2.*so*
+    fun:pthread_*
+ }
+ {
+    helgrind-glibc2X-102
+    Helgrind:Race
+    fun:mythread_wrapper
+-   obj:/lib*/libpthread-2.*so*
++   obj:*/lib*/libpthread-2.*so*
+ }
+ {
+    helgrind-glibc2X-103
+@@ -110,7 +110,7 @@
+ {
+    helgrind-glibc2X-107
+    Helgrind:Race
+-   obj:/lib*/libpthread-2.*so*
++   obj:*/lib*/libpthread-2.*so*
+    fun:sem_*
+ }
+ {
+@@ -126,7 +126,7 @@
+ {
+    helgrind-glibc2X-110
+    Helgrind:Race
+-   obj:/lib*/libc-2.*so*
++   obj:*/lib*/libc-2.*so*
+    fun:pthread_*
+ }
+ {
+--- valgrind-orig/glibc-2.X.supp.in	2011-10-27 07:24:45.000000000 +1000
++++ valgrind-new/glibc-2.X.supp.in	2012-07-12 21:49:57.323490407 +1000
+@@ -39,74 +39,74 @@
+ {
+    dl-hack3-cond-1
+    Memcheck:Cond
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack3-cond-2
+    Memcheck:Cond
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack3-cond-3
+    Memcheck:Cond
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack3-cond-4
+    Memcheck:Cond
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
+ }
+ 
+ {
+    dl-hack4-64bit-addr-1
+    Memcheck:Addr8
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack4-64bit-addr-2
+    Memcheck:Addr8
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack4-64bit-addr-3
+    Memcheck:Addr8
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
+ }
+ 
+ {
+    dl-hack5-32bit-addr-1
+    Memcheck:Addr4
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+ }
+ {
+    dl-hack5-32bit-addr-3
+    Memcheck:Addr4
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack5-32bit-addr-4
+    Memcheck:Addr4
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+ }
+ 
+ 
+@@ -149,9 +149,9 @@
+ {
+    glibc-@GLIBC_VERSION@-on-SUSE-10.3-(x86)
+    Memcheck:Addr4
+-   obj:/lib/ld-@GLIBC_VERSION@*.so
+-   obj:/lib/ld-@GLIBC_VERSION@*.so
+-   obj:/lib/ld-@GLIBC_VERSION@*.so
++   obj:*/lib/ld-@GLIBC_VERSION@*.so
++   obj:*/lib/ld-@GLIBC_VERSION@*.so
++   obj:*/lib/ld-@GLIBC_VERSION@*.so
+ }
+ 
+ {
+@@ -225,7 +225,7 @@
+    MVL-401-linuxthreads-pthread_create
+    Memcheck:Param
+    write(buf)
+-   obj:/lib/libpthread-0.10.so
++   obj:*/lib/libpthread-0.10.so
+    fun:pthread_create
+ }
+ 
+--- valgrind-orig/glibc-2.X-drd.supp	2011-10-27 07:24:45.000000000 +1000
++++ valgrind-new/glibc-2.X-drd.supp	2012-07-12 21:49:57.323490407 +1000
+@@ -6,7 +6,7 @@
+ {
+    drd-ld
+    drd:ConflictingAccess
+-   obj:/lib*/ld-*.so
++   obj:*/lib*/ld-*.so
+ }
+ 
+ #
+@@ -22,13 +22,19 @@
+ {
+    drd-libc-stdio
+    drd:ConflictingAccess
+-   obj:/lib*/libc-*
++   obj:*/lib*/libc-*
+ }
+ {
+    drd-libc-thread-cancellation-test
+    drd:ConflictingAccess
+    fun:write
+ }
++{
++   drd-libc-random
++   drd:ConflictingAccess
++   fun:random_r
++   fun:random
++}
+ 
+ #
+ # Suppression patterns for libstdc++, the implementation of the standard C++
+@@ -128,7 +134,7 @@
+ {
+    drd-libpthread-?
+    drd:ConflictingAccess
+-   obj:/lib/libgcc_s.so.1
++   obj:*/lib/libgcc_s.so.1
+ }
+ {
+    drd-libpthread-nanosleep
+@@ -171,6 +177,7 @@
+ {
+    drd-libxcb-xcb_wait_for_reply
+    drd:CondErr
++   ...
+    fun:pthread_cond_destroy*
+    fun:xcb_wait_for_reply
+ }