main/valgrind: upgrade to 3.13.0

2 files changed, 12 insertions, 53 deletions

diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD
index 1c67b722408..35342c73e33 100644
--- a/main/valgrind/APKBUILD
+++ b/main/valgrind/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=valgrind
-pkgver=3.12.0
-pkgrel=1
+pkgver=3.13.0
+pkgrel=0
 pkgdesc="A tool to help find memory-management problems in programs"
 url="http://valgrind.org/"
 arch="all !aarch64"
@@ -13,14 +13,14 @@ makedepends="sed paxmark perl bash autoconf automake libtool"
 #   in the installation tree.  Either Valgrind won't work at all, or it
 #   will still work if you do, but will generate less helpful error
 #   messages.
-options="!strip"
+options="!strip !check"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://$pkgname.org/downloads/$pkgname-$pkgver.tar.bz2
+source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2
 	uclibc.patch
-	musl-fixes.patch
 	arm.patch"
-
+#	musl-fixes.patch
 builddir="$srcdir"/$pkgname-$pkgver
+
 prepare() {
 	default_prepare
 	cd "$builddir"
@@ -45,6 +45,11 @@ build() {
 	make
 }
 
+check() {
+	cd "$buildir"
+	make check
+}
+
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
@@ -64,7 +69,6 @@ package() {
 	paxmark -m "$pkgdir"/usr/lib/valgrind/*-*-linux
 }
 
-sha512sums="2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be  valgrind-3.12.0.tar.bz2
+sha512sums="34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009  valgrind-3.13.0.tar.bz2
 d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d  uclibc.patch
-47735294a0641208c6bcbc51203019da18ec16d51316ca6437d0f9eba14d9acc09d82f65149b8b1d56aba90825397ef0c215e8036eccd0dce1287c58ee3ccda2  musl-fixes.patch
 9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe  arm.patch"
diff --git a/main/valgrind/musl-fixes.patch b/main/valgrind/musl-fixes.patch
deleted file mode 100644
index c7f65b08194..00000000000
--- a/main/valgrind/musl-fixes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -upr valgrind-3.11.0.orig/configure.ac valgrind-3.11.0/configure.ac
---- valgrind-3.11.0.orig/configure.ac	2015-10-03 02:28:18.597612716 +0200
-+++ valgrind-3.11.0/configure.ac	2015-10-03 02:28:49.284502749 +0200
-@@ -1066,8 +1066,6 @@ case "${GLIBC_VERSION}" in
- 	;;
-      2.0|2.1|*)
- 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
--	AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
- 	;;
- esac
- 
-diff -upr valgrind-3.11.0.orig/coregrind/vg_preloaded.c valgrind-3.11.0/coregrind/vg_preloaded.c
---- valgrind-3.11.0.orig/coregrind/vg_preloaded.c	2015-10-03 02:28:18.367636023 +0200
-+++ valgrind-3.11.0/coregrind/vg_preloaded.c	2015-10-03 02:28:37.745672152 +0200
-@@ -56,7 +56,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) \
-diff -upr valgrind-3.11.0.orig/include/pub_tool_redir.h valgrind-3.11.0/include/pub_tool_redir.h
---- valgrind-3.11.0.orig/include/pub_tool_redir.h	2015-10-03 02:28:18.304309107 +0200
-+++ valgrind-3.11.0/include/pub_tool_redir.h	2015-10-03 02:28:37.745672152 +0200
-@@ -242,7 +242,7 @@
- /* --- Soname of the standard C library. --- */
- 
- #if defined(VGO_linux) || defined(VGO_solaris)
--#  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
-@@ -274,7 +274,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
- #elif defined(VGO_solaris)