From 5e1e7572ec7f0e485f14d3f418f7335ed8e6200a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 19 Sep 2014 14:26:59 +0300
Subject: main/valgrind: ugprade to 3.10.0, additional musl fixes

---
 main/valgrind/APKBUILD         | 16 ++++++++--------
 main/valgrind/musl-fixes.patch | 43 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 46 insertions(+), 13 deletions(-)

(limited to 'main/valgrind')

diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD
index 8c5f1e68a0..f20c40240d 100644
--- a/main/valgrind/APKBUILD
+++ b/main/valgrind/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=valgrind
-pkgver=3.9.0
-pkgrel=2
+pkgver=3.10.0
+pkgrel=0
 pkgdesc="A tool to help find memory-management problems in programs"
 url="http://valgrind.org/"
 arch="all"
@@ -69,12 +69,12 @@ package() {
 	paxctl -c -m "$pkgdir"/usr/lib/valgrind/*-*-linux
 }
 
-md5sums="0947de8112f946b9ce64764af7be6df2  valgrind-3.9.0.tar.bz2
+md5sums="7c311a72a20388aceced1aa5573ce970  valgrind-3.10.0.tar.bz2
 c29b4572a070eb0d3a6a977be586c771  uclibc.patch
-3ed330adde2776d6b2365a95aa682f2b  musl-fixes.patch"
-sha256sums="e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0  valgrind-3.9.0.tar.bz2
+88867c2d838d10023fefe541cf7bd3f0  musl-fixes.patch"
+sha256sums="03047f82dfc6985a4c7d9d2700e17bc05f5e1a0ca6ad902e5d6c81aeb720edc9  valgrind-3.10.0.tar.bz2
 fab5afea5cb7abec79ff68088d97ccc188613c733b4dfc8ede029cb818ec397f  uclibc.patch
-25847e75c681ad4f2f7d54844861de36556b44453c3febefda8e54b07839f442  musl-fixes.patch"
-sha512sums="4b748f9f9a647df50db75fb56f83ee2f25bad9f1f4e4f05c4ac1d1e919e6cd954975c1f325dbedb509c44be1a8516ac2a5f269090946a0d728166ab183016c7b  valgrind-3.9.0.tar.bz2
+9f94b5a8674f5f3c1dead32cff036ae5a513158e14c89cf230cd6f3d47e77feb  musl-fixes.patch"
+sha512sums="c2d4b74ae6d1930a5c57e250229c5290212fbbc9cd8a624befe19d42766c1be9bb9a1597baf520587c489c0fdd50edca7480af670c6d5fbcf88d07fba0396f46  valgrind-3.10.0.tar.bz2
 d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d  uclibc.patch
-064a15689646b273171a6f8a7bedb3d58ab9258a6412b6ff021369b98d7b7cb26b3d0a9da49d4963d774b2656ccfea9238e9d5450e05064fa369680952d19e40  musl-fixes.patch"
+5a8ce93abd83a66983f0b47acce4e375dd6b8c57d6772d42f51aea0ec0f0c233cef88230d10e54c06446a84c772810d382fd1861019ad9b28578b0e0bd8ff57c  musl-fixes.patch"
diff --git a/main/valgrind/musl-fixes.patch b/main/valgrind/musl-fixes.patch
index 7a2c4ba34c..573c75de23 100644
--- a/main/valgrind/musl-fixes.patch
+++ b/main/valgrind/musl-fixes.patch
@@ -1,11 +1,44 @@
---- ./configure.ac.orig	2014-04-03 05:54:36.931472516 +0000
-+++ ./configure.ac	2014-04-03 06:01:14.726289282 +0000
-@@ -931,8 +931,6 @@
+diff -ru valgrind-3.10.0.orig/configure.ac valgrind-3.10.0/configure.ac
+--- valgrind-3.10.0.orig/configure.ac	2014-09-11 12:12:44.000000000 -0300
++++ valgrind-3.10.0/configure.ac	2014-09-19 13:11:10.338289149 -0300
+@@ -1031,8 +1031,6 @@
  
       *)
  	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
--	AC_MSG_ERROR([or Darwin libc])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.19])
+-	AC_MSG_ERROR([or Darwin or Bionic libc])
  	;;
  esac
  
+diff -ru valgrind-3.10.0.orig/coregrind/vg_preloaded.c valgrind-3.10.0/coregrind/vg_preloaded.c
+--- valgrind-3.10.0.orig/coregrind/vg_preloaded.c	2014-09-19 13:08:26.000000000 -0300
++++ valgrind-3.10.0/coregrind/vg_preloaded.c	2014-09-19 13:12:31.301626639 -0300
+@@ -57,7 +57,7 @@
+ void VG_NOTIFY_ON_LOAD(freeres)( void );
+ void VG_NOTIFY_ON_LOAD(freeres)( void )
+ {
+-#  if !defined(__UCLIBC__) \
++#  if defined(__GLIBC__) \
+    && !defined(VGPV_arm_linux_android) && !defined(VGPV_x86_linux_android) \
+    && !defined(VGPV_mips32_linux_android)
+    extern void __libc_freeres(void);
+--- valgrind-3.10.0.orig/include/pub_tool_redir.h	2014-09-08 15:28:23.000000000 -0300
++++ valgrind-3.10.0/include/pub_tool_redir.h	2014-09-19 14:12:48.195145620 -0300
+@@ -241,7 +241,7 @@
+ /* --- Soname of the standard C library. --- */
+ 
+ #if defined(VGO_linux)
+-#  define  VG_Z_LIBC_SONAME  libcZdsoZa              // libc.so*
++#  define  VG_Z_LIBC_SONAME  libcZdZa                // libc.*
+ 
+ #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
+ #  define  VG_Z_LIBC_SONAME  libSystemZdZaZddylib    // libSystem.*.dylib
+@@ -273,7 +273,7 @@
+ /* --- Soname of the pthreads library. --- */
+ 
+ #if defined(VGO_linux)
+-#  define  VG_Z_LIBPTHREAD_SONAME  libpthreadZdsoZd0     // libpthread.so.0
++#  define  VG_Z_LIBPTHREAD_SONAME  libcZdZa              // libc.*
+ #elif defined(VGO_darwin)
+ #  define  VG_Z_LIBPTHREAD_SONAME  libSystemZdZaZddylib  // libSystem.*.dylib
+ #else
-- 
cgit v1.2.3