gentoo auto-resync : 27:07:2022 - 21:02:43

4 files changed, 52 insertions, 4 deletions

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 87566d4bed8c..d8b5a5a86b9f 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,3 +1,4 @@
+AUX musl.supp 758 BLAKE2B 168ff4f38cc6b3c11e949fbc6d7c1e024259d2c02ae1424123b1f99d77c123994270ab56067ac6f1923c0dc1e8b29336a2f9fa7a9010f99e5731f6a7be5bb7d1 SHA512 55f57c84241ad32443095e7cd74607ec8ebd1dd1e67de3ab2b87e996e416980484cc9b9ef13e54bb0c0584d2ffbbd4ae9389cf1215b9c8751dcb77d2816e49f0
 AUX valgrind-3.13.0-malloc.patch 1086 BLAKE2B 004bb1c56f4e8b73838c62563503a3a550d8ced9fda8114d3dd02dc3013171de8116f1510561010256c1855e5ff3e62dd1921f82cfcb14ae78cb566d43423d60 SHA512 15b4d485bbb1fadfaea0ddc0e10874f09438ec4085bf70c2209c0854eaa9bd587f96bc0cf1c367a07fb09acb9dee17b5756a41237d04ceaa573bba0bda0ec523
 AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb545d6af214a5bd43ff800d52e0d7cfc03feac8d2466da8d4935db659172cd50cf3e2d63b3aff46d81b21846b304671506cd235b710037218fc16e0ef66438 SHA512 7cb5a46c2d8ed4360053289994014b334e32d48b0608ed58662486bd432c31835ef16e2cdfd734f3e4d720e272d2507ec76f0b77e1364237e9f6dbbd97a8abb6
 AUX valgrind-3.17.0-lld.patch 2837 BLAKE2B 331c5eb91f476271a82d6730b5aa628ecf3a9b63765b480dab0d0f43669f078764272b3ca2813747b863fde70664a71b8f801590374ee340618ea0b8f1bc193b SHA512 d96fc27cc28dbf9def7b73d92ab2eb54c32ffe04590b3621a5d2e2926c420de46ace81a75466d8b50ff7b27186c5134ad810916f120e620afc6e902c0f3823f5
@@ -9,6 +10,6 @@ DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a3
 EBUILD valgrind-3.16.1.ebuild 3703 BLAKE2B 311cbc2ba147e6bde2c6e8352eed928361be75f96c84086870b45decf3675107a2fdae7ae48bca5ddbc1ea5dbbd29bdb886b15f514bbb40d7eaf65772e46f5f3 SHA512 9f87ff366eb7e51d697527350c8135778537b8d2a09ceddc38e96b830f07eed040ade236bb204637e625b336f12508ed36240d0f8818aaa2e60a64e136947ead
 EBUILD valgrind-3.17.0.ebuild 3749 BLAKE2B 6d2fa93b2b3beee059041ea84c24ce99b96379907b707745d90799db4a4e5d034cd34cbaf22c8ef1a61be0c5d4f47877e71ea40080e36f58e5310153a46d0e86 SHA512 c892f4b885b12b9acd73e1a7c1af38256c72329d322ba9f1d1a9d4e815c1eea03e5754376be404a752735c84a1ec8213b0fcf2b010d222967ef71c409d7aea0c
 EBUILD valgrind-3.18.1.ebuild 3703 BLAKE2B 8cebf6e55574abde88bb9cb173c35ccb283b1b7c4d62664d26137478f5174b6ca7c366100e09540357caa27d4a221d8e3b5225aaa019fd6b1c7cfe6928932569 SHA512 eba7ba77309a201722ccb4b1e30e1ab7f41a3b90344e4003c64e34cc3e7d71adcba2efe829b31622e9fc2258a49ecda0e84a1b48bd245e8b795518b31d868cac
