public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/files/, dev-util/ltrace/
Date: Mon, 14 Aug 2023 10:16:15 +0000 (UTC)	[thread overview]
Message-ID: <1692008001.c1824e861085bc181e7a38f66392ff0bf615d7a1.marecki@gentoo> (raw)

commit:     c1824e861085bc181e7a38f66392ff0bf615d7a1
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 10:13:21 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 10:13:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1824e86

dev-util/ltrace: drop 0.7.3.6.1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-util/ltrace/Manifest                           |  2 -
 .../files/ltrace-0.7.3-disable-munmap-test.patch   | 15 ----
 .../ltrace/files/ltrace-0.7.3-no-REG_NOERROR.patch | 50 --------------
 .../ltrace/files/ltrace-0.7.3-no-error.h-2.patch   | 72 --------------------
 .../ltrace/files/ltrace-0.7.3-no-error.h.patch     | 36 ----------
 dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch     | 10 ---
 .../files/ltrace-0.7.3-test-glibc-2.33.patch       | 11 ---
 .../ltrace/files/ltrace-0.7.3-test-protos.patch    | 71 -------------------
 .../ltrace/files/ltrace-0.7.3-tuple-tests.patch    | 12 ----
 dev-util/ltrace/ltrace-0.7.3.6.1.ebuild            | 79 ----------------------
 10 files changed, 358 deletions(-)

diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index c1d8595eb775..09f36f2fb6a0 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,3 +1 @@
 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

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
deleted file mode 100644
index fdd7412efeda..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-disable-munmap-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/files/ltrace-0.7.3-no-REG_NOERROR.patch b/dev-util/ltrace/files/ltrace-0.7.3-no-REG_NOERROR.patch
deleted file mode 100644
index 7fc8b60aa48a..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-no-REG_NOERROR.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b6c5c8c51f954cfbe76424fd57c33a87166f0545 Mon Sep 17 00:00:00 2001
-From: Petr Machata <pmachata@redhat.com>
-Date: Sat, 8 Dec 2012 03:23:39 +0100
-Subject: [PATCH] Avoid using REG_NOERROR
-
-Not all systems define this (IRIX 6.5 doesn't).  Comparing to 0 is not
-terribly less readable, so do that instead.
----
- glob.c    | 4 ++--
- options.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/glob.c b/glob.c
-index 9af633f..b26637f 100644
---- a/glob.c
-+++ b/glob.c
-@@ -180,7 +180,7 @@ glob_to_regex(const char *glob, char **retp)
- 			goto fail;
- 	}
- 	*retp = buf;
--	return REG_NOERROR;
-+	return 0;
- }
- 
- int
-@@ -188,7 +188,7 @@ globcomp(regex_t *preg, const char *glob, int cflags)
- {
- 	char *regex = NULL;
- 	int status = glob_to_regex(glob, &regex);
--	if (status != REG_NOERROR)
-+	if (status != 0)
- 		return status;
- 	assert(regex != NULL);
- 	status = regcomp(preg, regex, cflags);
-diff --git a/options.c b/options.c
-index e8fd2a2..4c7441e 100644
---- a/options.c
-+++ b/options.c
-@@ -204,7 +204,7 @@ compile_libname(const char *expr, const char *a_lib, int lib_re_p,
- 
- 		regex_t lib_re;
- 		int status = (lib_re_p ? regcomp : globcomp)(&lib_re, lib, 0);
--		if (status != REG_NOERROR) {
-+		if (status != 0) {
- 			char buf[100];
- 			regerror(status, &lib_re, buf, sizeof buf);
- 			fprintf(stderr, "Rule near '%s' will be ignored: %s.\n",
--- 
-2.25.2
-

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-no-error.h-2.patch b/dev-util/ltrace/files/ltrace-0.7.3-no-error.h-2.patch
deleted file mode 100644
index 6b798b274909..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-no-error.h-2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 1233b37167097dffa9a78bd7bd0a8117c75fe8ff Mon Sep 17 00:00:00 2001
-From: Petr Machata <pmachata@redhat.com>
-Date: Sat, 8 Dec 2012 03:13:29 +0100
-Subject: [PATCH] expr_node_zero and expr_self should be stack-allocated
-
----
- expr.c | 14 ++++++--------
- zero.c | 14 ++++++--------
- 2 files changed, 12 insertions(+), 16 deletions(-)
-
---- a/expr.c
-+++ b/expr.c
-@@ -21,7 +21,6 @@
- #include <string.h>
- #include <assert.h>
- #include <errno.h>
--#include <error.h>
- #include <stdlib.h>
- 
- #include "expr.h"
-@@ -327,12 +326,11 @@ expr_eval_constant(struct expr_node *node, long *valuep)
- struct expr_node *
- expr_self(void)
- {
--	static struct expr_node *node = NULL;
--	if (node == NULL) {
--		node = malloc(sizeof(*node));
--		if (node == NULL)
--			error(1, errno, "malloc expr_self");
--		expr_init_self(node);
-+	static struct expr_node *nodep = NULL;
-+	if (nodep == NULL) {
-+		static struct expr_node node;
-+		expr_init_self(&node);
-+		nodep = &node;
- 	}
--	return node;
-+	return nodep;
- }
---- a/zero.c
-+++ b/zero.c
-@@ -18,7 +18,6 @@
-  * 02110-1301 USA
-  */
- 
--#include <error.h>
- #include <errno.h>
- 
- #include "zero.h"
-@@ -93,13 +92,12 @@ build_zero_w_arg(struct expr_node *expr, int own)
- struct expr_node *
- expr_node_zero(void)
- {
--	static struct expr_node *node = NULL;
--	if (node == NULL) {
--		node = malloc(sizeof(*node));
--		if (node == NULL)
--			error(1, errno, "malloc expr_node_zero");
--		expr_init_cb1(node, &zero1_callback,
-+	static struct expr_node *nodep = NULL;
-+	if (nodep == NULL) {
-+		static struct expr_node node;
-+		expr_init_cb1(&node, &zero1_callback,
- 			      expr_self(), 0, (void *)-1);
-+		nodep = &node;
- 	}
--	return node;
-+	return nodep;
- }
--- 
-2.25.2
-

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-no-error.h.patch b/dev-util/ltrace/files/ltrace-0.7.3-no-error.h.patch
deleted file mode 100644
index 56aea7a54d4d..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-no-error.h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 86a7b48310e0fd551f7f3d88ea9ad39c1a2807c6 Mon Sep 17 00:00:00 2001
-From: Petr Machata <pmachata@redhat.com>
-Date: Sat, 8 Dec 2012 03:33:47 +0100
-Subject: [PATCH] Avoid using non-portable error.h in generic code
-
----
- read_config_file.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- a/read_config_file.c
-+++ b/read_config_file.c
-@@ -27,7 +27,6 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <errno.h>
--#include <error.h>
- #include <assert.h>
- 
- #include "common.h"
-@@ -1258,8 +1257,11 @@ void
- init_global_config(void)
- {
- 	struct arg_type_info *info = malloc(2 * sizeof(*info));
--	if (info == NULL)
--		error(1, errno, "malloc in init_global_config");
-+	if (info == NULL) {
-+		fprintf(stderr, "Couldn't init global config: %s\n",
-+			strerror(errno));
-+		exit(1);
-+	}
- 
- 	memset(info, 0, 2 * sizeof(*info));
- 	info[0].type = ARGTYPE_POINTER;
--- 
-2.25.2
-

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch b/dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch
deleted file mode 100644
index b54a5bf3a00c..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/proc.h
-+++ b/proc.h
-@@ -26,6 +26,7 @@
- #include "config.h"
- 
- #include <sys/time.h>
-+#include <unistd.h> /* pid_t */
- 
- #if defined(HAVE_LIBUNWIND)
- # include <libunwind.h>

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch b/dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch
deleted file mode 100644
index 0b8592d82a1f..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/testsuite/ltrace.main/system_calls.exp
-+++ b/testsuite/ltrace.main/system_calls.exp
-@@ -55,7 +55,7 @@ set pattern "SYS_symlink"
- ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
- set pattern "SYS_unlink"
- ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
--set pattern "SYS_(new)?stat"
-+set pattern "SYS_(new)?stat|SYS_fstatat64|SYS_newfstatat"
- ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1 egrep
- set pattern "SYS_access"
- ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch b/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch
deleted file mode 100644
index caafff4b2637..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://bugs.gentoo.org/421649
-
-For some reason testsuite does not handle warnings well:
-  /tmp/lt-cZI2cFo0z7.c:2:24: warning: inplicit function declaration «puts» [-Wimplicit-function-declaration]
-       void func2(void) { puts("func2"); }
-                          ^
-and abandons problematic tests:
-  Testcase compile failed, so all tests in this file will automatically fail.
-diff --git a/testsuite/ltrace.main/filters.exp b/testsuite/ltrace.main/filters.exp
-index 988346f..f7f4140 100644
---- a/testsuite/ltrace.main/filters.exp
-+++ b/testsuite/ltrace.main/filters.exp
-@@ -24,2 +24,3 @@ set libfilt1 [ltraceCompile libfilt1.so [ltraceSource c {
- set libfilt2 [ltraceCompile libfilt2.so [ltraceSource c {
-+    #include <stdio.h>
-     void func2(void) { puts("func2"); }
-diff --git a/testsuite/ltrace.main/parameters.c b/testsuite/ltrace.main/parameters.c
-index ff24a38..9569dbe 100644
---- a/testsuite/ltrace.main/parameters.c
-+++ b/testsuite/ltrace.main/parameters.c
-@@ -19,2 +19,3 @@ void func_strfixed(char*);
- void func_ppp(int***);
-+void func_string(char*);
- void func_stringp(char**);
-diff --git a/testsuite/ltrace.main/signals.c b/testsuite/ltrace.main/signals.c
-index a02e795..fda4ab9 100644
---- a/testsuite/ltrace.main/signals.c
-+++ b/testsuite/ltrace.main/signals.c
-@@ -7,2 +7,3 @@
- #include <sys/types.h>
-+#include <unistd.h>
- 
-diff --git a/testsuite/ltrace.minor/time-record.c b/testsuite/ltrace.minor/time-record.c
-index a66b838..7d5e5e3 100644
---- a/testsuite/ltrace.minor/time-record.c
-+++ b/testsuite/ltrace.minor/time-record.c
-@@ -7,2 +7,3 @@
- #include <time.h>
-+#include <unistd.h>
- 
-diff --git a/testsuite/ltrace.minor/trace-clone.c b/testsuite/ltrace.minor/trace-clone.c
-index db1936d..c68b128 100644
---- a/testsuite/ltrace.minor/trace-clone.c
-+++ b/testsuite/ltrace.minor/trace-clone.c
-@@ -10,2 +10,3 @@
- #include <sched.h>
-+#include <unistd.h>
- 
-diff --git a/testsuite/ltrace.minor/trace-fork.c b/testsuite/ltrace.minor/trace-fork.c
-index c5f0c71..e1ab17f 100644
---- a/testsuite/ltrace.minor/trace-fork.c
-+++ b/testsuite/ltrace.minor/trace-fork.c
-@@ -8,2 +8,4 @@
- #include <sys/types.h>
-+#include <sys/wait.h>
-+#include <unistd.h>
- 
-@@ -29,3 +31,4 @@ main ()
-       printf("My child pid is %d\n",pid);
--      wait(); 
-+      int status;
-+      wait(&status);
-     }
-diff --git a/testsuite/ltrace.torture/signals.c b/testsuite/ltrace.torture/signals.c
-index b786c81..86e2dba 100644
---- a/testsuite/ltrace.torture/signals.c
-+++ b/testsuite/ltrace.torture/signals.c
-@@ -7,2 +7,3 @@
- #include <sys/types.h>
-+#include <unistd.h>
- 

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch b/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch
deleted file mode 100644
index 9abeb28b4883..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Use $CC instead of gcc in testsuite.
---- a/testsuite/Makefile.am
-+++ b/testsuite/Makefile.am
-@@ -39,6 +39,8 @@ env.exp: Makefile
- 	rm -f env.exp
- 	echo set libelf_LD_LIBRARY_PATH '"$(libelf_LD_LIBRARY_PATH)"' >> $@
- 	echo set libunwind_LD_LIBRARY_PATH '"$(libunwind_LD_LIBRARY_PATH)"' >> $@
-+	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
deleted file mode 100644
index abc626186b4c..000000000000
--- a/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-LTRACE_V=$(ver_cut 1-3)
-DB_V=$(ver_cut 4-)
-
-DESCRIPTION="trace library calls made at runtime"
-HOMEPAGE="https://gitlab.com/cespedes/ltrace"
-SRC_URI="
-	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}.orig.tar.bz2
-	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}-${DB_V}.debian.tar.xz
-"
-
-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}-${LTRACE_V}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
-	"${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
-	"${FILESDIR}"/${PN}-0.7.3-ia64.patch
-	"${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
-	"${FILESDIR}"/${PN}-0.7.3-ia64-pid_t.patch
-	"${FILESDIR}"/${PN}-0.7.3-musl-host.patch #713428
-	"${FILESDIR}"/${PN}-0.7.3-no-error.h.patch #713428
-	"${FILESDIR}"/${PN}-0.7.3-no-error.h-2.patch #713428
-	"${FILESDIR}"/${PN}-0.7.3-no-REG_NOERROR.patch #713428
-	"${FILESDIR}"/${PN}-0.7.3-pid_t.patch #713428
-	"${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() {
-	eapply "${WORKDIR}"/debian/patches/[0-9]*
-
-	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)
-}
-
-src_test() {
-	# On kernels with Yama enabled this will not run, even without sandbox,
-	# unless /proc/sys/kernel/yama/ptrace_scope == 0. Just don't bother.
-	# Note: we only delete it here in order to avoid Makefile.am patching.
-	rm -f testsuite/ltrace.minor/attach-process.exp
-	# sandbox redirects vfork() to fork(): bug # 774054
-	# Let's avoid sandbox entirely.
-	SANDBOX_ON=0 LD_PRELOAD= emake check
-}


             reply	other threads:[~2023-08-14 10:16 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-14 10:16 Marek Szuba [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-03-30 22:09 [gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/files/, dev-util/ltrace/ Marek Szuba
2021-02-06 12:42 Sergei Trofimovich
2020-06-21 18:17 Sergei Trofimovich
2019-03-18  9:18 Sergei Trofimovich
2016-06-27 21:43 Sergei Trofimovich
2016-02-14 19:17 Sergei Trofimovich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1692008001.c1824e861085bc181e7a38f66392ff0bf615d7a1.marecki@gentoo \
    --to=marecki@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox