update to 4.9, need to readd needed patches after testrun

9 files changed, 2 insertions, 202 deletions

diff --git a/package/strace/Makefile b/package/strace/Makefile
index 0ef98f08f..a36673e17 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -4,8 +4,8 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
-PKG_VERSION:=		4.8
-PKG_RELEASE:=		8
+PKG_VERSION:=		4.9
+PKG_RELEASE:=		1
 PKG_MD5SUM:=		c575ef43829586801f514fd91bfe7575
 PKG_DESCR:=		system call trace program
 PKG_SECTION:=		app/debug
diff --git a/package/strace/patches/patch-defs_h b/package/strace/patches/patch-defs_h
deleted file mode 100644
index 910715f7a..000000000
--- a/package/strace/patches/patch-defs_h
+++ /dev/null
@@ -1,33 +0,0 @@
---- strace-4.8.orig/defs.h	2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/defs.h	2014-02-26 17:36:34.000000000 +0100
-@@ -155,18 +155,18 @@ extern char *stpcpy(char *dst, const cha
-     || defined(METAG) \
-     || defined(TILE) \
-     || defined(XTENSA) \
--    ) && defined(__GLIBC__)
-+    ) && defined(__linux__)
- # include <sys/ptrace.h>
- #else
- /* Work around awkward prototype in ptrace.h. */
- # define ptrace xptrace
- # include <sys/ptrace.h>
- # undef ptrace
--# ifdef POWERPC
-+#if defined(POWERPC) && defined(__GLIBC__)
- #  define __KERNEL__
- #  include <asm/ptrace.h>
- #  undef __KERNEL__
--# endif
-+#endif
- extern long ptrace(int, int, char *, long);
- #endif
- 
-@@ -222,7 +222,7 @@ extern long ptrace(int, int, char *, lon
- # define PTRACE_EVENT_EXIT	6
- #endif
- 
--#if !defined(__GLIBC__)
-+#if !defined(__GLIBC__) && !defined(PTRACE_PEEKUSER)
- # define PTRACE_PEEKUSER PTRACE_PEEKUSR
- # define PTRACE_POKEUSER PTRACE_POKEUSR
- #endif
diff --git a/package/strace/patches/patch-desc_c b/package/strace/patches/patch-desc_c
deleted file mode 100644
index 63a01023e..000000000
--- a/package/strace/patches/patch-desc_c
+++ /dev/null
@@ -1,23 +0,0 @@
---- strace-4.8.orig/desc.c	2013-05-02 00:39:10.000000000 +0200
-+++ strace-4.8/desc.c	2014-03-01 19:44:21.000000000 +0100
-@@ -223,7 +223,7 @@ static const struct xlat perf_event_open
- 	{ 0,				NULL			},
- };
- 
--#if _LFS64_LARGEFILE
-+#if defined(_LFS64_LARGEFILE) && defined(__GLIBC__) || defined(__UCLIBC__)
- /* fcntl/lockf */
- static void
- printflock64(struct tcb *tcp, long addr, int getlk)
-@@ -255,7 +255,11 @@ printflock(struct tcb *tcp, long addr, i
- #if SUPPORTED_PERSONALITIES > 1
- # ifdef X32
- 	if (current_personality == 0) {
-+#if defined(__GLIBC__)
- 		printflock64(tcp, addr, getlk);
-+#else
-+		printflock(tcp, addr, getlk);
-+#endif
- 		return;
- 	}
- # endif
diff --git a/package/strace/patches/patch-net_c b/package/strace/patches/patch-net_c
deleted file mode 100644
index f579ea5fb..000000000
--- a/package/strace/patches/patch-net_c
+++ /dev/null
@@ -1,17 +0,0 @@
---- strace-4.8.orig/net.c	2013-05-18 00:20:02.000000000 +0200
-+++ strace-4.8/net.c	2014-02-25 16:06:44.000000000 +0100
-@@ -95,12 +95,14 @@
- #endif
- 
- /* Under Linux these are enums so we can't test for them with ifdef. */
-+#if !defined(IPPROTO_MAX)
- #define IPPROTO_EGP IPPROTO_EGP
- #define IPPROTO_PUP IPPROTO_PUP
- #define IPPROTO_IDP IPPROTO_IDP
- #define IPPROTO_IGMP IPPROTO_IGMP
- #define IPPROTO_RAW IPPROTO_RAW
- #define IPPROTO_MAX IPPROTO_MAX
-+#endif
- 
- static const struct xlat domains[] = {
- #ifdef PF_UNSPEC
diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c
deleted file mode 100644
index 1c9ba10e9..000000000
--- a/package/strace/patches/patch-process_c
+++ /dev/null
@@ -1,62 +0,0 @@
---- strace-4.8.orig/process.c	2013-05-18 00:22:19.000000000 +0200
-+++ strace-4.8/process.c	2014-03-07 11:15:51.318966166 +0100
-@@ -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
-@@ -104,6 +104,14 @@
- # include <asm/rse.h>
- #endif
- 
-+#ifdef __arm__
-+#include <asm/ptrace.h>
-+#endif
-+
-+#ifdef __microblaze__
-+#include <asm/ptrace.h>
-+#endif
-+
- #ifdef HAVE_PRCTL
- # include <sys/prctl.h>
- 
-@@ -2472,7 +2480,7 @@ const struct xlat struct_user_offsets[]
- #elif defined(TILE)
- 	/* nothing */
- #elif defined(MICROBLAZE)
--	{ sizeof(struct user),	"sizeof(struct user)"			},
-+	/* nothing */
- #elif defined(AVR32)
- 	{ uoff(u_tsize),	"offsetof(struct user, u_tsize)"	},
- 	{ uoff(u_dsize),	"offsetof(struct user, u_dsize)"	},
-@@ -2857,7 +2865,7 @@ sys_sched_setscheduler(struct tcb *tcp)
- 		if (umove(tcp, tcp->u_arg[2], &p) < 0)
- 			tprintf(", %#lx", tcp->u_arg[2]);
- 		else
--			tprintf(", { %d }", p.__sched_priority);
-+			tprintf(", { %d }", p.sched_priority);
- 	}
- 	return 0;
- }
-@@ -2872,7 +2880,7 @@ sys_sched_getparam(struct tcb *tcp)
- 		if (umove(tcp, tcp->u_arg[1], &p) < 0)
- 			tprintf("%#lx", tcp->u_arg[1]);
- 		else
--			tprintf("{ %d }", p.__sched_priority);
-+			tprintf("{ %d }", p.sched_priority);
- 	}
- 	return 0;
- }
-@@ -2885,7 +2893,7 @@ sys_sched_setparam(struct tcb *tcp)
- 		if (umove(tcp, tcp->u_arg[1], &p) < 0)
- 			tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
- 		else
--			tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority);
-+			tprintf("%d, { %d }", (int) tcp->u_arg[0], p.sched_priority);
- 	}
- 	return 0;
- }
diff --git a/package/strace/patches/patch-signal_c b/package/strace/patches/patch-signal_c
deleted file mode 100644
index d0f9dde00..000000000
--- a/package/strace/patches/patch-signal_c
+++ /dev/null
@@ -1,22 +0,0 @@
---- strace-4.8.orig/signal.c	2013-05-23 15:41:23.000000000 +0200
-+++ strace-4.8/signal.c	2014-02-26 17:40:43.000000000 +0100
-@@ -60,6 +60,10 @@
- # include <asm/ptrace_offsets.h>
- #endif
- 
-+#ifndef POWERPC
-+#include <asm/ptrace.h>
-+#endif
-+
- #if defined(SPARC) || defined(SPARC64) || defined(MIPS)
- typedef struct {
- 	struct pt_regs		si_regs;
-@@ -815,7 +819,7 @@ sys_sigreturn(struct tcb *tcp)
- {
- #if defined(ARM)
- 	if (entering(tcp)) {
--		struct sigcontext_struct sc;
-+		struct sigcontext sc;
- 		sigset_t sigm;
- 		if (umove(tcp, arm_regs.ARM_sp, &sc) < 0)
- 			return 0;
diff --git a/package/strace/patches/patch-syscall_c b/package/strace/patches/patch-syscall_c
deleted file mode 100644
index 2c47009e4..000000000
--- a/package/strace/patches/patch-syscall_c
+++ /dev/null
@@ -1,17 +0,0 @@
---- strace-4.8.orig/syscall.c	2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/syscall.c	2014-02-26 17:46:14.000000000 +0100
-@@ -72,12 +72,8 @@
- # include <elf.h>
- #endif
- 
--#if defined(AARCH64)
--# include <asm/ptrace.h>
--#endif
--
--#if defined(XTENSA)
--# include <asm/ptrace.h>
-+#ifndef POWERPC
-+#include <asm/ptrace.h>
- #endif
- 
- #ifndef ERESTARTSYS
diff --git a/package/strace/patches/patch-time_c b/package/strace/patches/patch-time_c
deleted file mode 100644
index 53a6cf76b..000000000
--- a/package/strace/patches/patch-time_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- strace-4.8.orig/time.c	2012-05-01 23:17:51.000000000 +0200
-+++ strace-4.8/time.c	2014-02-25 17:25:14.000000000 +0100
-@@ -774,7 +774,11 @@ printsigevent(struct tcb *tcp, long arg)
- 			/* _pad[0] is the _tid field which might not be
- 			   present in the userlevel definition of the
- 			   struct.  */
-+#if defined(__GLIBC__)
- 			tprintf("{%d}", sev._sigev_un._pad[0]);
-+#else
-+			tprintf("{%d}", (int) sev.__pad[0]);
-+#endif
- 		else if (sev.sigev_notify == SIGEV_THREAD)
- 			tprintf("{%p, %p}", sev.sigev_notify_function,
- 				sev.sigev_notify_attributes);
diff --git a/package/strace/patches/patch-util_c b/package/strace/patches/patch-util_c
deleted file mode 100644
index 34181a22f..000000000
--- a/package/strace/patches/patch-util_c
+++ /dev/null
@@ -1,12 +0,0 @@
---- strace-4.8.orig/util.c	2013-05-06 20:23:01.000000000 +0200
-+++ strace-4.8/util.c	2014-03-07 15:34:01.074036954 +0100
-@@ -55,7 +55,9 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+#if !defined(SH)
- # include <linux/ptrace.h>
-+#endif
- # undef ia64_fpreg
- # undef pt_all_user_regs
- #endif