gentoo Easter resync : 12.04.2020

7 files changed, 251 insertions, 0 deletions

diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 5b412021904b..9285c98346d7 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,9 +1,15 @@
 AUX ltrace-0.7.3-alpha-protos.patch 541 BLAKE2B 727e9acb2c12cfda3d5c15903bda8bff9e8f8823a03daa3031d4cb022b9735026e14d9e6d756c568a92401f546589aa94b099c27d6fa1555d365b0d00ce041a2 SHA512 32738dd0688c861961703a5e5c0e14324218f3ecdfdbcef0977522e2de1c9d77fc0fa1a3ea0d2074190293bf360cf8b5adfa16c67a002a1df38e37c70c024595
 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
+AUX ltrace-0.7.3-no-REG_NOERROR.patch 1367 BLAKE2B a321d9f621a3b919382bff3e42cfdd5f172780acdfb4f2ee4bde15d3f265641bb16aea41cc5c25562d7b64d69c5cae94a5d6500e64cf38c008db5ec80295280a SHA512 c22055e97bc7dfe5af150093e024fd1557751cb7181abcafb38fceb87d83cda5002a20bae39178ccdfaa9aa6f07fbd88d38104b79c9270109ce5ea667a43f684
+AUX ltrace-0.7.3-no-error.h-2.patch 1676 BLAKE2B 55451613cb1a5e37503dcfe38ac5535c79525c64bcb1c91f4cadff9958416a23bbde57c379c2c3df67363af6a1c444c98a14ecd4d6d5f593b1105894677c9c78 SHA512 570b8bbe2b86f12898841da9f24d7d8ef2389f657cde2faebb820348011f128732a6491a746de5ea93aa6fea88cdd4a8eff0702373e9d5d7305277304011d000
+AUX ltrace-0.7.3-no-error.h.patch 885 BLAKE2B a893550c62e4a479405f8dd3e4c41c01d0a027bee2ed6a25e104c407e7c4372cbb2b0774c6feb3e7691f3b8f1b194d0e2377d0e9244564c2edb6d143574952c1 SHA512 193fc57ef6df54c39a099db7991237dbd2bcb1454fd5b889074c54e005fc50175f5702e118b25a3c4d09bb2d1e03ce38734798ce0143cd3b7293383b93775e2d
+AUX ltrace-0.7.3-pid_t.patch 179 BLAKE2B 7782ab18e9ec8233ed4d60aed339175e1a30f6f3f589d8a7e9eeaa228918cfba6b00528790cf2908adc785c28231e208b96a7c76fd0daa914f9ce6bdb91b01ba SHA512 87e5f49c89dcdd3218547bcd57f0ae05253d4756abb4d4981d78501a6b1de2d5389987fd90d59fe41348a0ad2b56b62a8e087e9092533e12f2cdcd800abfa8db
 AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
 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 1728 BLAKE2B 1d12553b815b042f46da65d32ee9d31e6d475b28eecf607060830934739121fd7cfcfa7846c3f5ba1fcd4418125ee1c3f5bbaf4c7bc61e7595daf37b3c520286 SHA512 ba5e03642a85c89cf091d12b0c097c99e5c40892587d65fa4ad8390bb7828bfa9da4e61272075c4ea0ce2e910f2c40105d601074fd38f4d43af071434b3d1946
 EBUILD ltrace-0.7.3_p4.ebuild 1366 BLAKE2B b3f31392f8643006a79bd8007f97458fba5bbefbd7875c20364e95d9204a1b7af7c8dbb30e6a4d5fa138aa6c089fe6fd72bd0d16a631abe6e743e7c49c46397a SHA512 6d2b829a0694b8d59de72ace57391a0d1cb685c0d0f71806440055416ff80a1f5281e31d05531a2aa60ee96ed12d265f791a36de1c91dc1b7483eb32ff92c6b0
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
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 000000000000..7729449d0604
--- /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 000000000000..7fc8b60aa48a
--- /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 000000000000..6b798b274909
--- /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 000000000000..56aea7a54d4d
--- /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 000000000000..b54a5bf3a00c
--- /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 000000000000..8ca6b5a1233e
--- /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)
+}