gentoo auto-resync : 23:01:2023 - 06:54:34

8 files changed, 85 insertions, 35 deletions

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 3802d16675be..8969539766ac 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,14 +1,14 @@
 AUX musl.supp 758 BLAKE2B 168ff4f38cc6b3c11e949fbc6d7c1e024259d2c02ae1424123b1f99d77c123994270ab56067ac6f1923c0dc1e8b29336a2f9fa7a9010f99e5731f6a7be5bb7d1 SHA512 55f57c84241ad32443095e7cd74607ec8ebd1dd1e67de3ab2b87e996e416980484cc9b9ef13e54bb0c0584d2ffbbd4ae9389cf1215b9c8751dcb77d2816e49f0
-AUX valgrind-3.13.0-malloc.patch 1086 BLAKE2B 004bb1c56f4e8b73838c62563503a3a550d8ced9fda8114d3dd02dc3013171de8116f1510561010256c1855e5ff3e62dd1921f82cfcb14ae78cb566d43423d60 SHA512 15b4d485bbb1fadfaea0ddc0e10874f09438ec4085bf70c2209c0854eaa9bd587f96bc0cf1c367a07fb09acb9dee17b5756a41237d04ceaa573bba0bda0ec523
+AUX valgrind-3.13.0-malloc.patch 1024 BLAKE2B 3917fe49e5b7f8f678801edd3236b76fbc3eaf790bc19db7a1055cd949df802fc7612b8ec8fb40371814790d24f15fc2cdfd5349297ed5b48e28d3224bb2d170 SHA512 57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665
 AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb545d6af214a5bd43ff800d52e0d7cfc03feac8d2466da8d4935db659172cd50cf3e2d63b3aff46d81b21846b304671506cd235b710037218fc16e0ef66438 SHA512 7cb5a46c2d8ed4360053289994014b334e32d48b0608ed58662486bd432c31835ef16e2cdfd734f3e4d720e272d2507ec76f0b77e1364237e9f6dbbd97a8abb6
 AUX valgrind-3.19.0-clang-15.patch 1263 BLAKE2B 0b1734061165735c0eba127d46250bca3bffc4a5c884c4ced121172561e36c7bebc9e138ef6e0ee519de5fb3dac37050540fdf576da5e7690e47a8ecac6a6f32 SHA512 d7af318c02815f705cf307ab673622de7c1b9afa4cc9fdbedfe6b06a98ac7798e1d19ee5836826f0d45c331a2ec2518c5515f7d908b6b8f22d3e4753b176d977
+AUX valgrind-3.20.0-musl-interpose.patch 904 BLAKE2B c2f3e1942bf1a713c993d63ee7e69506feed7dd0c34b906b3b65fa065ea9fff081c49b8ed4341f3f48350b22235bbc0896ebf099a5ea211fe9d502efe899851e SHA512 74a2f29a68ff5d7c10d829469302946982c2ff558f5a9b08d0f6e74a5e73a713461838469efc11b5bf93212d67f9e2922aed3c6f7d772bb037eeb461f2cc6729
 AUX valgrind-3.20.0-tests-clang16.patch 715 BLAKE2B d81ca99227e8175d9ab4ad5e6c706e5033d25527ac9ff7fe784cfded3dd42783c0c27dfa7c97908cb50ce24d2b6ceecaa220e79fc6d77ac9e322ebf86ff2fd5a SHA512 e3d79c67d1589c6fdb26018b146ddf896aa19e5b45ce15ae6d6ef449c72c0ba151c2903e6600ae33a7f76205562f094fbe5d4ed3370ded87d2216d25b5b62b23
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
-DIST valgrind-3.18.1.tar.bz2 16149159 BLAKE2B a98322e4c12ae1bc495659217bd398b85e459288e775ba5f543b9ce1faa5bdfc17791178c0e7b9703a31588cc4c7cbde814b7a43b2ec76e7362e2aeeb100d935 SHA512 a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b
 DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a33a083505b42adaa94ee3af659cbe073e516bc98163ef56233e6cd9de2125839b71ee443fbc0db6557dcb35a6c05280 SHA512 f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2
 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
