[gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/, dev-util/ltrace/files/

[Sergei Trofimovich]

commit:     88a7537e01bf74739ffe3f63a5e9a929646e3053
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 07:58:29 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 07:58:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88a7537e

dev-util/ltrace: disable munmap test, disable sandbox

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../ltrace/files/ltrace-0.7.3-disable-munmap-test.patch   | 15 +++++++++++++++
 dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild                 |  7 +++++++
 2 files changed, 22 insertions(+)

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 00000000000..fdd7412efed
--- /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 8f9f97e7fb4..beb325aa49c 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
+}