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

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

[Sergei Trofimovich]

commit:     1a173bc429e51de4fcf6ceada45cd7274ab12aaf
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 19:17:09 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 19:17:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a173bc4

dev-util/ltrace: fix build failure on ia64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-util/ltrace/files/ltrace-0.7.3-ia64.patch | 39 +++++++++++++++++++++++++++
 dev-util/ltrace/ltrace-0.7.3_p4.ebuild        |  3 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch b/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch
new file mode 100644
index 00000000000..4fb1c4eba73
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch
@@ -0,0 +1,39 @@
+Fix build fauilure on ia64.
+
+Build fails due to bitrot: some definitions
+moved off from <sys/pthrace.h> to <asm/ptrace.h>
+(similar to other arches).
+
+fetch.c:39:26: error: field 'regs' has incomplete type
+  struct pt_all_user_regs regs;
+                          ^~~~
+fetch.c:209:25: warning: 'struct ia64_fpreg' declared inside parameter list will not be visible outside of this definition or declaration
+ fpreg_to_double (struct ia64_fpreg *fp) {
+                         ^~~~~~~~~~
+fetch.c: In function 'fpreg_to_double':
+fetch.c:211:45: error: dereferencing pointer to incomplete type 'struct ia64_fpreg'
+  asm ("ldf.fill %0=%1" : "=f"(result) : "m"(*fp));
+                                             ^~~
+
+diff --git a/sysdeps/linux-gnu/ia64/fetch.c b/sysdeps/linux-gnu/ia64/fetch.c
+index 54dc5b8..b3b9a9a 100644
+--- a/sysdeps/linux-gnu/ia64/fetch.c
++++ b/sysdeps/linux-gnu/ia64/fetch.c
+@@ -134,9 +134,4 @@ allocate_reg(struct fetch_context *ctx, struct Process *proc,
+ 		return 0;
+ 
+-	/* This would normally be brought over from asm/ptrace.h, but
+-	 * when we do, we get namespace conflicts between asm/fpu.h
+-	 * and libunwind.  */
+-	enum { PT_AUR_BSP = 17 };
+-
+ 	union cfm_t cfm = { .value = ctx->regs.cfm };
+ 	unsigned long *bsp = (unsigned long *)ctx->regs.ar[PT_AUR_BSP];
+diff --git a/sysdeps/linux-gnu/ia64/ptrace.h b/sysdeps/linux-gnu/ia64/ptrace.h
+index ef63b4f..8b131f1 100644
+--- a/sysdeps/linux-gnu/ia64/ptrace.h
++++ b/sysdeps/linux-gnu/ia64/ptrace.h
+@@ -20,2 +20,3 @@
+ 
+ #include <sys/ptrace.h>
++#include <asm/ptrace.h>

diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index 7305b4cba13..a818ab97085 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,6 +32,7 @@ src_prepare() {
 	epatch "${WORKDIR}"/debian/patches/[0-9]*
 	epatch "${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
 	epatch "${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
+	epatch "${FILESDIR}"/${PN}-0.7.3-ia64.patch
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	eautoreconf
 }

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

[Sergei Trofimovich]

commit:     f1e6f1643f65825fbb71126a9aa58050adb9df27
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  4 23:15:59 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 23:15:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e6f164

dev-util/ltrace: fix print-instruction-pointer test

print-instruction-pointer occasionally fails when
kernel loads test at address that does not match
last 4 digits of 'objdump' output.

On x86_64 page size is 4096 bytes (0x1000). This gives
only 3 digits of stable address.

The change picks last 3 digits from objdump address.

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

 dev-util/ltrace/files/ltrace-0.7.3-print-test-pie.patch | 15 +++++++++++++++
 dev-util/ltrace/ltrace-0.7.3_p4.ebuild                  |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-print-test-pie.patch b/dev-util/ltrace/files/ltrace-0.7.3-print-test-pie.patch
new file mode 100644
index 00000000000..5e46135add3
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-print-test-pie.patch
@@ -0,0 +1,15 @@
+--- a/testsuite/ltrace.minor/print-instruction-pointer.exp
++++ b/testsuite/ltrace.minor/print-instruction-pointer.exp
+@@ -32,6 +32,12 @@ catch "exec sh -c {objdump -d $objdir/$subdir/$binfile | sed -n '/^\[0-9a-fA-F\]
+ catch "exec sh -c {echo \"$output\" | sed -n '2p'| awk -F' ' '{print \$1}'|awk -F: '{print \$1}'}" addr1
+ catch "exec sh -c {echo \"$output\" | sed -n '5p'| awk -F' ' '{print \$1}'|awk -F: '{print \$1}'}" addr2
+ 
++# Pick at most last 3 digits:
++# PIE binaries randomize address on page level.
++# Let's assume page size is no bigger than 4096 (3 hex digits)
++set addr1 [string range $addr1 3 end]
++set addr2 [string range $addr2 3 end]
++
+ verbose "addr1 = $addr1"
+ verbose "addr2 = $addr2"
+ # Verify the output by checking numbers of print in main.ltrace.

diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index b8d3442e1c1..158e5871be7 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -33,6 +33,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
 	epatch "${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
 	epatch "${FILESDIR}"/${PN}-0.7.3-ia64.patch
+	epatch "${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	eautoreconf
 }

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

[Sergei Trofimovich]

commit:     a35e6bc22c84fdc91e392ca942a743025af67788
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 21:03:16 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 21:03:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a35e6bc2

dev-util/ltrace: add RESTRICT="!test? ( test )", bump to EAPI=7

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

 .../ltrace/files/ltrace-0.7.3-alpha-protos.patch   | 10 ++++-----
 dev-util/ltrace/ltrace-0.7.3_p4.ebuild             | 24 ++++++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch b/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch
index 659952bdf14..7ff57327296 100644
--- a/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch
+++ b/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch
@@ -2,13 +2,11 @@ Fix build failure on alpha:
   plt.c:32:12: error: dereferencing pointer to incomplete type ‘struct library_symbol’
     return sym->enter_addr;
             ^
-diff -U0 -raN ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c
---- ltrace-0.7.3_p4/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c     2012-11-10 13:43:55.000000000 +0100
-+++ foo/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c 2016-06-27 23:21:28.000000000 +0200
+--- a/sysdeps/linux-gnu/alpha/plt.c     2012-11-10 13:43:55.000000000 +0100
++++ b/sysdeps/linux-gnu/alpha/plt.c 2016-06-27 23:21:28.000000000 +0200
 @@ -23,0 +24 @@
 +#include "library.h"
-diff -U0 -raN ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c
---- ltrace-0.7.3_p4/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c   2016-06-27 23:30:08.000000000 +0200
-+++ foo/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c       2016-06-27 23:25:20.000000000 +0200
+--- a/sysdeps/linux-gnu/alpha/trace.c   2016-06-27 23:30:08.000000000 +0200
++++ b/sysdeps/linux-gnu/alpha/trace.c       2016-06-27 23:25:20.000000000 +0200
 @@ -29,0 +30 @@
 +#include "backend.h"

diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index abe4ea0c259..2f15597a064 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
 LTRACE_V=${PV/_p*/}
 DB_V=${PV/*_p/}
@@ -26,15 +26,23 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	test? ( dev-util/dejagnu )"
 
+RESTRICT="!test? ( 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
+)
+
 src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/[0-9]*
-	epatch "${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
-	epatch "${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3-ia64.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3-ia64-pid_t.patch
+	eapply "${WORKDIR}"/debian/patches/[0-9]*
+
+	default
+
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	eautoreconf
 }

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

[Sergei Trofimovich]

commit:     d3d153b6dd2be45da02ae2d547894c0849b6a6bf
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 08:05:51 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 08:06:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d153b6

dev-util/ltrace: tweak for musl, bug #713428

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/713428
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/ltrace/files/ltrace-0.7.3-musl-host.patch | 11 ++++
 .../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 +++
 dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild          | 66 ++++++++++++++++++++
 6 files changed, 245 insertions(+)

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-musl-host.patch b/dev-util/ltrace/files/ltrace-0.7.3-musl-host.patch
new file mode 100644
index 00000000000..7729449d060
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-musl-host.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/713428
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,6 +33,7 @@ AC_CANONICAL_HOST
+ 
+ case "${host_os}" in
+     linux-gnu*) HOST_OS="linux-gnu" ;;
++    linux-musl*) HOST_OS="linux-gnu" ;;
+     linux-uclibc*) HOST_OS="linux-gnu" ;;
+     *)		AC_MSG_ERROR([unkown host-os ${host_os}]) ;;
+ esac

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
new file mode 100644
index 00000000000..7fc8b60aa48
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-no-REG_NOERROR.patch
@@ -0,0 +1,50 @@
+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
new file mode 100644
index 00000000000..6b798b27490
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-no-error.h-2.patch
@@ -0,0 +1,72 @@
+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
new file mode 100644
index 00000000000..56aea7a54d4
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-no-error.h.patch
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 00000000000..b54a5bf3a00
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch
@@ -0,0 +1,10 @@
+--- 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/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
new file mode 100644
index 00000000000..8ca6b5a1233
--- /dev/null
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+LTRACE_V=${PV/_p*/}
+DB_V=${PV/*_p/}
+
+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.gz
+"
+
+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 )"
+
+# under musl tests need major work upstream, half of them does not work.
+RESTRICT="
+	!test? ( test )
+	elibc_musl? ( 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
+)
+
+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)
+}

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

[Sergei Trofimovich]

commit:     d15a204b616fbf9ab244dbc56f0dbd968adbad4e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 18:03:13 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 18:08:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d15a204b

dev-util/ltrace:use $CC in tests instead of gcc

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

 dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch | 12 ++++++++++++
 dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild            |  1 +
 2 files changed, 13 insertions(+)

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
new file mode 100644
index 00000000000..9abeb28b488
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch
@@ -0,0 +1,12 @@
+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_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
index 0f327a431cd..dce93623818 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${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
 )
 
 src_prepare() {

[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
+}