diff options
author | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-06-13 19:05:35 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-17 10:23:15 +0000 |
commit | c3b70a1eaa3493f3db1f3b92c17b959959efd389 (patch) | |
tree | 38c7ccf9d1ecb9ec9c5546f28cfc67d3c96da8ed /main | |
parent | 672c263ea5c08971465670bb289ea9b9d08c61e7 (diff) | |
download | aports-c3b70a1eaa3493f3db1f3b92c17b959959efd389.tar.bz2 aports-c3b70a1eaa3493f3db1f3b92c17b959959efd389.tar.xz |
main/valgrind: add suppressions file for musl
Diffstat (limited to 'main')
-rw-r--r-- | main/valgrind/APKBUILD | 8 | ||||
-rw-r--r-- | main/valgrind/activate-musl-supp.patch | 12 | ||||
-rw-r--r-- | main/valgrind/musl.supp | 25 |
3 files changed, 44 insertions, 1 deletions
diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD index 84f25acf14..c4ad74c6c8 100644 --- a/main/valgrind/APKBUILD +++ b/main/valgrind/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=valgrind pkgver=3.14.0 -pkgrel=0 +pkgrel=1 pkgdesc="A tool to help find memory-management problems in programs" url="http://valgrind.org/" arch="all" @@ -16,6 +16,9 @@ makedepends="sed paxmark perl bash autoconf automake libtool" options="!strip !check" subpackages="$pkgname-dev $pkgname-doc" source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2 + musl.supp + + activate-musl-supp.patch uclibc.patch arm.patch" # musl-fixes.patch @@ -24,6 +27,7 @@ builddir="$srcdir"/$pkgname-$pkgver prepare() { default_prepare cd "$builddir" + cp "$srcdir"/musl.supp . aclocal && autoconf && automake --add-missing echo '#include <linux/a.out.h>' > include/a.out.h } @@ -70,5 +74,7 @@ package() { } sha512sums="68e548c42df31dc2b883a403e0faff7480c49b3054841870f5d2f742141ba199eca5d83c96bbf283115f0633f2bdb0860161d422f98e3ec720ec65760d250f97 valgrind-3.14.0.tar.bz2 +05ecb7bf5a1f5b5ec0eedea7c4f9f4ad1745ceeccf01b84057852effcd81f2ace95fd3fd8f93640756ffbcec3ed4859824f8d921dc92e7dc46526aa9bd9c3d56 musl.supp +09a992c39e755d92894f79cd95ed2a6e84daa3ac1af1fe8907ebb2c90dca27d224aae882389c2c246aff8a6bb7d8b9c57a6ca62bd7b36f6fb43e182471186821 activate-musl-supp.patch d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d uclibc.patch 9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe arm.patch" diff --git a/main/valgrind/activate-musl-supp.patch b/main/valgrind/activate-musl-supp.patch new file mode 100644 index 0000000000..1b20ac62d5 --- /dev/null +++ b/main/valgrind/activate-musl-supp.patch @@ -0,0 +1,12 @@ +diff -upr valgrind-3.14.0.orig/configure.ac valgrind-3.14.0/configure.ac +--- valgrind-3.14.0.orig/configure.ac 2019-06-13 21:56:14.023469250 +0200 ++++ valgrind-3.14.0/configure.ac 2019-06-13 21:56:35.130452552 +0200 +@@ -1103,7 +1103,7 @@ case "${GLIBC_VERSION}" in + musl) + AC_MSG_RESULT(Musl) + AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc]) +- # no DEFAULT_SUPP file yet for musl libc. ++ DEFAULT_SUPP="musl.supp ${DEFAULT_SUPP}" + ;; + 2.0|2.1|*) + AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) diff --git a/main/valgrind/musl.supp b/main/valgrind/musl.supp new file mode 100644 index 0000000000..0b79a6b833 --- /dev/null +++ b/main/valgrind/musl.supp @@ -0,0 +1,25 @@ +# Suppressions for musl libc +# See: https://www.openwall.com/lists/musl/2017/06/15/4 + +{ + musl-dynlink-false-positive1 + Memcheck:Leak + fun:calloc + fun:load_direct_deps + fun:load_deps + fun:load_deps + fun:__dls3 + fun:__dls2b + fun:__dls2 +} + +{ + musl-dynlink-false-positive2 + Memcheck:Leak + fun:calloc + fun:load_library + fun:load_preload + fun:__dls3 + fun:__dls2b + fun:__dls2 +} |