-EBUILD valgrind-3.18.1.ebuild 3703 BLAKE2B 8cebf6e55574abde88bb9cb173c35ccb283b1b7c4d62664d26137478f5174b6ca7c366100e09540357caa27d4a221d8e3b5225aaa019fd6b1c7cfe6928932569 SHA512 eba7ba77309a201722ccb4b1e30e1ab7f41a3b90344e4003c64e34cc3e7d71adcba2efe829b31622e9fc2258a49ecda0e84a1b48bd245e8b795518b31d868cac
-EBUILD valgrind-3.19.0.ebuild 3959 BLAKE2B a4599eeb28141def0b522a3e23abe83db44ec8ea47e1438ea2e10abb9bf49fc643e2c1fc7d8cab414ae4108479041575c30c8b204ae296f22b1076fea013db53 SHA512 ae7bc5cdb6f2fc9a882508ea7d7e5407851354fb34a4e8f1dbe5e48814e0d30426c2ab9089217ce4ab57716b4bee42fa54d24e70fe90d8316f956ddc261cf432
-EBUILD valgrind-3.20.0.ebuild 3957 BLAKE2B 5355dd10f03e926d4932e2fc5ace4f429be2e51e48d6a12ff1b390d8ada99acbbf24c22ab84e5246bf8e44961a2ba76e4f2d3e740c0def03aa33fca7ceb2f996 SHA512 26aea2c9a8b0844d6baeddc1035a131baf8f419c6b8ec175ae83c6a15a18e039703746bd356f070595b28ca7e6711448a0495188a4f5405fa5dfa54ec8a0cae5
-EBUILD valgrind-9999.ebuild 3921 BLAKE2B c0f5ce239d2e5990afe6f272de7006219c9ca97e8859ec9491f64f7211c6760f5feecd453356ea3e89e77d14dfa4c27375259c1aa1d886ee0ee028611221fb84 SHA512 655489b4b0cb46f12607edd429277fd677db5793dfbd6e4743c3ac02e160353e3238802c1923d14e533ac040242478730d5091ab756e00ad505b1da832f6eed1
-MISC metadata.xml 1028 BLAKE2B 5e6d52b6a5e657f56dc8da70f83d340c8ad8ff1448b109916d77a51b62f9018dafaf20586684d9d5c0984647df9fb3886b9fc0fabcfd62bcd13ef8d5e1de223e SHA512 1b9bd9d815de416b73e03bb13f88b662b14b4c135a36549ea5ad69a59c9395a240b80c30e6847eaecc2318ca88a2081e71fed41af2e9eed5162dfca78c7af920
+EBUILD valgrind-3.19.0.ebuild 3958 BLAKE2B 993c8677d095cfeb55bb22c3db5f46161b3b615e5559f4b2bf613bb8596fa8c2e4116ef9b0ba4aba8a8ef6dd2ca8a9da82e6b7a73c5061767707444a672b224d SHA512 8af1c7c7cd56ad77d7f81aac35d234b999b502f7288e7881431b8e6c8a7c9c46cecb0f3f1075b879b02aa6c8314540dd90c377366d08f78b1845d04cd71c85b1
+EBUILD valgrind-3.20.0-r2.ebuild 4018 BLAKE2B 519b00b584e9dc9474d1aa544fbaec314e0da9d6c025708b2030dae4785b034b4882aa31c0b784b90f15ce0995206b32f515e3049cdbe70dc8fe5a7525b57baa SHA512 43c9e6e1e2a910e8240937d4dbce1b285e48ad7d6aac29190148dc7207852a66e44009df62e971a0b952c763010c5df39ee02f89ea57534600eba2d43d2eed23
+EBUILD valgrind-3.20.0.ebuild 3956 BLAKE2B 2482b90a5b52a6e92e10dd6616c8355de8807ebfbff1377e8c8378dbf7ff9dc24a1d556d900d5bb19a35714c36e6aa85559b5c81f41e0f4df1dd8a631e7112ae SHA512 ffb496cda3673082efe0f6f02c65ee8cba47d4d65f742b579234c810671a2118e6e8dee59791675f1c12e41307d72f816714676280324e4f5db5501673f97bdf
+EBUILD valgrind-9999.ebuild 3978 BLAKE2B b233178c80db51e40f89496b499ce9f6295cef8806b5f7924f25d0235af889f9f1713513aa6a549644b2b01438ac6851eff332bb4a250080f52e346b53048367 SHA512 2c5c21b0895557ff441229d3906d8b5a720f1741452970e97c10a32fc1ea682ae4d3c4e2d5e087d4338194096e2fb3239e806076e35b1ac505dd7e2125e56222
+MISC metadata.xml 1150 BLAKE2B 05b2508ff61ac0659472f75ab074a5f0cc82a3ead6e9bd6e779984bf11c8257afcadd5734b0c34defa5739f1eb0dadeb2168a448c0482848d8d7bf8b598d5dff SHA512 80841b7058fee9293b9bddeb4ed2b1d2b53b4957d43973d9d748e9797c5a5a4b50f7377d9e6bdf31cc1a0c87702327e02568a15e3e354f1fa6cf280eb439b317
diff --git a/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch b/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
index ac6d90fef50f..d0eb795b84be 100644
--- a/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
+++ b/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
@@ -1,5 +1,3 @@
-From: https://git.alpinelinux.org/aports/tree/main/valgrind/
-
 --- valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c
 +++ valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c
 @@ -765,13 +765,15 @@ static void init(void);
