gentoo auto-resync : 31:03:2023 - 04:04:12

8 files changed, 183 insertions, 8 deletions

diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 05c353a2cf1c..59e72b61e9d1 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -12,7 +12,13 @@ AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588e
 AUX ltrace-0.7.3-test-glibc-2.33.patch 569 BLAKE2B 43bacf629135268f4495d98cbb394b9811e30b907f48de343bb52ec2f0322958c5da50d0626ffe16f58da389e6bd92a4e6d6f3eee035ae906c208b36c31d65ba SHA512 8812f808db5f7213ec3547ac9cef79374d1e5a2589fcb99bc5e3aa7cc717909457321b4fdb60e933070d1d50c3900e3282ba825f15d1943e4e1aba3676c1bf98
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
 AUX ltrace-0.7.3-tuple-tests.patch 460 BLAKE2B f8beacb8468f7842603e6abd1aeace86ad52cd9347fab1fb7ee243bfc1b536b42d91405380354476bc68c033687216561f6512e82bedca6e525407e79dcab2dd SHA512 07a1808ea6a9564c891ce0caec9cbb0e55975a171c46a6bb3358a9e16f217cd4bbd4b3c39a0e278b34e9c542199e13afdbe817bc2ba26390e879edbda71bf993
+AUX ltrace-0.7.91-debian-patchset-6.4.patch 1868 BLAKE2B 6d3a8565c8dba4b4d73f9df2b0fd9c85971477ddc6e549310476ad7a81c050328fb51104f8801cbc1ca6b458a41cd14113faf9ccf219db2fffd195619d0a3bf2 SHA512 5ba893f3295b11193a56d49bab5c874350f42e58ed8ecc397c33e2f51947609a607cb84e06d8ff8f38392815afbd75f567ab6366ffded93345477bec8e92ae10
+AUX ltrace-0.7.91-pid_t.patch 182 BLAKE2B 0425953956211429741d7a2f1527e8614428af250f12d0a93687000b54ab58b7ced0bc3cd278f0f64ecef6cd20dc1c87625ebfc033f518f2571ca450205409dc SHA512 93207907df8300aa5e396d1fa2bfd35993e4e5c5308a0ba1a2fcdc95cae7c817df9d67a108e3c392a2b13152ea3b73dd721f61bad99203f04b016d6d939fb508
+AUX ltrace-0.7.91-test-glibc-2.33.patch 351 BLAKE2B 8daacf679828735a37ec062ce775b6087de363a447bb35d25e20e51d256a30b80f3bdc87867c0752ad0e5011eb625fc0b0c54998cd7c0ddc4cde6be33a35f138 SHA512 b689072e5d7a098aff5dcc0a424e69c48a859514fefc459144c24d0ddd7ee800c82766d0fac741e75de1691dd874369db7a44db676e60f2176426115c0e21a04
+AUX ltrace-0.7.91-tuple-tests.patch 431 BLAKE2B 452e19ff22cd4453e73f1652777ffd998c3af1bb510815c5867a38b53cc25924a02aa055bb335491b0292c430749db6febca79222d1669a3f416ff1dcde4c715 SHA512 6ec368bc19f870322e21d05a409b29aa1064c8c901c98d4281a35513149bc6104282bb4b655506fdd22dd305edb10d438416e2f42bf65cd59748c17ce5a386d9
+DIST ltrace-0.7.91_pre20221216.tar.bz2 288077 BLAKE2B cadc2ac551a96dfa95aee0d0eb251d8f41a8631350ba3be3f67d0cb10774a3db6abbd42481d24febdfcb0d565107e66b4de0056a85a7954bb050adb8e8fa5b4a SHA512 993c247797551b4fbb202c04f9af08063c8641946825b17d1f32c4647c606ece803a6b049c4afa3046c798add161ab58f01d90106f3b6029a223af03bca27a99
 DIST ltrace_0.7.3-6.1.debian.tar.xz 11404 BLAKE2B d38ce51dfcbf809d7622029fb6dd0acd61c8d8213be0bf2625fd746adbe6dd6830faf208b7e864c1185013d7d5e17f3e10e8a8fb45f8e0a4bc9859fde96a55d7 SHA512 c0753935d74be530886ce5202429cabbbe73814c9ac120eaf90a1c4e03dfd4de5381e3e85a27fbbbce694b23cd72a273199575419446b6159b0925d85e1938ab
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.3.6.1.ebuild 2331 BLAKE2B 9fcaceed1ab181af46fb5caf1636bc0e777284d434ab2a88cbb641fe43b2c5b40ff2f53230219b305ca758c7c2e522c8a0e573f496e7551002633a74e288b32f SHA512 dc613ac4daefea4a42c805228bb4ac25bd30cffda63195bf1ece538d5ecc393627a958d04400d909ef475177b06e4f41173a110d85ed792248b3dcbdae683afa
-MISC metadata.xml 352 BLAKE2B 15b228217fff782041f3cae8a69e5e9be118cdd99dd39a26c4b79209ba9b55e22a1a2485a1fa75fd0b89438bffeb85d7bef26c38002fd1a77ef7bfc88a7ee221 SHA512 6b6068b2ef3baba29027349c8fbee57acde7df0e02a9e7ac042f33eb66d1f629c49ef4f5644b93b4eb6dca5da701acc3f692344a6f21dceea591045c856ece57
+EBUILD ltrace-0.7.3.6.1.ebuild 2350 BLAKE2B 0e75d0d6edaafef759a5423be9b25034e2d1366b4099f4287614b6795769482c1bea385123ea70ca53a6df921f4af090ab4eb748bfb605ee545e633fdd96b587 SHA512 57f7164f8c89d7bd9434b2c355f88e4deccade43efeb944f24c528ef9a1d2d38350b64cafbd07bff6a61f282b7909cc54812127680c452db48c08d9fbeab2f74
+EBUILD ltrace-0.7.91_pre20221216.ebuild 1629 BLAKE2B 1c3f747b0574fa715809962704139f013ec6b0a4ca0245f36d269c8a766419bffbf4a1373ab914e41ed36a4e1cde1f95c3c65cc1a2713f46a54f845eef319d0e SHA512 dec59cf32f99b579ae6f12d4fb77f02b75b582d763efe0e0aba8b5b669ef2c6f8b2c297617876f404712b2bafa7de295bb71a310ad528c8c7397ee65307e1b96
+MISC metadata.xml 432 BLAKE2B e3959e0f1dcd68a91cd05f0c4c90f0ac5ad1c2e531553cd62828bac7ed5a48b19dba435ff6cfa298b45c29e885c185c0c179cdaf8ba338b925cfc947836973d9 SHA512 d638dc65a5b0f8072712a3cb6786c57d9057bf3d09d6a3d8eddf7f5d79cc62a4dbb5d03a56cf1913a6ca289fedcd055fec821669d20939e270d308df72c7ff98
diff --git a/dev-util/ltrace/files/ltrace-0.7.91-debian-patchset-6.4.patch b/dev-util/ltrace/files/ltrace-0.7.91-debian-patchset-6.4.patch
new file mode 100644
index 000000000000..1f3bb5ec6a21
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.91-debian-patchset-6.4.patch
@@ -0,0 +1,77 @@
+Patches imported from the Debian patch set 6.4 for ltrace-0.7.3:
+ - 01-avoid-libstdc++ (adapted to account for the absence of configure),
+ - 03-alpha-debug.h
+ - 05-sparc-ftbfs
+ - 06-unexpected-breakpoint
+The other two have since been merged upstream.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,6 +126,15 @@
+ 	libstdcxx_LIBS=""])
+ AC_SUBST(libstdcxx_LIBS)
+ 
++if test "x$liberty_LIBS" != "x"
++then
++  libsupcxx_LIBS=""
++  libstdcxx_LIBS=""
++elif test "x$libsupcxx_LIBS" != "x"
++then
++  libstdcxx_LIBS=""
++fi
++
+ 
+ dnl Check security_get_boolean_active availability.
+ AC_CHECK_HEADERS(selinux/selinux.h)
+--- a/handle_event.c
++++ b/handle_event.c
+@@ -740,9 +740,12 @@
+ 
+ 	if ((sbp = address2bpstruct(leader, brk_addr)) != NULL)
+ 		breakpoint_on_hit(sbp, event->proc);
+-	else if (event->proc->state != STATE_IGNORED)
++	else if (event->proc->state != STATE_IGNORED) {
+ 		output_line(event->proc,
+ 			    "unexpected breakpoint at %p", brk_addr);
++		continue_process(event->proc->pid);
++		return;
++	}
+ 
+ 	/* breakpoint_on_hit may delete its own breakpoint, so we have
+ 	 * to look it up again.  */
+--- a/sysdeps/linux-gnu/alpha/trace.c
++++ b/sysdeps/linux-gnu/alpha/trace.c
+@@ -29,7 +29,6 @@
+ 
+ #include "proc.h"
+ #include "common.h"
+-#include "debug.h"
+ 
+ #if (!defined(PTRACE_PEEKUSER) && defined(PTRACE_PEEKUSR))
+ # define PTRACE_PEEKUSER PTRACE_PEEKUSR
+--- a/sysdeps/linux-gnu/sparc/plt.c
++++ b/sysdeps/linux-gnu/sparc/plt.c
+@@ -19,8 +19,9 @@
+  */
+ 
+ #include <gelf.h>
++
+ #include "proc.h"
+-#include "common.h"
++#include "library.h"
+ 
+ GElf_Addr
+ arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela) {
+--- a/sysdeps/linux-gnu/sparc/trace.c
++++ b/sysdeps/linux-gnu/sparc/trace.c
+@@ -26,8 +26,10 @@
+ #include <sys/wait.h>
+ #include <signal.h>
+ #include <string.h>
++
+ #include "ptrace.h"
+ #include "proc.h"
++#include "backend.h"
+ #include "common.h"
+ 
+ void
diff --git a/dev-util/ltrace/files/ltrace-0.7.91-pid_t.patch b/dev-util/ltrace/files/ltrace-0.7.91-pid_t.patch
new file mode 100644
index 000000000000..06075006b2e1
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.91-pid_t.patch
@@ -0,0 +1,10 @@
+--- a/proc.h
++++ b/proc.h
+@@ -27,6 +27,7 @@
+ 
+ #include <sys/time.h>
+ #include <stdint.h>
++#include <unistd.h> /* pid_t */
+ 
+ #if defined(HAVE_LIBDW)
+ # include <elfutils/libdwfl.h>
diff --git a/dev-util/ltrace/files/ltrace-0.7.91-test-glibc-2.33.patch b/dev-util/ltrace/files/ltrace-0.7.91-test-glibc-2.33.patch
new file mode 100644
index 000000000000..b78d4580b050
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.91-test-glibc-2.33.patch
@@ -0,0 +1,11 @@
+--- a/testsuite/ltrace.main/system_calls.exp
++++ b/testsuite/ltrace.main/system_calls.exp
+@@ -133,7 +133,7 @@
+     { {^write$} == 1 }
+     { {^unlink(at)?$} >= 2 }
+     { {^open(at)?$} == 1 }
+-    { {^(new|f)?stat(64)?$} >= 1 }
++    { {^(new)?stat|fstatat64|newfstatat$} >= 1 }
+     { {^close$} == 1 }
+     { {^getcwd$} == 1 }
+     { {^chdir$} == 1 }
diff --git a/dev-util/ltrace/files/ltrace-0.7.91-tuple-tests.patch b/dev-util/ltrace/files/ltrace-0.7.91-tuple-tests.patch
new file mode 100644
index 000000000000..c7c997d5545e
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.91-tuple-tests.patch
@@ -0,0 +1,11 @@
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -42,6 +42,8 @@
+ 	echo set elfutils_LD_LIBRARY_PATH '"$(elfutils_LD_LIBRARY_PATH)"' >> $@
+ 	echo set libunwind_LD_LIBRARY_PATH '"$(libunwind_LD_LIBRARY_PATH)"' >> $@
+ 	echo set PREFIX '"$(prefix)"' >> $@
++	echo set CC_FOR_TARGET '"$(CC)"' >> $@
++	echo set CXX_FOR_TARGET '"$(CXX)"' >> $@
+ 
+ CLEANFILES = *.o *.so *.log *.sum *.ltrace site.bak setval.tmp site.exp env.exp
+ 
diff --git a/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild b/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
index 6e833e04a3cf..abc626186b4c 100644
--- a/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,11 +27,9 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	test? ( dev-util/dejagnu )"
 
-# under musl tests need major work upstream, half of them does not work.
-RESTRICT="
-	!test? ( test )
-	elibc_musl? ( test )
-"
+# Effectively abandoned upstream. Extremely sensitive to the sandbox, versions
+# of core libraries, kernel security settings...
+RESTRICT="test"
 
 S=${WORKDIR}/${PN}-${LTRACE_V}
 
diff --git a/dev-util/ltrace/ltrace-0.7.91_pre20221216.ebuild b/dev-util/ltrace/ltrace-0.7.91_pre20221216.ebuild
new file mode 100644
index 000000000000..24b86f41a73f
--- /dev/null
+++ b/dev-util/ltrace/ltrace-0.7.91_pre20221216.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+EGIT_COMMIT="5cffc0d2134f697fbac8627ec5b5f0085cd47c8a"
+
+DESCRIPTION="trace library calls made at runtime"
+HOMEPAGE="https://gitlab.com/cespedes/ltrace"
+SRC_URI="https://gitlab.com/cespedes/${PN}/-/archive/${EGIT_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux test unwind"
+
+RDEPEND="virtual/libelf:=
+	selinux? ( sys-libs/libselinux )
+	unwind? ( sys-libs/libunwind:= )"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs
+	test? ( dev-util/dejagnu )"
+
+# Effectively abandoned upstream. Extremely sensitive to the sandbox, versions
+# of core libraries, kernel security settings...
+RESTRICT="test"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.91-debian-patchset-6.4.patch
+	"${FILESDIR}"/${PN}-0.7.3-CXX-for-tests.patch
+	"${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
+	"${FILESDIR}"/${PN}-0.7.3-ia64.patch
+	"${FILESDIR}"/${PN}-0.7.3-ia64-pid_t.patch
+	"${FILESDIR}"/${PN}-0.7.3-musl-host.patch
+	"${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
+	"${FILESDIR}"/${PN}-0.7.91-pid_t.patch
+	"${FILESDIR}"/${PN}-0.7.91-test-glibc-2.33.patch
+	"${FILESDIR}"/${PN}-0.7.91-tuple-tests.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i '/^dist_doc_DATA/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	ac_cv_header_selinux_selinux_h=$(usex selinux) \
+	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with unwind libunwind)
+}
diff --git a/dev-util/ltrace/metadata.xml b/dev-util/ltrace/metadata.xml
index 04f9919c858d..ca7a79566dae 100644
--- a/dev-util/ltrace/metadata.xml
+++ b/dev-util/ltrace/metadata.xml
@@ -5,6 +5,9 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">cespedes/ltrace</remote-id>
+	</upstream>
 	<use>
 		<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for frame unwinding support</flag>
 	</use>