Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 0 insertions, 119 deletions

diff --git a/package/strace/patches/patch-desc_c b/package/strace/patches/patch-desc_c
deleted file mode 100644
index 2702c7f5f..000000000
--- a/package/strace/patches/patch-desc_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- strace-4.8.orig/desc.c	2013-05-02 00:39:10.000000000 +0200
-+++ strace-4.8/desc.c	2013-08-14 08:55:36.000000000 +0200
-@@ -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)
diff --git a/package/strace/patches/patch-net_c b/package/strace/patches/patch-net_c
deleted file mode 100644
index a3c31d2ae..000000000
--- a/package/strace/patches/patch-net_c
+++ /dev/null
@@ -1,19 +0,0 @@
---- strace-4.8.orig/net.c	2013-05-18 00:20:02.000000000 +0200
-+++ strace-4.8/net.c	2013-08-14 08:46:21.000000000 +0200
-@@ -94,13 +94,15 @@
- # define PF_UNSPEC AF_UNSPEC
- #endif
- 
--/* Under Linux these are enums so we can't test for them with ifdef. */
-+/* Under Linux (glibc/uclibc) these are enums so we can't test for them with ifdef. */
-+#if defined(__GLIBC__) || defined(__UCLIBC__)
- #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 5f53983ba..000000000
--- a/package/strace/patches/patch-process_c
+++ /dev/null
@@ -1,29 +0,0 @@
---- strace-4.8.orig/process.c	2013-05-18 00:22:19.000000000 +0200
-+++ strace-4.8/process.c	2014-01-15 12:21:31.000000000 +0100
-@@ -2857,7 +2844,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 +2859,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 +2872,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 ec06ec5e2..000000000
--- a/package/strace/patches/patch-signal_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- strace-4.8.orig/signal.c	2013-05-23 15:41:23.000000000 +0200
-+++ strace-4.8/signal.c	2013-10-25 14:36:47.000000000 +0200
-@@ -815,7 +805,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 ec944e5b0..000000000
--- a/package/strace/patches/patch-syscall_c
+++ /dev/null
@@ -1,35 +0,0 @@
---- strace-4.8.orig/syscall.c	2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/syscall.c	2014-01-23 19:57:19.000000000 +0100
-@@ -40,17 +40,6 @@
- # ifndef PTRACE_PEEKUSR
- #  define PTRACE_PEEKUSR PTRACE_PEEKUSER
- # endif
--#elif defined(HAVE_LINUX_PTRACE_H)
--# undef PTRACE_SYSCALL
--# ifdef HAVE_STRUCT_IA64_FPREG
--#  define ia64_fpreg XXX_ia64_fpreg
--# endif
--# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
--#  define pt_all_user_regs XXX_pt_all_user_regs
--# endif
--# include <linux/ptrace.h>
--# undef ia64_fpreg
--# undef pt_all_user_regs
- #endif
- 
- #if defined(SPARC64)
-@@ -72,13 +61,7 @@
- # include <elf.h>
- #endif
- 
--#if defined(AARCH64)
--# include <asm/ptrace.h>
--#endif
--
--#if defined(XTENSA)
--# include <asm/ptrace.h>
--#endif
-+#include <asm/ptrace.h>
- 
- #ifndef ERESTARTSYS
- # define ERESTARTSYS	512
diff --git a/package/strace/patches/patch-time_c b/package/strace/patches/patch-time_c
deleted file mode 100644
index 746e00644..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	2013-08-14 08:52:00.000000000 +0200
-@@ -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__) || defined(__UCLIBC__)
- 			tprintf("{%d}", sev._sigev_un._pad[0]);
-+#else
-+			;
-+#endif
- 		else if (sev.sigev_notify == SIGEV_THREAD)
- 			tprintf("{%p, %p}", sev.sigev_notify_function,
- 				sev.sigev_notify_attributes);