gentoo resync : 12.03.2021

3 files changed, 24 insertions, 1 deletions

diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index ea8ec6c37f93..fb1edb054455 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,5 +1,6 @@
 AUX ltrace-0.7.3-CXX-for-tests.patch 255 BLAKE2B cd213eff103c4efa9a96a28a333825b32b43333b07a6e25ccbf5a216ba12a0fa1e38f5a1b4644ca19f9eec0df0cddb8fae95a92e5e44af497aacc448a2eb58c6 SHA512 02ecca05ff34739c234f9b3a2331b10f2bb62289c2698095a4276fdb76d3494e1657c7551a5933876bf5b722db3a1c62dd839db7768ebd69c897b4a109bd5cc5
 AUX ltrace-0.7.3-alpha-protos.patch 541 BLAKE2B 727e9acb2c12cfda3d5c15903bda8bff9e8f8823a03daa3031d4cb022b9735026e14d9e6d756c568a92401f546589aa94b099c27d6fa1555d365b0d00ce041a2 SHA512 32738dd0688c861961703a5e5c0e14324218f3ecdfdbcef0977522e2de1c9d77fc0fa1a3ea0d2074190293bf360cf8b5adfa16c67a002a1df38e37c70c024595
+AUX ltrace-0.7.3-disable-munmap-test.patch 629 BLAKE2B 52b8f22ea7f59642899dd39a7967c96aa32a7576afd28f332613c1fecafa224b0284fd028dd1e3e38dabe13f30abda7fef4db1a0c7dd1027d922967d3b170a94 SHA512 55d7b318b64100d6712fa7e3c89fe000d1bd1c743384cdf7d1cc7e32aba5763138bb444d5cb6df368b339c2211ad7c10eb41cefcdd4ccbd5c308d11e23c4d8ef
 AUX ltrace-0.7.3-ia64-pid_t.patch 184 BLAKE2B 4d739f7ad6474541cec166cc1262637edbf30b32ef3335ac92e834bd611472de5473801ad307b7ba56eec0657bbcceea48d7fe17517663c6389d0843e9a9d5bc SHA512 1029f86f3b3e33eebcdbafa6dc56e2ece2a33234a6b7a0b05e4bb87424829c5f512e019e6c6a962e639a9cfeac56edea3d0ac250fc31489755e68d2181ce254f
 AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
 AUX ltrace-0.7.3-musl-host.patch 313 BLAKE2B 3ff936391668b118db37aabcf197081b85ed1ac67759a275ae3d18b398fb7af96ec74475f1c50d1dfa22153c459c079fe95789826b8c4eaecb6c38575f7be8aa SHA512 4aa92f406a45aa10cf8b456fd4eb1421d74c682040c71a6819f9caea60dd275cd268a42d0c656e68d7cda70b152bc4e83bc70461c5ac0732d09b70abc77f0ed8
@@ -13,5 +14,5 @@ AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666
 AUX ltrace-0.7.3-tuple-tests.patch 460 BLAKE2B f8beacb8468f7842603e6abd1aeace86ad52cd9347fab1fb7ee243bfc1b536b42d91405380354476bc68c033687216561f6512e82bedca6e525407e79dcab2dd SHA512 07a1808ea6a9564c891ce0caec9cbb0e55975a171c46a6bb3358a9e16f217cd4bbd4b3c39a0e278b34e9c542199e13afdbe817bc2ba26390e879edbda71bf993
 DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.3_p4-r1.ebuild 1866 BLAKE2B a674f6b490f9c54a4a601747b30d56e6e9964dca417d35813ba06f1efa10dee76f663ff60d974a15410977be5071eb64a3c315f11a61fada86b21f21a8784eaa SHA512 840b9017372cc8faec0c26ab0034e818fee37480b05f0da722c7f8815b2abb998e5af01df436af7a7147d83d30047efcb36784775263622b60cdfcbb8ee38575
+EBUILD ltrace-0.7.3_p4-r1.ebuild 2059 BLAKE2B 18f68766243bb36ac07581b4b8acb2bb981d157c0b7767e897598b0b1ceae3fe52b90fb2b702d669b704259db00cee1f30a9883e3bf399fc7a1fb88e1cc9d217 SHA512 8c85708282e7e5fb1f9f3226fb1e074e63579a17addd15b7f93c3f2f5471814284c8ac2d869dd699b438aac0ad082ab7aaa6ef175d336230791c2288a3adc932
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-disable-munmap-test.patch b/dev-util/ltrace/files/ltrace-0.7.3-disable-munmap-test.patch
new file mode 100644
index 000000000000..fdd7412efeda
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-disable-munmap-test.patch
@@ -0,0 +1,15 @@
+--- a/testsuite/ltrace.main/system_calls.exp
++++ b/testsuite/ltrace.main/system_calls.exp
+@@ -29,8 +29,10 @@ if [regexp {ELF from incompatible architecture} $exec_output] {
+ }
+ 
+ 
+-set pattern "SYS_munmap"
+-ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 2
++## disabled in Gentoo: libc's stdio tends to call (or not to call) munmap
++## depending on heuristics of stdio buffer sizes.
++##set pattern "SYS_munmap"
++##ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 2
+ set pattern "SYS_write"
+ ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
+ set pattern "SYS_unlink"
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
index 8f9f97e7fb45..beb325aa49c3 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.3-tuple-tests.patch
 	"${FILESDIR}"/${PN}-0.7.3-CXX-for-tests.patch
 	"${FILESDIR}"/${PN}-0.7.3-test-glibc-2.33.patch
+	"${FILESDIR}"/${PN}-0.7.3-disable-munmap-test.patch
 )
 
 src_prepare() {
@@ -67,3 +68,9 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_with unwind libunwind)
 }
+
+src_test() {
+	# sandbox redirects vfork() to fork(): bug # 774054
+	# Let's avoid sandbox entirely.
+	SANDBOX_ON=0 LD_PRELOAD= emake check
+}