-EBUILD valgrind-3.19.0.ebuild 3891 BLAKE2B 9681ff638b8704c937748660252f8be9baa47f7c43af8d387f2b21a9a1f6acbec9b05f7bf9089e6dedfba6e7b63a003f99c1a99b4b5aabecb9e11797478fe382 SHA512 20452b47544f8c86540d71c3288091882ed08712ed4e3ccc6e4b8e611ba7a3a9c55b774468be9068d6c41b98130a358aab25107d2a64d650771617ee3eeb5a68
-EBUILD valgrind-9999.ebuild 3891 BLAKE2B 9681ff638b8704c937748660252f8be9baa47f7c43af8d387f2b21a9a1f6acbec9b05f7bf9089e6dedfba6e7b63a003f99c1a99b4b5aabecb9e11797478fe382 SHA512 20452b47544f8c86540d71c3288091882ed08712ed4e3ccc6e4b8e611ba7a3a9c55b774468be9068d6c41b98130a358aab25107d2a64d650771617ee3eeb5a68
+EBUILD valgrind-3.19.0.ebuild 3898 BLAKE2B cbb6e58e0cdde2a4f3b1c41064edf3b3d57bce3f26fa5afe0feb4f5f0502e10e8602caf02ab50defdf41c824394aa46215d62d139019024b399880ede4691e97 SHA512 afc2ab6fb54ad2377e0887a7be05e39a2e43dd4184d1a785135688219a6c91bb3e8ee434e31053536c48ab038ca4e2aefb25268193f935f49bee67fcf3d04af0
+EBUILD valgrind-9999.ebuild 3898 BLAKE2B cbb6e58e0cdde2a4f3b1c41064edf3b3d57bce3f26fa5afe0feb4f5f0502e10e8602caf02ab50defdf41c824394aa46215d62d139019024b399880ede4691e97 SHA512 afc2ab6fb54ad2377e0887a7be05e39a2e43dd4184d1a785135688219a6c91bb3e8ee434e31053536c48ab038ca4e2aefb25268193f935f49bee67fcf3d04af0
 MISC metadata.xml 1028 BLAKE2B 5e6d52b6a5e657f56dc8da70f83d340c8ad8ff1448b109916d77a51b62f9018dafaf20586684d9d5c0984647df9fb3886b9fc0fabcfd62bcd13ef8d5e1de223e SHA512 1b9bd9d815de416b73e03bb13f88b662b14b4c135a36549ea5ad69a59c9395a240b80c30e6847eaecc2318ca88a2081e71fed41af2e9eed5162dfca78c7af920
diff --git a/dev-util/valgrind/files/musl.supp b/dev-util/valgrind/files/musl.supp
new file mode 100644
index 000000000000..69adac7bb5da
--- /dev/null
+++ b/dev-util/valgrind/files/musl.supp
@@ -0,0 +1,47 @@
+# From: https://git.alpinelinux.org/aports/tree/main/valgrind/
+# 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_direct_deps
+   fun:load_deps
+   fun:load_deps
+   fun:__dls3
+   fun:__dls2
+}
+
+{
+   musl-dynlink-false-positive3
+   Memcheck:Leak
+   fun:calloc
+   fun:load_library
+   fun:load_preload
+   fun:__dls3
+   fun:__dls2b
+   fun:__dls2
+}
+
+{
+   musl-dynlink-false-positive4
+   Memcheck:Leak
+   fun:calloc
+   fun:load_library
+   fun:load_preload
+   fun:__dls3
+   fun:__dls2
+}
diff --git a/dev-util/valgrind/valgrind-3.19.0.ebuild b/dev-util/valgrind/valgrind-3.19.0.ebuild
index 4ff9c8e71913..11beb6636e97 100644
--- a/dev-util/valgrind/valgrind-3.19.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.19.0.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 
 	# conditionally copy musl specific suppressions && apply patch
 	if use elibc_musl ; then
-		cp "${FILESDIR}/musl.supp" "${S}"
+		cp "${FILESDIR}/musl.supp" "${S}" || die
 		eapply "${FILESDIR}/valgrind-3.13.0-malloc.patch"
 	fi
 
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 4ff9c8e71913..11beb6636e97 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 
 	# conditionally copy musl specific suppressions && apply patch
 	if use elibc_musl ; then
-		cp "${FILESDIR}/musl.supp" "${S}"
+		cp "${FILESDIR}/musl.supp" "${S}" || die
 		eapply "${FILESDIR}/valgrind-3.13.0-malloc.patch"
 	fi