diff options
Diffstat (limited to 'dev-util/ltrace/files')
4 files changed, 109 insertions, 0 deletions
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 + |