From: Max Filippov Date: Wed, 18 Jun 2014 16:21:59 +0000 (+0400) Subject: strace: add serial number to existing patch file names X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=94c5ae72034a86b109bb9c2a648b5f24fe295de2;p=buildroot.git strace: add serial number to existing patch file names Signed-off-by: Max Filippov Signed-off-by: Peter Korsgaard --- diff --git a/package/strace/strace-01-fix-disabled-largefile-syscalls.patch b/package/strace/strace-01-fix-disabled-largefile-syscalls.patch new file mode 100644 index 0000000000..2117a0e407 --- /dev/null +++ b/package/strace/strace-01-fix-disabled-largefile-syscalls.patch @@ -0,0 +1,21 @@ +--- a/syscall.c ++++ b/syscall.c +@@ -125,6 +125,18 @@ + #define NF SYSCALL_NEVER_FAILS + #define MA MAX_ARGS + ++#ifndef HAVE_STATFS64 ++/* ++ * Ugly hacks for systems that do not have LFS ++ */ ++ ++#define sys_truncate64 sys_truncate ++#define sys_ftruncate64 sys_ftruncate ++#define sys_getdents64 sys_getdents ++#define sys_statfs64 sys_statfs ++#define sys_fstatfs64 sys_fstatfs ++#endif ++ + const struct_sysent sysent0[] = { + #include "syscallent.h" + }; diff --git a/package/strace/strace-02-fix-ptrace_peeksiginfo_args.patch b/package/strace/strace-02-fix-ptrace_peeksiginfo_args.patch new file mode 100644 index 0000000000..13caddce7e --- /dev/null +++ b/package/strace/strace-02-fix-ptrace_peeksiginfo_args.patch @@ -0,0 +1,100 @@ +From 0b4060f61f1bb101b5d8d084714b7d2feacdb199 Mon Sep 17 00:00:00 2001 +From: Ali Polatel +Date: Tue, 24 Sep 2013 20:04:32 +0300 +Subject: [PATCH 01/29] Work around conflict between and + + +Since glibc-2.18~39 defines ptrace_peeksiginfo_args +which collides with . + +* configure.ac: Check for `struct ptrace_peeksiginfo_args' in +. +* process.c: Work around potential conflict between +and by redefining ptrace_peeksiginfo_args. +* signal.c: Likewise. +* syscall.c: Likewise. +* util.c: Likewise. + +Signed-off-by: Ali Polatel +--- + +diff --git a/configure.ac b/configure.ac +index f19e4f2..aa4923a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -257,7 +257,7 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr, + + AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include ]) + +-AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,, ++AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,, + [#include ]) + + AC_CHECK_TYPES([struct user_desc],,, [#include ]) +diff --git a/process.c b/process.c +index 1a2181b..59428a4 100644 +--- a/process.c ++++ b/process.c +@@ -63,7 +63,11 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args ++# endif + # include ++# undef ptrace_peeksiginfo_args + # undef ia64_fpreg + # undef pt_all_user_regs + #endif +diff --git a/signal.c b/signal.c +index 7fb9abf..3411ddd 100644 +--- a/signal.c ++++ b/signal.c +@@ -51,7 +51,11 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args ++# endif + # include ++# undef ptrace_peeksiginfo_args + # undef ia64_fpreg + # undef pt_all_user_regs + #endif +diff --git a/syscall.c b/syscall.c +index 83a95bd..3477dcd 100644 +--- a/syscall.c ++++ b/syscall.c +@@ -48,7 +48,11 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args ++# endif + # include ++# undef ptrace_peeksiginfo_args + # undef ia64_fpreg + # undef pt_all_user_regs + #endif +diff --git a/util.c b/util.c +index 0dab902..30a7f19 100644 +--- a/util.c ++++ b/util.c +@@ -55,7 +55,11 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args ++# endif + # include ++# undef ptrace_peeksiginfo_args + # undef ia64_fpreg + # undef pt_all_user_regs + #endif +-- +1.8.3.2 + diff --git a/package/strace/strace-03-update-configure.patch b/package/strace/strace-03-update-configure.patch new file mode 100644 index 0000000000..a5890b89b1 --- /dev/null +++ b/package/strace/strace-03-update-configure.patch @@ -0,0 +1,31 @@ +--- a/configure 2013-12-02 12:31:53.257634249 +1100 ++++ b/configure 2013-12-02 12:32:17.726085888 +1100 +@@ -6389,6 +6389,16 @@ + + + fi ++ac_fn_c_check_type "$LINENO" "struct ptrace_peeksiginfo_args" "ac_cv_type_struct_ptrace_peeksiginfo_args" "#include ++" ++if test "x$ac_cv_type_struct_ptrace_peeksiginfo_args" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS 1 ++_ACEOF ++ ++ ++fi + + + ac_fn_c_check_type "$LINENO" "struct user_desc" "ac_cv_type_struct_user_desc" "#include +--- a/config.h.in.orig 2013-12-02 12:44:56.795927681 +1100 ++++ b/config.h.in 2013-12-02 12:45:07.524122894 +1100 +@@ -253,6 +253,9 @@ + /* Define to 1 if `msg_control' is a member of `struct msghdr'. */ + #undef HAVE_STRUCT_MSGHDR_MSG_CONTROL + ++/* Define to 1 if the system has the type `struct ptrace_peeksiginfo_args'. */ ++#undef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS ++ + /* Define to 1 if the system has the type `struct pt_all_user_regs'. */ + #undef HAVE_STRUCT_PT_ALL_USER_REGS + diff --git a/package/strace/strace-fix-disabled-largefile-syscalls.patch b/package/strace/strace-fix-disabled-largefile-syscalls.patch deleted file mode 100644 index 2117a0e407..0000000000 --- a/package/strace/strace-fix-disabled-largefile-syscalls.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/syscall.c -+++ b/syscall.c -@@ -125,6 +125,18 @@ - #define NF SYSCALL_NEVER_FAILS - #define MA MAX_ARGS - -+#ifndef HAVE_STATFS64 -+/* -+ * Ugly hacks for systems that do not have LFS -+ */ -+ -+#define sys_truncate64 sys_truncate -+#define sys_ftruncate64 sys_ftruncate -+#define sys_getdents64 sys_getdents -+#define sys_statfs64 sys_statfs -+#define sys_fstatfs64 sys_fstatfs -+#endif -+ - const struct_sysent sysent0[] = { - #include "syscallent.h" - }; diff --git a/package/strace/strace-fix-ptrace_peeksiginfo_args.patch b/package/strace/strace-fix-ptrace_peeksiginfo_args.patch deleted file mode 100644 index 13caddce7e..0000000000 --- a/package/strace/strace-fix-ptrace_peeksiginfo_args.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 0b4060f61f1bb101b5d8d084714b7d2feacdb199 Mon Sep 17 00:00:00 2001 -From: Ali Polatel -Date: Tue, 24 Sep 2013 20:04:32 +0300 -Subject: [PATCH 01/29] Work around conflict between and - - -Since glibc-2.18~39 defines ptrace_peeksiginfo_args -which collides with . - -* configure.ac: Check for `struct ptrace_peeksiginfo_args' in -. -* process.c: Work around potential conflict between -and by redefining ptrace_peeksiginfo_args. -* signal.c: Likewise. -* syscall.c: Likewise. -* util.c: Likewise. - -Signed-off-by: Ali Polatel ---- - -diff --git a/configure.ac b/configure.ac -index f19e4f2..aa4923a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -257,7 +257,7 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr, - - AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include ]) - --AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,, -+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,, - [#include ]) - - AC_CHECK_TYPES([struct user_desc],,, [#include ]) -diff --git a/process.c b/process.c -index 1a2181b..59428a4 100644 ---- a/process.c -+++ b/process.c -@@ -63,7 +63,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/signal.c b/signal.c -index 7fb9abf..3411ddd 100644 ---- a/signal.c -+++ b/signal.c -@@ -51,7 +51,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/syscall.c b/syscall.c -index 83a95bd..3477dcd 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -48,7 +48,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/util.c b/util.c -index 0dab902..30a7f19 100644 ---- a/util.c -+++ b/util.c -@@ -55,7 +55,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif --- -1.8.3.2 - diff --git a/package/strace/strace-update-configure.patch b/package/strace/strace-update-configure.patch deleted file mode 100644 index a5890b89b1..0000000000 --- a/package/strace/strace-update-configure.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/configure 2013-12-02 12:31:53.257634249 +1100 -+++ b/configure 2013-12-02 12:32:17.726085888 +1100 -@@ -6389,6 +6389,16 @@ - - - fi -+ac_fn_c_check_type "$LINENO" "struct ptrace_peeksiginfo_args" "ac_cv_type_struct_ptrace_peeksiginfo_args" "#include -+" -+if test "x$ac_cv_type_struct_ptrace_peeksiginfo_args" = xyes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS 1 -+_ACEOF -+ -+ -+fi - - - ac_fn_c_check_type "$LINENO" "struct user_desc" "ac_cv_type_struct_user_desc" "#include ---- a/config.h.in.orig 2013-12-02 12:44:56.795927681 +1100 -+++ b/config.h.in 2013-12-02 12:45:07.524122894 +1100 -@@ -253,6 +253,9 @@ - /* Define to 1 if `msg_control' is a member of `struct msghdr'. */ - #undef HAVE_STRUCT_MSGHDR_MSG_CONTROL - -+/* Define to 1 if the system has the type `struct ptrace_peeksiginfo_args'. */ -+#undef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+ - /* Define to 1 if the system has the type `struct pt_all_user_regs'. */ - #undef HAVE_STRUCT_PT_ALL_USER_REGS -