diff options
Diffstat (limited to 'main/strace/strace-musl.patch')
| -rw-r--r-- | main/strace/strace-musl.patch | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/main/strace/strace-musl.patch b/main/strace/strace-musl.patch index e5a211a17d..48f2c58b18 100644 --- a/main/strace/strace-musl.patch +++ b/main/strace/strace-musl.patch @@ -1,6 +1,5 @@ -diff -ru strace-4.8.orig/defs.h strace-4.8/defs.h ---- strace-4.8.orig/defs.h 2013-05-14 14:10:42.000000000 +0000 -+++ strace-4.8/defs.h 2013-09-20 14:30:38.785856744 +0000 +--- strace-4.8.orig/defs.h ++++ strace-4.8/defs.h @@ -155,7 +155,7 @@ || defined(METAG) \ || defined(TILE) \ @@ -19,9 +18,8 @@ diff -ru strace-4.8.orig/defs.h strace-4.8/defs.h # define PTRACE_PEEKUSER PTRACE_PEEKUSR # define PTRACE_POKEUSER PTRACE_POKEUSR #endif -diff -ru strace-4.8.orig/desc.c strace-4.8/desc.c ---- strace-4.8.orig/desc.c 2013-05-01 22:39:10.000000000 +0000 -+++ strace-4.8/desc.c 2013-09-20 14:30:38.795856744 +0000 +--- strace-4.8.orig/desc.c ++++ strace-4.8/desc.c @@ -299,7 +299,7 @@ #ifdef X32 tprintf(", start=%lld, len=%lld", fl.l_start, fl.l_len); @@ -31,9 +29,8 @@ diff -ru strace-4.8.orig/desc.c strace-4.8/desc.c #endif if (getlk) tprintf(", pid=%lu}", (unsigned long) fl.l_pid); -diff -ru strace-4.8.orig/file.c strace-4.8/file.c ---- strace-4.8.orig/file.c 2013-05-06 18:23:01.000000000 +0000 -+++ strace-4.8/file.c 2013-09-20 14:30:38.795856744 +0000 +--- strace-4.8.orig/file.c ++++ strace-4.8/file.c @@ -632,7 +632,7 @@ return 0; } @@ -61,9 +58,8 @@ diff -ru strace-4.8.orig/file.c strace-4.8/file.c int sys_getdents64(struct tcb *tcp) { -diff -ru strace-4.8.orig/net.c strace-4.8/net.c ---- strace-4.8.orig/net.c 2013-05-17 22:20:02.000000000 +0000 -+++ strace-4.8/net.c 2013-09-20 14:30:38.805856744 +0000 +--- strace-4.8.orig/net.c ++++ strace-4.8/net.c @@ -95,12 +95,14 @@ #endif @@ -79,9 +75,17 @@ diff -ru strace-4.8.orig/net.c strace-4.8/net.c static const struct xlat domains[] = { #ifdef PF_UNSPEC -diff -ru strace-4.8.orig/process.c strace-4.8/process.c ---- strace-4.8.orig/process.c 2013-05-17 22:22:19.000000000 +0000 -+++ strace-4.8/process.c 2013-09-20 14:30:38.805856744 +0000 +--- strace-4.8.orig/process.c ++++ strace-4.8/process.c +@@ -55,7 +55,7 @@ + # endif + #endif + +-#ifdef HAVE_LINUX_PTRACE_H ++#if defined HAVE_LINUX_PTRACE_H && defined __GLIBC__ + # undef PTRACE_SYSCALL + # ifdef HAVE_STRUCT_IA64_FPREG + # define ia64_fpreg XXX_ia64_fpreg @@ -2857,7 +2857,7 @@ if (umove(tcp, tcp->u_arg[2], &p) < 0) tprintf(", %#lx", tcp->u_arg[2]); @@ -109,9 +113,8 @@ diff -ru strace-4.8.orig/process.c strace-4.8/process.c } return 0; } -diff -ru strace-4.8.orig/signal.c strace-4.8/signal.c ---- strace-4.8.orig/signal.c 2013-05-23 13:41:23.000000000 +0000 -+++ strace-4.8/signal.c 2013-09-20 14:30:38.815856744 +0000 +--- strace-4.8.orig/signal.c ++++ strace-4.8/signal.c @@ -59,6 +59,7 @@ #ifdef IA64 # include <asm/ptrace_offsets.h> @@ -120,9 +123,8 @@ diff -ru strace-4.8.orig/signal.c strace-4.8/signal.c #if defined(SPARC) || defined(SPARC64) || defined(MIPS) typedef struct { -diff -ru strace-4.8.orig/strace.c strace-4.8/strace.c ---- strace-4.8.orig/strace.c 2013-05-28 21:49:16.000000000 +0000 -+++ strace-4.8/strace.c 2013-09-20 14:30:38.815856744 +0000 +--- strace-4.8.orig/strace.c ++++ strace-4.8/strace.c @@ -506,7 +506,7 @@ perror_msg_and_die("dup2"); close(fds[0]); @@ -132,9 +134,8 @@ diff -ru strace-4.8.orig/strace.c strace-4.8/strace.c perror_msg_and_die("Can't execute '%s'", _PATH_BSHELL); } -diff -ru strace-4.8.orig/syscall.c strace-4.8/syscall.c ---- strace-4.8.orig/syscall.c 2013-05-14 14:10:42.000000000 +0000 -+++ strace-4.8/syscall.c 2013-09-20 14:30:38.825856744 +0000 +--- strace-4.8.orig/syscall.c ++++ strace-4.8/syscall.c @@ -72,13 +72,7 @@ # include <elf.h> #endif @@ -150,9 +151,8 @@ diff -ru strace-4.8.orig/syscall.c strace-4.8/syscall.c #ifndef ERESTARTSYS # define ERESTARTSYS 512 -diff -ru strace-4.8.orig/time.c strace-4.8/time.c ---- strace-4.8.orig/time.c 2012-05-01 21:17:51.000000000 +0000 -+++ strace-4.8/time.c 2013-09-20 14:32:49.165856719 +0000 +--- strace-4.8.orig/time.c ++++ strace-4.8/time.c @@ -774,7 +774,11 @@ /* _pad[0] is the _tid field which might not be present in the userlevel definition of the |