diff --git a/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch b/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch
new file mode 100644
index 000000000000..6ede22f8b5ec
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch
@@ -0,0 +1,30 @@
+https://bugs.kde.org/show_bug.cgi?id=435441
+
+From 460d0c9a6c27edfffed8ced623cecf64466619f2 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Thu, 4 Nov 2021 14:26:40 -0700
+Subject: [PATCH] Bug 435441 - Handle weak symbols as global for redirection
+
+Weak symbols are global but with lower precedence, so they should
+be handled the same way as global symbols during malloc replacement.
+
+This fixes valgrind on musl 1.2.2 when it is not patched with a
+soname (as is done on Alpine Linux).
+
+https://bugs.kde.org/show_bug.cgi?id=435441
+--- a/coregrind/m_debuginfo/readelf.c
++++ b/coregrind/m_debuginfo/readelf.c
+@@ -429,7 +429,8 @@ Bool get_elf_symbol_info (
+    }
+ #  endif
+ 
+-   if (ELFXX_ST_BIND(sym->st_info) == STB_GLOBAL) {
++   if (ELFXX_ST_BIND(sym->st_info) == STB_GLOBAL
++       || ELFXX_ST_BIND(sym->st_info) == STB_WEAK) {
+       *is_global_out = True;
+    }
+ 
+-- 
+2.32.0
+
+
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
index 446b8b725919..e0de6e2950ab 100644
--- a/dev-util/valgrind/metadata.xml
+++ b/dev-util/valgrind/metadata.xml
@@ -5,6 +5,10 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 	<longdescription>
 		Valgrind is a GPL'd tool to help you find memory-management problems
 		in your programs. When a program is run under Valgrind's supervision,
diff --git a/dev-util/valgrind/valgrind-3.19.0.ebuild b/dev-util/valgrind/valgrind-3.19.0.ebuild
index 598db5186193..949500bb17c8 100644
--- a/dev-util/valgrind/valgrind-3.19.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-util/valgrind/valgrind-3.18.1.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
index 1b0f898873ac..0268876b1061 100644
--- a/dev-util/valgrind/valgrind-3.18.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
@@ -1,26 +1,34 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
 HOMEPAGE="https://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
 DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	# Respect CFLAGS, LDFLAGS
+	"${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+	"${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+	"${FILESDIR}"/${P}-tests-clang16.patch
+)
+
 src_prepare() {
 	# Correct hard coded doc location
 	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
@@ -28,10 +36,12 @@ src_prepare() {
 	# Don't force multiarch stuff on OSX, bug #306467
 	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
 
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+	if use elibc_musl ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-3.13.0-malloc.patch
+			"${FILESDIR}"/${PN}-3.20.0-musl-interpose.patch
+		)
+	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# upstream doesn't support this, but we don't build with
@@ -42,8 +52,7 @@ src_prepare() {
 		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
 	fi
 
-	# Allow users to test their own patches
-	eapply_user
+	default
 
 	# Regenerate autotools files
 	eautoreconf
@@ -64,12 +73,14 @@ src_configure() {
 	# -fstack-protector-strong See -fstack-protector (bug #620402)
 	# -m64 -mx32			for multilib-portage, bug #398825
 	# -ggdb3                segmentation fault on startup
+	# -flto*                fails to build, bug #858509
 	filter-flags -fomit-frame-pointer
 	filter-flags -fstack-protector
 	filter-flags -fstack-protector-all
 	filter-flags -fstack-protector-strong
 	filter-flags -m64 -mx32
 	replace-flags -ggdb3 -ggdb2
+	filter-lto
 
 	if use amd64 || use ppc64; then
 		! has_multilib_profile && myconf+=("--enable-only64bit")
@@ -99,6 +110,9 @@ src_install() {
 
 	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
 
+	# See README_PACKAGERS
+	dostrip -x /usr/libexec/valgrind/vgpreload* /usr/$(get_libdir)/valgrind/*
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_names on shared libraries, can't turn them into bundles,
 		# as dyld won't load them any more then, bug #306467
@@ -110,9 +124,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "Valgrind will not work if libc (e.g. glibc) does not have debug symbols."
 	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
+	elog "and remerge glibc. See:"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
diff --git a/dev-util/valgrind/valgrind-3.20.0.ebuild b/dev-util/valgrind/valgrind-3.20.0.ebuild
index 3988dcd1f6ae..bf165cdd0c9a 100644
--- a/dev-util/valgrind/valgrind-3.20.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index aed73f6be21b..b690f11f1222 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,10 +35,11 @@ src_prepare() {
 	# Don't force multiarch stuff on OSX, bug #306467
 	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
 
-	# Conditionally copy musl specific suppressions && apply patch
 	if use elibc_musl ; then
-		cp "${FILESDIR}/musl.supp" "${S}" || die
-		PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch )
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-3.13.0-malloc.patch
+			"${FILESDIR}"/${PN}-3.20.0-musl-interpose.patch
+		)
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
@@ -108,6 +109,9 @@ src_install() {
 
 	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
 
+	# See README_PACKAGERS
+	dostrip -x /usr/libexec/valgrind/vgpreload* /usr/$(get_libdir)/valgrind/*
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_names on shared libraries, can't turn them into bundles,
 		# as dyld won't load them any more then, bug #306467
@@ -119,9 +123,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "Valgrind will not work if libc (e.g. glibc) does not have debug symbols."
 	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
+	elog "and remerge glibc. See:"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"