public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/files/, dev-util/ltrace/
@ 2016-02-14 19:17 Sergei Trofimovich
  0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2016-02-14 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     23bef4ea9f0ce8d68abc92c19e2e1e1fdc170a68
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 19:15:57 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 19:16:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23bef4ea

dev-util/ltrace: fix tests, bug #421649

Reported by: Diego Elio Pettenò
Bug: https://bugs.gentoo.org/421649

Package-Manager: portage-2.2.27

 .../ltrace/files/ltrace-0.7.3-test-protos.patch    | 71 ++++++++++++++++++++++
 dev-util/ltrace/ltrace-0.7.3_p4.ebuild             |  1 +
 2 files changed, 72 insertions(+)

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
new file mode 100644
index 0000000..caafff4
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch
@@ -0,0 +1,71 @@
+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/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index 8611887..cb60e0e 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -30,6 +30,7 @@ S=${WORKDIR}/${PN}-${LTRACE_V}
 
 src_prepare() {
 	epatch "${WORKDIR}"/debian/patches/[0-9]*
+	epatch "${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	eautoreconf
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/files/, dev-util/ltrace/
@ 2016-06-27 21:43 Sergei Trofimovich
  0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2016-06-27 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     a2bc2463c651af12b93f4d46d6d4d890ec94ee45
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 21:40:19 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 21:42:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2bc2463

dev-util/ltrace: restore basic alpha support

Builds successfully on gcc-5.4.0 and can trace
calls to calls like 'gcc -v'.

Package-Manager: portage-2.3.0

 dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch | 14 ++++++++++++++
 dev-util/ltrace/ltrace-0.7.3_p4.ebuild                |  5 +++--
 2 files changed, 17 insertions(+), 2 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
new file mode 100644
index 0000000..659952b
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch
@@ -0,0 +1,14 @@
+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
+@@ -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
+@@ -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 5ee60c2..22394b2 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-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug selinux test unwind"
 
 RDEPEND="dev-libs/elfutils
@@ -32,6 +32,7 @@ S=${WORKDIR}/${PN}-${LTRACE_V}
 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
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	eautoreconf
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/files/, dev-util/ltrace/
@ 2019-03-18  9:18 Sergei Trofimovich
  0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2019-03-18  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     58a5c384e23090d3f0cf85370ce0409c4c387081
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 09:18:11 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 09:18:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58a5c384

dev-util/ltrace: fix build on ia64

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

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

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-ia64-pid_t.patch b/dev-util/ltrace/files/ltrace-0.7.3-ia64-pid_t.patch
new file mode 100644
index 00000000000..c466ce17e02
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-ia64-pid_t.patch
@@ -0,0 +1,6 @@
+--- a/sysdeps/linux-gnu/ia64/breakpoint.c
++++ b/sysdeps/linux-gnu/ia64/breakpoint.c
+@@ -26,2 +26,3 @@
+ #include <sys/ptrace.h>
++#include <sys/types.h> /* pid_t */
+ #include <string.h>

diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index fd5f6d7ae50..c17e3402f37 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 Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -34,6 +34,7 @@ src_prepare() {
 	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
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	eautoreconf
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/files/, dev-util/ltrace/
@ 2020-06-21 18:17 Sergei Trofimovich
  0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2020-06-21 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     6dc231526674a32456249629c524e45dc0da367b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 18:17:21 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 18:17:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc23152

dev-util/ltrace: use ${CXX} instead of c++ for tests

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-CXX-for-tests.patch | 11 +++++++++++
 dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild              |  1 +
 2 files changed, 12 insertions(+)

diff --git a/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch b/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch
new file mode 100644
index 00000000000..06db36c4681
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch
@@ -0,0 +1,11 @@
+Testsuite uses CXX to trace mangled symbols.
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,7 @@ AC_SUBST(HOST_CPU)
+ 
+ # Checks for programs.
+ AC_PROG_CC
++AC_PROG_CXX
+ LT_INIT
+ # libtool-2:  LT_INIT()
+ AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])

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 dce93623818..bf48fa668be 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
 	"${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
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/files/, dev-util/ltrace/
@ 2021-02-06 12:42 Sergei Trofimovich
  0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2021-02-06 12:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0b563bfef8aa47ff6b9985a75fdb69ca5adece15
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 12:42:23 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 12:42:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b563bfe

dev-util/ltrace: tweak syscall test for glibc-2.33

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

 dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch | 11 +++++++++++
 dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild                |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

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
new file mode 100644
index 00000000000..137d6271c06
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch
@@ -0,0 +1,11 @@
+--- 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_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/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
index bf48fa668be..8f9f97e7fb4 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,7 @@ PATCHES=(
 	"${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
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/files/, dev-util/ltrace/
@ 2023-03-30 22:09 Marek Szuba
  0 siblings, 0 replies; 7+ messages in thread
From: Marek Szuba @ 2023-03-30 22:09 UTC (permalink / raw
  To: gentoo-commits

commit:     22056ad8a098f01b7604f91022b448cead417a10
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 21:59:46 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 22:09:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22056ad8

dev-util/ltrace: add 0.7.91_pre20221216

First attempt to move away from Debian tarballs and towards the somewhat
revived upstream. Unfortunately upstream has yet to release any versions
newer than 0.7.3 so we have to use a git snapshot for that. The suffix
_pre, with the date being that of the chosen commit, has been added
because the version number 0.7.91 got set in the repository almost a
decade ago and it is unknown at this point whether upstream intends to
increment it before the next release or not, assuming they ever make
one.

Tests are still restricted because even though they do not fail as badly
as 0.7.3 ones, all the reasons for having restricted them in the first
place remain valid.

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

 dev-util/ltrace/Manifest                           |  1 +
 .../files/ltrace-0.7.91-debian-patchset-6.4.patch  | 77 ++++++++++++++++++++++
 dev-util/ltrace/files/ltrace-0.7.91-pid_t.patch    | 10 +++
 .../files/ltrace-0.7.91-test-glibc-2.33.patch      | 11 ++++
 .../ltrace/files/ltrace-0.7.91-tuple-tests.patch   | 11 ++++
 dev-util/ltrace/ltrace-0.7.91_pre20221216.ebuild   | 59 +++++++++++++++++
 6 files changed, 169 insertions(+)

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


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/files/, dev-util/ltrace/
@ 2023-08-14 10:16 Marek Szuba
  0 siblings, 0 replies; 7+ messages in thread
From: Marek Szuba @ 2023-08-14 10:16 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-08-14 10:16 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-14 10:16 [gentoo-commits] repo/gentoo:master commit in: dev-util/ltrace/files/, dev-util/ltrace/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2023-03-30 22:09 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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox