diff options
Diffstat (limited to 'patches/strace')
29 files changed, 0 insertions, 1851 deletions
diff --git a/patches/strace/4.10/001_aarch64_rt_sigreturn.patch b/patches/strace/4.10/001_aarch64_rt_sigreturn.patch deleted file mode 100644 index 6b7bbe3..0000000 --- a/patches/strace/4.10/001_aarch64_rt_sigreturn.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit d76d3069526c348e6fe5d40bbbceb2ae4a928d16 -Author: Dmitry V. Levin <ldv@altlinux.org> -Date: Wed Mar 11 14:32:25 2015 +0000 - - aarch64: fix rt_sigreturn decoding - - * sigreturn.c (sys_sigreturn) [AARCH64]: Fix personality check. - -diff --git a/sigreturn.c b/sigreturn.c -index 648bd0a..c253a0c 100644 ---- a/sigreturn.c -+++ b/sigreturn.c -@@ -23,7 +23,7 @@ sys_sigreturn(struct tcb *tcp) - # define OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK (5 * 4 + SIZEOF_STRUCT_SIGCONTEXT) - const long addr = - # ifdef AARCH64 -- current_personality == 0 ? -+ current_personality == 1 ? - (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO + - offsetof(struct ucontext, uc_sigmask)) : - # endif diff --git a/patches/strace/4.10/002_arm_mmap2.patch b/patches/strace/4.10/002_arm_mmap2.patch deleted file mode 100644 index 41953e2..0000000 --- a/patches/strace/4.10/002_arm_mmap2.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit dbadf7bcc8995612d5ef737047b909e868387e37 -Author: Andreas Schwab <schwab@suse.de> -Date: Mon Mar 9 16:55:06 2015 +0100 - - Fix decoding of mmap2 for arm - - * syscallent.h (mmap2): Decode with sys_mmap_4koff, not - sys_mmap_pgoff. - -diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h -index 52aed9e..b66a5a2 100644 ---- a/linux/arm/syscallent.h -+++ b/linux/arm/syscallent.h -@@ -218,7 +218,7 @@ - [189] = { 5, 0, sys_putpmsg, "putpmsg" }, - [190] = { 0, TP, sys_vfork, "vfork" }, - [191] = { 2, 0, sys_getrlimit, "ugetrlimit" }, --[192] = { 6, TD|TM|SI, sys_mmap_pgoff, "mmap2" }, -+[192] = { 6, TD|TM|SI, sys_mmap_4koff, "mmap2" }, - [193] = { 4, TF, sys_truncate64, "truncate64" }, - [194] = { 4, TD, sys_ftruncate64, "ftruncate64" }, - [195] = { 2, TF, sys_stat64, "stat64" }, diff --git a/patches/strace/4.10/003_aarch64_arch_regs.patch b/patches/strace/4.10/003_aarch64_arch_regs.patch deleted file mode 100644 index e5153b5..0000000 --- a/patches/strace/4.10/003_aarch64_arch_regs.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 64fc9cedc475b2fc0d940509dc4232b02b5f83ec -Author: Andreas Schwab <schwab@suse.de> -Date: Thu Mar 12 11:54:08 2015 +0100 - - Distribute linux/aarch64/arch_regs.h - - * Makefile.am (EXTRA_DIST): Add linux/aarch64/arch_regs.h. - -diff --git a/Makefile.am b/Makefile.am -index 2030f9b..48fe1d7 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -164,6 +164,7 @@ EXTRA_DIST = \ - linux/32/syscallent.h \ - linux/64/ioctls_inc.h \ - linux/64/syscallent.h \ -+ linux/aarch64/arch_regs.h \ - linux/aarch64/errnoent1.h \ - linux/aarch64/ioctls_arch0.h \ - linux/aarch64/ioctls_arch1.h \ ---- a/linux/aarch64/arch_regs.h 2015-06-09 03:27:46.170000000 +0000 -+++ b/linux/aarch64/arch_regs.h 2015-07-01 21:23:17.025202308 +0000 -@@ -0,0 +1,2 @@ -+extern uint64_t *const aarch64_sp_ptr; -+extern uint32_t *const arm_sp_ptr; diff --git a/patches/strace/4.10/004_stat64-v.test.patch b/patches/strace/4.10/004_stat64-v.test.patch deleted file mode 100644 index 53383e3..0000000 --- a/patches/strace/4.10/004_stat64-v.test.patch +++ /dev/null @@ -1,87 +0,0 @@ -commit f79252f072a193bdff435afeaa6b6cd6d5c79947 -Author: Dmitry V. Levin <ldv@altlinux.org> -Date: Mon Mar 16 17:18:40 2015 +0000 - - stat64-v.test: add newfstatat syscall support - - Newer architectures have no stat syscall, so stat() is implemented there - using newfstatat syscall. - - * tests/stat.c (STAT_FNAME): Rename to STAT_PREFIX. Update callers. - [_FILE_OFFSET_BITS == 64] (STAT_PREFIX): Add newfstatat support. - (main) [!NR_stat]: Add newfstatat support. - - Reported-by: Andreas Schwab <schwab@suse.de> - -diff --git a/tests/stat.c b/tests/stat.c -index 21e37fb..2b04010 100644 ---- a/tests/stat.c -+++ b/tests/stat.c -@@ -14,22 +14,22 @@ - # include <sys/types.h> - #endif - --#undef STAT_FNAME -+#undef STAT_PREFIX - #undef NR_stat - - #if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64 - # include <sys/stat.h> --# define STAT_FNAME "stat(64)?" -+# define STAT_PREFIX "(stat(64)?\\(|newfstatat\\(AT_FDCWD, )" - #else - # include <sys/syscall.h> - # if defined __NR_stat - # define NR_stat __NR_stat --# define STAT_FNAME "stat" -+# define STAT_PREFIX "stat\\(" - # elif defined __NR_newstat - # define NR_stat __NR_newstat --# define STAT_FNAME "newstat" -+# define STAT_PREFIX "newstat\\(" - # endif --# ifdef STAT_FNAME -+# ifdef STAT_PREFIX - /* for S_IFMT */ - # define stat libc_stat - # define stat64 libc_stat64 -@@ -57,10 +57,10 @@ - # define off_t __kernel_off_t - # define loff_t __kernel_loff_t - # include <asm/stat.h> --# endif /* STAT_FNAME */ -+# endif /* STAT_PREFIX */ - #endif /* _FILE_OFFSET_BITS */ - --#ifdef STAT_FNAME -+#ifdef STAT_PREFIX - - static void - print_ftype(unsigned int mode) -@@ -115,7 +115,7 @@ main(int ac, const char **av) - assert(stat(av[1], &stb) == 0); - #endif - -- printf(STAT_FNAME "\\(\"%s\", \\{", av[1]); -+ printf(STAT_PREFIX "\"%s\", \\{", av[1]); - printf("st_dev=makedev\\(%u, %u\\)", - (unsigned int) major(stb.st_dev), - (unsigned int) minor(stb.st_dev)); -@@ -159,11 +159,15 @@ main(int ac, const char **av) - printf("(, st_flags=[0-9]+)?"); - printf("(, st_fstype=[^,]*)?"); - printf("(, st_gen=[0-9]+)?"); -- printf("\\}\\) += 0\n"); -+ printf("\\}"); -+#ifndef NR_stat -+ printf("(, 0)?"); -+#endif -+ printf("\\) += 0\n"); - return 0; - } - --#else /* !STAT_FNAME */ -+#else /* !STAT_PREFIX */ - int main(void) - { - return 77; diff --git a/patches/strace/4.10/005_select_test.patch b/patches/strace/4.10/005_select_test.patch deleted file mode 100644 index cb56ec6..0000000 --- a/patches/strace/4.10/005_select_test.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 95336102eb836ba69a2b51a3bbe733abd63bbe77 -Author: Andreas Schwab <schwab@suse.de> -Date: Thu Mar 12 16:47:38 2015 +0100 - - tests/select.test: handle architectures using pselect6 syscall - - * tests/select.awk (BEGIN): Update regexps to match both select - and pselect6 syscalls. - * tests/select.test: Probe for both select and pselect6 syscall. - -diff --git a/tests/select.awk b/tests/select.awk -index 142504a..688cefe 100644 ---- a/tests/select.awk -+++ b/tests/select.awk -@@ -1,7 +1,7 @@ - BEGIN { -- r[1] = "^select\\(2, \\[0 1\\], \\[0 1\\], \\[0 1\\], NULL\\) += 1 \\(\\)$" -- r[2] = "^select\\(-1, NULL, 0x[0-9a-f]+, NULL, NULL\\) += -1 " -- r[3] = "^select\\(1025, \\[0\\], \\[\\], NULL, \\{0, 100\\}\\) += 0 \\(Timeout\\)$" -+ r[1] = "^p?select6?\\(2, \\[0 1\\], \\[0 1\\], \\[0 1\\], NULL(, 0)?\\) += 1 \\(\\)$" -+ r[2] = "^p?select6?\\(-1, NULL, 0x[0-9a-f]+, NULL, NULL(, 0)?\\) += -1 " -+ r[3] = "^p?select6?\\(1025, \\[0\\], \\[\\], NULL, \\{0, 100(000)?\\}(, 0)?\\) += 0 \\(Timeout\\)$" - r[4] = "^\\+\\+\\+ exited with 0 \\+\\+\\+$" - lines = 4 - fail = 0 -diff --git a/tests/select.test b/tests/select.test -index bd3066b..5d5fe54 100755 ---- a/tests/select.test -+++ b/tests/select.test -@@ -6,13 +6,16 @@ - - check_prog awk - --$STRACE -eselect -h > /dev/null || -+syscall= -+$STRACE -epselect6 -h > /dev/null && syscall=$syscall,pselect6 -+$STRACE -eselect -h > /dev/null && syscall=$syscall,select -+test -n "$syscall" || - skip_ 'select syscall is not supported on this architecture' - - ./select || - framework_skip_ 'select syscall does not behave as expected' - --args='-eselect ./select' -+args="-e$syscall ./select" - $STRACE -o "$LOG" $args || { - cat "$LOG" - fail_ "$STRACE $args failed" diff --git a/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch b/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch deleted file mode 100644 index a270349..0000000 --- a/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit 0e3811d7914f209858cf4e445221fd65644cc94b -Author: Andreas Schwab <schwab@suse.de> -Date: Thu Mar 12 18:07:00 2015 +0100 - - aarch64: fix ioctl decoding - - * linux/aarch64/ioctls_inc0.h: Rename from ioctls_inc1.h. - * linux/aarch64/ioctls_inc1.h: Rename from ioctls_inc0.h. - * linux/aarch64/ioctls_arch0.h: Rename from ioctls_arch1.h. - * linux/aarch64/ioctls_arch1.h: Rename from ioctls_arch0.h. - -diff --git a/linux/aarch64/ioctls_arch0.h b/linux/aarch64/ioctls_arch0.h -index 6a674cc..b722d22 100644 ---- a/linux/aarch64/ioctls_arch0.h -+++ b/linux/aarch64/ioctls_arch0.h -@@ -1 +1 @@ --/* Generated by ioctls_gen.sh from definitions found in $linux/arch/arm64/include/ tree. */ -+#include "arm/ioctls_arch0.h" -diff --git a/linux/aarch64/ioctls_arch1.h b/linux/aarch64/ioctls_arch1.h -index b722d22..6a674cc 100644 ---- a/linux/aarch64/ioctls_arch1.h -+++ b/linux/aarch64/ioctls_arch1.h -@@ -1 +1 @@ --#include "arm/ioctls_arch0.h" -+/* Generated by ioctls_gen.sh from definitions found in $linux/arch/arm64/include/ tree. */ -diff --git a/linux/aarch64/ioctls_inc0.h b/linux/aarch64/ioctls_inc0.h -index f9939fa..46c11b1 100644 ---- a/linux/aarch64/ioctls_inc0.h -+++ b/linux/aarch64/ioctls_inc0.h -@@ -1 +1 @@ --#include "64/ioctls_inc.h" -+#include "arm/ioctls_inc0.h" -diff --git a/linux/aarch64/ioctls_inc1.h b/linux/aarch64/ioctls_inc1.h -index 46c11b1..f9939fa 100644 ---- a/linux/aarch64/ioctls_inc1.h -+++ b/linux/aarch64/ioctls_inc1.h -@@ -1 +1 @@ --#include "arm/ioctls_inc0.h" -+#include "64/ioctls_inc.h" diff --git a/patches/strace/4.10/007_fix_bexecve64_test.patch b/patches/strace/4.10/007_fix_bexecve64_test.patch deleted file mode 100644 index 6dc9b46..0000000 --- a/patches/strace/4.10/007_fix_bexecve64_test.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit b704e8fbb4d9cf90ac56f3c889de5b779c444db4 -(loosely based on) ---- a/tests/bexecve.test -+++ b/tests/bexecve.test -@@ -24,13 +24,14 @@ - } - - pattern='Process [1-9][0-9]* detached' -+pattern_personality='\[ Process PID=[1-9][0-9]* runs in .* mode. \]' - - LC_ALL=C grep -x "$pattern" "$LOG" > /dev/null || { - cat "$LOG" - fail_ "$what: unexpected output" - } - --if LC_ALL=C grep -v -x "$pattern" "$LOG" > /dev/null; then -+if LC_ALL=C grep -E -v -x "($pattern|$pattern_personality)" "$LOG" > /dev/null; then - cat "$LOG" - fail_ "$what: unexpected output" - fi diff --git a/patches/strace/4.10/008_decode_mips_indirect_syscall.patch b/patches/strace/4.10/008_decode_mips_indirect_syscall.patch deleted file mode 100644 index d2d7217..0000000 --- a/patches/strace/4.10/008_decode_mips_indirect_syscall.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit f34b97f89dd3893ef3652a6899487771402fc13c -Index: strace-4.10/linux/mips/syscallent-o32.h -=================================================================== ---- strace-4.10.orig/linux/mips/syscallent-o32.h -+++ strace-4.10/linux/mips/syscallent-o32.h -@@ -1,6 +1,6 @@ - #if defined LINUX_MIPSO32 - /* For an O32 strace, decode the o32 syscalls. */ --[4000] = { MA, 0, printargs, "syscall" }, /* start of Linux o32 */ -+[4000] = { MA, 0, sys_syscall, "syscall" }, /* start of Linux o32 */ - [4001] = { 1, TP|SE, sys_exit, "exit" }, - [4002] = { 0, TP, sys_fork, "fork" }, - [4003] = { 3, TD, sys_read, "read" }, -Index: strace-4.10/syscall.c -=================================================================== ---- strace-4.10.orig/syscall.c -+++ strace-4.10/syscall.c -@@ -606,6 +606,25 @@ decode_ipc_subcall(struct tcb *tcp) - } - #endif - -+#ifdef LINUX_MIPSO32 -+static void -+decode_mips_subcall(struct tcb *tcp) -+{ -+ if (!SCNO_IS_VALID(tcp->u_arg[0])) -+ return; -+ tcp->scno = tcp->u_arg[0]; -+ tcp->qual_flg = qual_flags[tcp->scno]; -+ tcp->s_ent = &sysent[tcp->scno]; -+ memmove(&tcp->u_arg[0], &tcp->u_arg[1], -+ sizeof(tcp->u_arg) - sizeof(tcp->u_arg[0])); -+} -+ -+int sys_syscall(struct tcb *tcp) -+{ -+ return printargs(tcp); -+} -+#endif -+ - int - printargs(struct tcb *tcp) - { -@@ -1774,6 +1793,11 @@ trace_syscall_entering(struct tcb *tcp) - goto ret; - } - -+#ifdef LINUX_MIPSO32 -+ if (sys_syscall == tcp->s_ent->sys_func) -+ decode_mips_subcall(tcp); -+#endif -+ - if ( sys_execve == tcp->s_ent->sys_func - # if defined(SPARC) || defined(SPARC64) - || sys_execv == tcp->s_ent->sys_func ---- strace-4.10.orig/linux/syscall.h 2015-02-06 01:23:05.000000000 +0000 -+++ strace-4.10/linux/syscall.h 2015-07-09 14:36:49.372494628 +0100 -@@ -277,6 +277,7 @@ - int sys_symlinkat(); - int sys_sync_file_range(); - int sys_sync_file_range2(); -+int sys_syscall(); - int sys_sysctl(); - int sys_sysinfo(); - int sys_syslog(); diff --git a/patches/strace/4.10/009-upstream-musl_includes.patch b/patches/strace/4.10/009-upstream-musl_includes.patch deleted file mode 100644 index c68f8d8..0000000 --- a/patches/strace/4.10/009-upstream-musl_includes.patch +++ /dev/null @@ -1,55 +0,0 @@ -commit 3460dc486d333231998de0f19918204aacee9ae3 -commit d34e00b293942b1012ddc49ed3ab379a32337611 ---- a/evdev.c -+++ b/evdev.c -@@ -28,6 +28,8 @@ - - #include "defs.h" - -+#include <linux/ioctl.h> -+ - #ifdef HAVE_LINUX_INPUT_H - #include <linux/input.h> - #include "xlat/evdev_abs.h" ---- a/ioctl.c -+++ b/ioctl.c -@@ -29,7 +29,7 @@ - */ - - #include "defs.h" --#include <asm/ioctl.h> -+#include <linux/ioctl.h> - #include "xlat/ioctl_dirs.h" - - #ifdef HAVE_LINUX_INPUT_H ---- a/ioctlsort.c -+++ b/ioctlsort.c -@@ -33,7 +33,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <asm/ioctl.h> -+#include <linux/ioctl.h> - - struct ioctlent { - const char *info; ---- a/mknod.c -+++ b/mknod.c -@@ -1,6 +1,7 @@ - #include "defs.h" - - #include <fcntl.h> -+#include <sys/stat.h> - - #ifdef MAJOR_IN_SYSMACROS - # include <sys/sysmacros.h> ---- a/printmode.c -+++ b/printmode.c -@@ -1,6 +1,7 @@ - #include "defs.h" - - #include <fcntl.h> -+#include <sys/stat.h> - - #include "xlat/modetypes.h" - diff --git a/patches/strace/4.10/010-use-host-ioctl.patch b/patches/strace/4.10/010-use-host-ioctl.patch deleted file mode 100644 index e9c34d3..0000000 --- a/patches/strace/4.10/010-use-host-ioctl.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff -urpN strace-4.10.orig/ioctl_iocdef.c strace-4.10/ioctl_iocdef.c ---- strace-4.10.orig/ioctl_iocdef.c 1969-12-31 16:00:00.000000000 -0800 -+++ strace-4.10/ioctl_iocdef.c 2017-01-14 15:05:49.505335680 -0800 -@@ -0,0 +1,43 @@ -+/* -+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result -+ * is included into ioctlsort (which is compiled for build). Since some -+ * of these values are used in structure initializers, they cannot be -+ * defined as 'const unsigned int' - instead, they have to be macros. -+ * Hence, the result of preprocessing will be run through sed to change -+ * 'DEFINE' into '#define' -+ */ -+#include <linux/ioctl.h> -+ -+DEFINE HOST_IOC_NONE _IOC_NONE -+DEFINE HOST_IOC_READ _IOC_READ -+DEFINE HOST_IOC_WRITE _IOC_WRITE -+ -+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT -+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT -diff -urpN strace-4.10.orig/ioctlsort.c strace-4.10/ioctlsort.c ---- strace-4.10.orig/ioctlsort.c 2015-02-15 18:35:58.000000000 -0800 -+++ strace-4.10/ioctlsort.c 2017-01-14 15:20:30.597371979 -0800 -@@ -33,7 +33,8 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <linux/ioctl.h> -+ -+#include "ioctl_iocdef.h" - - struct ioctlent { - const char *info; -diff -urpN strace-4.10.orig/Makefile.am strace-4.10/Makefile.am ---- strace-4.10.orig/Makefile.am 2015-03-05 18:19:01.000000000 -0800 -+++ strace-4.10/Makefile.am 2017-01-14 15:07:28.978244260 -0800 -@@ -159,6 +159,7 @@ EXTRA_DIST = \ - debian/strace64.manpages \ - debian/watch \ - errnoent.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/syscallent.h \ -@@ -416,15 +417,24 @@ ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFL - ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h) - ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h)) - BUILT_SOURCES += $(ioctlent_h) --CLEANFILES = $(ioctlent_h) -+CLEANFILES = $(ioctlent_h) ioctl_iocdef.h - - ioctlent%.h: ioctlsort% - ./$< > $@ - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h -diff -urpN strace-4.10.orig/Makefile.in strace-4.10/Makefile.in ---- strace-4.10.orig/Makefile.in 2015-03-06 07:16:46.000000000 -0800 -+++ strace-4.10/Makefile.in 2017-01-14 15:23:06.718794409 -0800 -@@ -687,6 +687,7 @@ EXTRA_DIST = \ - debian/strace64.manpages \ - debian/watch \ - errnoent.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/syscallent.h \ -@@ -921,7 +922,7 @@ ioctlsort_CFLAGS = $(AM_CFLAGS) $(CFLAGS - ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) - ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h) - ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h)) --CLEANFILES = $(ioctlent_h) -+CLEANFILES = $(ioctlent_h) ioctl_iocdef.h - @MAINTAINER_MODE_TRUE@gen_changelog_start_date = 2009-07-08 20:00 - all: $(BUILT_SOURCES) config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -3414,13 +3415,22 @@ news-check: NEWS - exit 1; \ - fi - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlent%.h: ioctlsort% - ./$< > $@ - - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h diff --git a/patches/strace/4.11/010-use-host-ioctl.patch b/patches/strace/4.11/010-use-host-ioctl.patch deleted file mode 100644 index 5155200..0000000 --- a/patches/strace/4.11/010-use-host-ioctl.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -urpN strace-4.11.orig/ioctl_iocdef.c strace-4.11/ioctl_iocdef.c ---- strace-4.11.orig/ioctl_iocdef.c 1969-12-31 16:00:00.000000000 -0800 -+++ strace-4.11/ioctl_iocdef.c 2017-01-14 15:31:16.925139193 -0800 -@@ -0,0 +1,43 @@ -+/* -+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result -+ * is included into ioctlsort (which is compiled for build). Since some -+ * of these values are used in structure initializers, they cannot be -+ * defined as 'const unsigned int' - instead, they have to be macros. -+ * Hence, the result of preprocessing will be run through sed to change -+ * 'DEFINE' into '#define' -+ */ -+#include <linux/ioctl.h> -+ -+DEFINE HOST_IOC_NONE _IOC_NONE -+DEFINE HOST_IOC_READ _IOC_READ -+DEFINE HOST_IOC_WRITE _IOC_WRITE -+ -+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT -+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT -diff -urpN strace-4.11.orig/ioctlsort.c strace-4.11/ioctlsort.c ---- strace-4.11.orig/ioctlsort.c 2015-03-28 15:37:30.000000000 -0700 -+++ strace-4.11/ioctlsort.c 2017-01-14 15:32:13.373831957 -0800 -@@ -33,7 +33,8 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <linux/ioctl.h> -+ -+#include "ioctl_iocdef.h" - - struct ioctlent { - const char *info; -diff -urpN strace-4.11.orig/Makefile.am strace-4.11/Makefile.am ---- strace-4.11.orig/Makefile.am 2015-12-17 09:56:48.000000000 -0800 -+++ strace-4.11/Makefile.am 2017-01-14 15:33:39.186837242 -0800 -@@ -239,6 +239,7 @@ EXTRA_DIST = \ - debian/watch \ - errnoent.sh \ - generate_sen.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/ioctls_inc_align32.h \ -@@ -666,17 +667,26 @@ ioctlent_h = $(patsubst $(srcdir)/$(OS)/ - ioctlent%.h: ioctlsort% - ./$< > $@ - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h - cat $^ > $@ - - BUILT_SOURCES = $(ioctlent_h) native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version --CLEANFILES = $(ioctlent_h) native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h -+CLEANFILES = $(ioctlent_h) ioctl_iocdef.h native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h - DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h - - # defines mpers_source_files -diff -urpN strace-4.11.orig/Makefile.in strace-4.11/Makefile.in ---- strace-4.11.orig/Makefile.in 2015-12-21 15:24:05.000000000 -0800 -+++ strace-4.11/Makefile.in 2017-01-14 15:34:34.803440359 -0800 -@@ -848,6 +848,7 @@ EXTRA_DIST = \ - debian/watch \ - errnoent.sh \ - generate_sen.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/ioctls_inc_align32.h \ -@@ -1243,7 +1244,7 @@ ioctlent_h = $(patsubst $(srcdir)/$(OS)/ - BUILT_SOURCES = $(ioctlent_h) native_printer_decls.h \ - native_printer_defs.h printers.h sen.h sys_func.h .version \ - $(am__append_7) $(am__append_11) --CLEANFILES = $(ioctlent_h) native_printer_decls.h \ -+CLEANFILES = $(ioctlent_h) ioctl_iocdef.h native_printer_decls.h \ - native_printer_defs.h printers.h sen.h sys_func.h \ - $(am__append_8) $(am__append_12) - DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h -@@ -4829,13 +4830,22 @@ news-check: NEWS - exit 1; \ - fi - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlent%.h: ioctlsort% - ./$< > $@ - - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h diff --git a/patches/strace/4.12/010-use-host-ioctl.patch b/patches/strace/4.12/010-use-host-ioctl.patch deleted file mode 100644 index bd5a40e..0000000 --- a/patches/strace/4.12/010-use-host-ioctl.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -urpN strace-4.12.orig/ioctl_iocdef.c strace-4.12/ioctl_iocdef.c ---- strace-4.12.orig/ioctl_iocdef.c 1969-12-31 16:00:00.000000000 -0800 -+++ strace-4.12/ioctl_iocdef.c 2017-01-14 15:35:21.055924401 -0800 -@@ -0,0 +1,43 @@ -+/* -+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result -+ * is included into ioctlsort (which is compiled for build). Since some -+ * of these values are used in structure initializers, they cannot be -+ * defined as 'const unsigned int' - instead, they have to be macros. -+ * Hence, the result of preprocessing will be run through sed to change -+ * 'DEFINE' into '#define' -+ */ -+#include <linux/ioctl.h> -+ -+DEFINE HOST_IOC_NONE _IOC_NONE -+DEFINE HOST_IOC_READ _IOC_READ -+DEFINE HOST_IOC_WRITE _IOC_WRITE -+ -+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT -+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT -diff -urpN strace-4.12.orig/ioctlsort.c strace-4.12/ioctlsort.c ---- strace-4.12.orig/ioctlsort.c 2015-03-28 15:37:30.000000000 -0700 -+++ strace-4.12/ioctlsort.c 2017-01-14 15:35:21.055924401 -0800 -@@ -33,7 +33,8 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <linux/ioctl.h> -+ -+#include "ioctl_iocdef.h" - - struct ioctlent { - const char *info; -diff -urpN strace-4.12.orig/Makefile.am strace-4.12/Makefile.am ---- strace-4.12.orig/Makefile.am 2016-05-28 03:29:30.000000000 -0700 -+++ strace-4.12/Makefile.am 2017-01-14 15:36:46.916796883 -0800 -@@ -274,6 +274,7 @@ EXTRA_DIST = \ - debian/watch \ - errnoent.sh \ - generate_sen.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/ioctls_inc_align32.h \ -@@ -712,10 +713,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h - ioctlent%.h: ioctlsort% - ./$< > $@ - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h -@@ -723,7 +733,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i - - BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version --CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \ -+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h - DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h - -diff -urpN strace-4.12.orig/Makefile.in strace-4.12/Makefile.in ---- strace-4.12.orig/Makefile.in 2016-05-31 04:35:57.000000000 -0700 -+++ strace-4.12/Makefile.in 2017-01-14 15:37:33.353259891 -0800 -@@ -952,6 +952,7 @@ EXTRA_DIST = \ - debian/watch \ - errnoent.sh \ - generate_sen.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/ioctls_inc_align32.h \ -@@ -1351,7 +1352,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede - BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \ - native_printer_defs.h printers.h sen.h sys_func.h .version \ - $(am__append_7) $(am__append_11) --CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \ -+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h \ - sys_func.h $(am__append_8) $(am__append_12) - DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h -@@ -5506,13 +5507,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h - rm -f $<-t - mv $@-t $@ - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlent%.h: ioctlsort% - ./$< > $@ - - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h diff --git a/patches/strace/4.13/010-use-host-ioctl.patch b/patches/strace/4.13/010-use-host-ioctl.patch deleted file mode 100644 index 40ebbf3..0000000 --- a/patches/strace/4.13/010-use-host-ioctl.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -urpN strace-4.13.orig/ioctl_iocdef.c strace-4.13/ioctl_iocdef.c ---- strace-4.13.orig/ioctl_iocdef.c 1969-12-31 16:00:00.000000000 -0800 -+++ strace-4.13/ioctl_iocdef.c 2017-01-14 15:50:14.368196376 -0800 -@@ -0,0 +1,43 @@ -+/* -+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result -+ * is included into ioctlsort (which is compiled for build). Since some -+ * of these values are used in structure initializers, they cannot be -+ * defined as 'const unsigned int' - instead, they have to be macros. -+ * Hence, the result of preprocessing will be run through sed to change -+ * 'DEFINE' into '#define' -+ */ -+#include <linux/ioctl.h> -+ -+DEFINE HOST_IOC_NONE _IOC_NONE -+DEFINE HOST_IOC_READ _IOC_READ -+DEFINE HOST_IOC_WRITE _IOC_WRITE -+ -+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT -+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT -diff -urpN strace-4.13.orig/ioctlsort.c strace-4.13/ioctlsort.c ---- strace-4.13.orig/ioctlsort.c 2015-03-28 15:37:30.000000000 -0700 -+++ strace-4.13/ioctlsort.c 2017-01-14 15:50:14.368196376 -0800 -@@ -33,7 +33,8 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <linux/ioctl.h> -+ -+#include "ioctl_iocdef.h" - - struct ioctlent { - const char *info; -diff -urpN strace-4.13.orig/Makefile.am strace-4.13/Makefile.am ---- strace-4.13.orig/Makefile.am 2016-07-22 12:28:06.000000000 -0700 -+++ strace-4.13/Makefile.am 2017-01-14 15:50:14.368196376 -0800 -@@ -283,6 +283,7 @@ EXTRA_DIST = \ - debian/watch \ - errnoent.sh \ - generate_sen.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/ioctls_inc_align32.h \ -@@ -721,10 +722,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h - ioctlent%.h: ioctlsort% - ./$< > $@ - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h -@@ -732,7 +742,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i - - BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version --CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \ -+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h - DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h - -diff -urpN strace-4.13.orig/Makefile.in strace-4.13/Makefile.in ---- strace-4.13.orig/Makefile.in 2016-07-26 09:17:18.000000000 -0700 -+++ strace-4.13/Makefile.in 2017-01-14 15:50:14.368196376 -0800 -@@ -978,6 +978,7 @@ EXTRA_DIST = \ - debian/watch \ - errnoent.sh \ - generate_sen.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/ioctls_inc_align32.h \ -@@ -1377,7 +1378,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede - BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \ - native_printer_defs.h printers.h sen.h sys_func.h .version \ - $(am__append_7) $(am__append_11) --CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \ -+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h \ - sys_func.h $(am__append_8) $(am__append_12) - DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h -@@ -5730,13 +5731,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h - rm -f $<-t - mv $@-t $@ - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlent%.h: ioctlsort% - ./$< > $@ - - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h diff --git a/patches/strace/4.14/010-use-host-ioctl.patch b/patches/strace/4.14/010-use-host-ioctl.patch deleted file mode 100644 index 2c7671f..0000000 --- a/patches/strace/4.14/010-use-host-ioctl.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -urpN strace-4.14.orig/ioctl_iocdef.c strace-4.14/ioctl_iocdef.c ---- strace-4.14.orig/ioctl_iocdef.c 1969-12-31 16:00:00.000000000 -0800 -+++ strace-4.14/ioctl_iocdef.c 2017-01-14 15:50:38.748425119 -0800 -@@ -0,0 +1,43 @@ -+/* -+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result -+ * is included into ioctlsort (which is compiled for build). Since some -+ * of these values are used in structure initializers, they cannot be -+ * defined as 'const unsigned int' - instead, they have to be macros. -+ * Hence, the result of preprocessing will be run through sed to change -+ * 'DEFINE' into '#define' -+ */ -+#include <linux/ioctl.h> -+ -+DEFINE HOST_IOC_NONE _IOC_NONE -+DEFINE HOST_IOC_READ _IOC_READ -+DEFINE HOST_IOC_WRITE _IOC_WRITE -+ -+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT -+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT -diff -urpN strace-4.14.orig/ioctlsort.c strace-4.14/ioctlsort.c ---- strace-4.14.orig/ioctlsort.c 2015-03-28 15:37:30.000000000 -0700 -+++ strace-4.14/ioctlsort.c 2017-01-14 15:50:38.748425119 -0800 -@@ -33,7 +33,8 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <linux/ioctl.h> -+ -+#include "ioctl_iocdef.h" - - struct ioctlent { - const char *info; -diff -urpN strace-4.14.orig/Makefile.am strace-4.14/Makefile.am ---- strace-4.14.orig/Makefile.am 2016-09-05 12:52:57.000000000 -0700 -+++ strace-4.14/Makefile.am 2017-01-14 15:50:38.748425119 -0800 -@@ -289,6 +289,7 @@ EXTRA_DIST = \ - debian/watch \ - errnoent.sh \ - generate_sen.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/ioctls_inc_align32.h \ -@@ -739,10 +740,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h - ioctlent%.h: ioctlsort% - ./$< > $@ - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h -@@ -750,7 +760,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i - - BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version --CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \ -+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h - DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h - -diff -urpN strace-4.14.orig/Makefile.in strace-4.14/Makefile.in ---- strace-4.14.orig/Makefile.in 2016-10-04 12:13:20.000000000 -0700 -+++ strace-4.14/Makefile.in 2017-01-14 15:50:38.752425155 -0800 -@@ -995,6 +995,7 @@ EXTRA_DIST = \ - debian/watch \ - errnoent.sh \ - generate_sen.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/ioctls_inc_align32.h \ -@@ -1406,7 +1407,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede - BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \ - native_printer_defs.h printers.h sen.h sys_func.h .version \ - $(am__append_7) $(am__append_11) --CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \ -+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h \ - sys_func.h $(am__append_8) $(am__append_12) - DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h -@@ -5896,13 +5897,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h - rm -f $<-t - mv $@-t $@ - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlent%.h: ioctlsort% - ./$< > $@ - - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h diff --git a/patches/strace/4.15/010-use-host-ioctl.patch b/patches/strace/4.15/010-use-host-ioctl.patch deleted file mode 100644 index 71d380a..0000000 --- a/patches/strace/4.15/010-use-host-ioctl.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -urpN strace-4.15.orig/ioctl_iocdef.c strace-4.15/ioctl_iocdef.c ---- strace-4.15.orig/ioctl_iocdef.c 1969-12-31 16:00:00.000000000 -0800 -+++ strace-4.15/ioctl_iocdef.c 2017-01-14 15:50:56.388590804 -0800 -@@ -0,0 +1,43 @@ -+/* -+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result -+ * is included into ioctlsort (which is compiled for build). Since some -+ * of these values are used in structure initializers, they cannot be -+ * defined as 'const unsigned int' - instead, they have to be macros. -+ * Hence, the result of preprocessing will be run through sed to change -+ * 'DEFINE' into '#define' -+ */ -+#include <linux/ioctl.h> -+ -+DEFINE HOST_IOC_NONE _IOC_NONE -+DEFINE HOST_IOC_READ _IOC_READ -+DEFINE HOST_IOC_WRITE _IOC_WRITE -+ -+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT -+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT -diff -urpN strace-4.15.orig/ioctlsort.c strace-4.15/ioctlsort.c ---- strace-4.15.orig/ioctlsort.c 2015-03-28 15:37:30.000000000 -0700 -+++ strace-4.15/ioctlsort.c 2017-01-14 15:50:56.388590804 -0800 -@@ -33,7 +33,8 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <linux/ioctl.h> -+ -+#include "ioctl_iocdef.h" - - struct ioctlent { - const char *info; -diff -urpN strace-4.15.orig/Makefile.am strace-4.15/Makefile.am ---- strace-4.15.orig/Makefile.am 2016-12-07 07:53:13.000000000 -0800 -+++ strace-4.15/Makefile.am 2017-01-14 15:50:56.392590842 -0800 -@@ -298,6 +298,7 @@ EXTRA_DIST = \ - debian/watch \ - errnoent.sh \ - generate_sen.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/ioctls_inc_align16.h \ -@@ -815,10 +816,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h - ioctlent%.h: ioctlsort% - ./$< > $@ - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h -@@ -826,7 +836,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i - - BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version --CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \ -+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h - DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h - -diff -urpN strace-4.15.orig/Makefile.in strace-4.15/Makefile.in ---- strace-4.15.orig/Makefile.in 2016-12-14 01:17:46.000000000 -0800 -+++ strace-4.15/Makefile.in 2017-01-14 15:50:56.392590842 -0800 -@@ -1036,6 +1036,7 @@ EXTRA_DIST = \ - debian/watch \ - errnoent.sh \ - generate_sen.sh \ -+ ioctl_iocdef.c \ - ioctlsort.c \ - linux/32/ioctls_inc.h \ - linux/32/ioctls_inc_align16.h \ -@@ -1514,7 +1515,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede - BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \ - native_printer_defs.h printers.h sen.h sys_func.h .version \ - $(am__append_7) $(am__append_11) --CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \ -+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \ - native_printer_decls.h native_printer_defs.h printers.h sen.h \ - sys_func.h $(am__append_8) $(am__append_12) - DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h -@@ -6177,13 +6178,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h - rm -f $<-t - mv $@-t $@ - -+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling -+# ioctlsort *for build*, hence this magic. -+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c -+ $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@ -+ -+ioctl_iocdef.h: ioctl_iocdef.i -+ sed -n 's/^DEFINE HOST/#define /p' $< > $@ -+ - ioctlent%.h: ioctlsort% - ./$< > $@ - - ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o - $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@ - --ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c -+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c - $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c - - ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h diff --git a/patches/strace/4.5.18/110-dont-use-REG_SYSCALL-for-sh.patch b/patches/strace/4.5.18/110-dont-use-REG_SYSCALL-for-sh.patch deleted file mode 100644 index ebbf69a..0000000 --- a/patches/strace/4.5.18/110-dont-use-REG_SYSCALL-for-sh.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -dur strace-4.5.16.orig/process.c strace-4.5.16/process.c ---- strace-4.5.16.orig/process.c 2007-01-11 23:08:38.000000000 +0100 -+++ strace-4.5.16/process.c 2007-07-14 19:19:58.000000000 +0200 -@@ -2685,7 +2685,6 @@ - { 4*REG_GBR, "4*REG_GBR" }, - { 4*REG_MACH, "4*REG_MACH" }, - { 4*REG_MACL, "4*REG_MACL" }, -- { 4*REG_SYSCALL, "4*REG_SYSCALL" }, - { 4*REG_FPUL, "4*REG_FPUL" }, - { 4*REG_FPREG0, "4*REG_FPREG0" }, - { 4*(REG_FPREG0+1), "4*REG_FPREG1" }, diff --git a/patches/strace/4.5.18/130-fix-disabled-largefile-syscalls.patch b/patches/strace/4.5.18/130-fix-disabled-largefile-syscalls.patch deleted file mode 100644 index 2f47dc9..0000000 --- a/patches/strace/4.5.18/130-fix-disabled-largefile-syscalls.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c ---- strace-4.5.16.orig/syscall.c 2007-07-14 19:21:44.000000000 +0200 -+++ strace-4.5.16/syscall.c 2007-07-14 19:22:49.000000000 +0200 -@@ -125,6 +125,18 @@ - #define TP TRACE_PROCESS - #define TS TRACE_SIGNAL - -+#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 -+ - static const struct sysent sysent0[] = { - #include "syscallent.h" - }; diff --git a/patches/strace/4.5.18/140-statfs64-check.patch b/patches/strace/4.5.18/140-statfs64-check.patch deleted file mode 100644 index 758966b..0000000 --- a/patches/strace/4.5.18/140-statfs64-check.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -dur strace-4.5.16.orig/acinclude.m4 strace-4.5.16/acinclude.m4 ---- strace-4.5.16.orig/acinclude.m4 2004-04-14 04:21:01.000000000 +0200 -+++ strace-4.5.16/acinclude.m4 2007-07-14 19:25:25.000000000 +0200 -@@ -210,6 +210,26 @@ - fi - ]) - -+dnl ### A macro to determine whether statfs64 is defined. -+AC_DEFUN([AC_STATFS64], -+[AC_MSG_CHECKING(for statfs64 in sys/(statfs|vfs).h) -+AC_CACHE_VAL(ac_cv_type_statfs64, -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX -+#include <linux/types.h> -+#include <sys/statfs.h> -+#else -+#include <sys/vfs.h> -+#endif]], [[struct statfs64 st;]])],[ac_cv_type_statfs64=yes],[ac_cv_type_statfs64=no])]) -+AC_MSG_RESULT($ac_cv_type_statfs64) -+if test "$ac_cv_type_statfs64" = yes -+then -+ AC_DEFINE([HAVE_STATFS64], 1, -+[Define if statfs64 is available in sys/statfs.h or sys/vfs.h.]) -+fi -+]) -+ -+ -+ - dnl ### A macro to determine if off_t is a long long - AC_DEFUN([AC_OFF_T_IS_LONG_LONG], - [AC_MSG_CHECKING(for long long off_t) -diff -dur strace-4.5.16.orig/configure.ac strace-4.5.16/configure.ac ---- strace-4.5.16.orig/configure.ac 2007-01-11 12:37:55.000000000 +0100 -+++ strace-4.5.16/configure.ac 2007-07-14 19:25:25.000000000 +0200 -@@ -169,6 +169,7 @@ - struct stat.st_level, - struct stat.st_rdev]) - AC_STAT64 -+AC_STATFS64 - - AC_TYPE_SIGNAL - AC_TYPE_UID_T -diff -dur strace-4.5.16.orig/file.c strace-4.5.16/file.c ---- strace-4.5.16.orig/file.c 2007-01-15 21:25:52.000000000 +0100 -+++ strace-4.5.16/file.c 2007-07-14 19:25:25.000000000 +0200 -@@ -1636,7 +1636,7 @@ - return 0; - } - --#ifdef LINUX -+#ifdef HAVE_STATFS64 - static void - printstatfs64(tcp, addr) - struct tcb *tcp; diff --git a/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch b/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch deleted file mode 100644 index e12b4e4..0000000 --- a/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch +++ /dev/null @@ -1,19 +0,0 @@ -Dmitry V. Levin [Tue, 3 Nov 2009 16:49:49 +0000] - -Fix check for linux/netlink.h on Linux 2.6.32-rc5+ - -* configure.ac (AC_CHECK_HEADERS): In check for linux/netlink.h, include - sys/socket.h instead of linux/socket.h beforehand. - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -197,7 +197,7 @@ AC_CHECK_HEADERS([ \ - ], [], []) - AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], - [], [], [#include <stddef.h> --#include <linux/socket.h>]) -+#include <sys/socket.h>]) - AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>]) - AC_CHECK_TYPES([struct sigcontext_struct],,, [#include <signal.h>]) - AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>]) diff --git a/patches/strace/4.5.18/160-undef-syscall.patch b/patches/strace/4.5.18/160-undef-syscall.patch deleted file mode 100644 index c7dcb07..0000000 --- a/patches/strace/4.5.18/160-undef-syscall.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -dur strace-4.5.16.orig/linux/syscallent.h strace-4.5.16/linux/syscallent.h ---- strace-4.5.16.orig/linux/syscallent.h 2006-10-16 03:17:52.000000000 +0200 -+++ strace-4.5.16/linux/syscallent.h 2007-07-14 19:30:16.000000000 +0200 -@@ -130,7 +130,11 @@ - { 2, TF, sys_statfs, "statfs" }, /* 99 */ - { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ - { 3, 0, sys_ioperm, "ioperm" }, /* 101 */ -- { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */ -+ { 2, TD, sys_socketcall, "socketcall" -+#ifdef __NR_socketcall -+ , SYS_socketcall -+#endif -+ }, /* 102 */ - { 3, 0, sys_syslog, "syslog" }, /* 103 */ - { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ - { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ -@@ -145,7 +149,11 @@ - { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */ - { 1, 0, sys_swapoff, "swapoff" }, /* 115 */ - { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ -- { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */ -+ { 6, 0, sys_ipc, "ipc" -+#ifdef __NR_ipc -+ , SYS_ipc -+#endif -+ }, /* 117 */ - { 1, TD, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ - { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */ -@@ -282,7 +290,11 @@ - { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */ - { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */ - { 5, 0, printargs, "SYS_251" }, /* 251 */ -- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */ -+ { 1, TP, sys_exit, "exit_group" -+#ifdef __NR_exit_group -+ , __NR_exit_group -+#endif -+ }, /* 252 */ - { 4, 0, printargs, "lookup_dcookie"}, /* 253 */ - { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */ - { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 255 */ diff --git a/patches/strace/4.5.18/170-no_cachectl.patch b/patches/strace/4.5.18/170-no_cachectl.patch deleted file mode 100644 index a8fab23..0000000 --- a/patches/strace/4.5.18/170-no_cachectl.patch +++ /dev/null @@ -1,35 +0,0 @@ -This patch is needed on newer uclibc becuase the uclibc header generation -mechanism generates the sysnum.h properly NR_cacheflush is defined for ARM -but there is no cachectl.h file which is exported to userspace. Strace -assumes that if SYS_cacheflush is defined than it icludes asm/cachectl.h -which breaks the build for ARM now. - -This patch adds a check for ARM architecture. - --Khem - -Here is error - -| if ccache arm-angstrom-linux-uclibcgnueabi-gcc -march=armv5te -mtune=arm926ej-s -DHAVE_CONFIG_H -I. -I. -I. -Ilinux/arm -I./linux/arm -Ilinux -I./linux -isystem/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/staging/arm-angstrom-linux-uclibcgnueabi/usr/include -Wall -isystem/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/staging/arm-angstrom-linux-uclibcgnueabi/usr/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -MT term.o -MD -MP -MF ".deps/term.Tpo" -c -o term.o term.c; \ -| then mv -f ".deps/term.Tpo" ".deps/term.Po"; else rm -f ".deps/term.Tpo"; exit 1; fi -| system.c:69:26: error: asm/cachectl.h: No such file or directory -| make[1]: *** [system.o] Error 1 -| make[1]: *** Waiting for unfinished jobs.... -| signal.c: In function 'sys_sigreturn': -| signal.c:1221: warning: passing argument 4 of 'ptrace' makes integer from pointer without a cast -| make[1]: Leaving directory `/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/work/armv5te-angstrom-linux-uclibcgnueabi/strace-4.5.14-r5/strace-4.5.14' -| make: *** [all] Error 2 -| FATAL: oe_runmake failed - -Index: strace-4.5.14/system.c -=================================================================== ---- strace-4.5.14.orig/system.c 2008-05-15 20:23:16.000000000 -0700 -+++ strace-4.5.14/system.c 2008-05-15 20:24:03.000000000 -0700 -@@ -65,7 +65,7 @@ - #include <linux/capability.h> - #endif - --#ifdef SYS_cacheflush -+#if defined SYS_cacheflush && !defined ARM - #include <asm/cachectl.h> - #endif diff --git a/patches/strace/4.5.18/180-arm-EABI-syscalls.patch b/patches/strace/4.5.18/180-arm-EABI-syscalls.patch deleted file mode 100644 index 1f28450..0000000 --- a/patches/strace/4.5.18/180-arm-EABI-syscalls.patch +++ /dev/null @@ -1,23 +0,0 @@ -Patch from upstream: -http://strace.cvs.sourceforge.net/viewvc/strace/strace/linux/arm/syscallent.h?r1=1.17&r2=1.18&sortby=file - -2008-11-13 Kirill A. Shutemov <kirill@shutemov.name> - - * linux/arm/syscallent.h: Fix build on ARM EABI which does not - provide syscalls socketcall and ipc. - ---- strace-4.5.18.orig/linux/arm/syscallent.h 2008/12/29 20:04:15 1.17 -+++ strace-4.5.18/linux/arm/syscallent.h 2009/01/01 23:20:38 1.18 -@@ -431,6 +431,7 @@ - { 5, 0, printargs, "SYS_398" }, /* 398 */ - { 5, 0, printargs, "SYS_399" }, /* 399 */ - -+#ifndef __ARM_EABI__ - #if SYS_socket_subcall != 400 - #error fix me - #endif -@@ -481,3 +482,4 @@ - { 4, TI, sys_shmdt, "shmdt" }, /* 440 */ - { 4, TI, sys_shmget, "shmget" }, /* 441 */ - { 4, TI, sys_shmctl, "shmctl" }, /* 442 */ -+#endif diff --git a/patches/strace/4.5.18/900-autoreconf.patch b/patches/strace/4.5.18/900-autoreconf.patch deleted file mode 100644 index cff775f..0000000 --- a/patches/strace/4.5.18/900-autoreconf.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -ruN strace-4.5.19.orig/config.h.in strace-4.5.19/config.h.in ---- strace-4.5.19.orig/config.h.in 2009-10-21 19:41:12.000000000 +0200 -+++ strace-4.5.19/config.h.in 2010-01-01 10:39:36.000000000 +0100 -@@ -143,6 +143,9 @@ - /* Define if stat64 is available in asm/stat.h. */ - #undef HAVE_STAT64 - -+/* Define if statfs64 is available in sys/statfs.h or sys/vfs.h. */ -+#undef HAVE_STATFS64 -+ - /* Define to 1 if stdbool.h conforms to C99. */ - #undef HAVE_STDBOOL_H - -diff -dur strace-4.5.16.orig/configure strace-4.5.16/configure ---- strace-4.5.16.orig/configure 2007-01-11 23:23:33.000000000 +0100 -+++ strace-4.5.16/configure 2007-07-14 19:18:43.000000000 +0200 -@@ -5994,6 +5994,73 @@ - - fi - -+echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5 -+echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6 -+if test "${ac_cv_type_statfs64+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef LINUX -+#include <linux/types.h> -+#include <sys/statfs.h> -+#else -+#include <sys/vfs.h> -+#endif -+int -+main () -+{ -+struct statfs64 st; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_type_statfs64=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_type_statfs64=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5 -+echo "${ECHO_T}$ac_cv_type_statfs64" >&6 -+if test "$ac_cv_type_statfs64" = yes -+then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_STATFS64 1 -+_ACEOF -+ -+fi -+ - - { echo "$as_me:$LINENO: checking return type of signal handlers" >&5 - echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } -@@ -7580,7 +7647,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <stddef.h> --#include <linux/socket.h> -+#include <sys/socket.h> - - #include <$ac_header> - _ACEOF diff --git a/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch b/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch deleted file mode 100644 index a555fc2..0000000 --- a/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -durN strace-4.5.19.orig/syscall.c strace-4.5.19/syscall.c ---- strace-4.5.19.orig/syscall.c 2009-10-28 18:47:18.000000000 +0100 -+++ strace-4.5.19/syscall.c 2009-10-28 18:47:18.000000000 +0100 -@@ -110,6 +110,18 @@ - #define TP TRACE_PROCESS - #define TS TRACE_SIGNAL - -+#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 -+ - static const struct sysent sysent0[] = { - #include "syscallent.h" - }; diff --git a/patches/strace/4.5.19/130-statfs64-check.patch b/patches/strace/4.5.19/130-statfs64-check.patch deleted file mode 100644 index 0959bdd..0000000 --- a/patches/strace/4.5.19/130-statfs64-check.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -durN strace-4.5.19.orig/acinclude.m4 strace-4.5.19/acinclude.m4 ---- strace-4.5.19.orig/acinclude.m4 2004-04-14 04:45:53.000000000 +0200 -+++ strace-4.5.19/acinclude.m4 2009-10-28 18:47:18.000000000 +0100 -@@ -210,6 +210,26 @@ - fi - ]) - -+dnl ### A macro to determine whether statfs64 is defined. -+AC_DEFUN([AC_STATFS64], -+[AC_MSG_CHECKING(for statfs64 in sys/(statfs|vfs).h) -+AC_CACHE_VAL(ac_cv_type_statfs64, -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX -+#include <linux/types.h> -+#include <sys/statfs.h> -+#else -+#include <sys/vfs.h> -+#endif]], [[struct statfs64 st;]])],[ac_cv_type_statfs64=yes],[ac_cv_type_statfs64=no])]) -+AC_MSG_RESULT($ac_cv_type_statfs64) -+if test "$ac_cv_type_statfs64" = yes -+then -+ AC_DEFINE([HAVE_STATFS64], 1, -+[Define if statfs64 is available in sys/statfs.h or sys/vfs.h.]) -+fi -+]) -+ -+ -+ - dnl ### A macro to determine if off_t is a long long - AC_DEFUN([AC_OFF_T_IS_LONG_LONG], - [AC_MSG_CHECKING(for long long off_t) -diff -durN strace-4.5.19.orig/configure.ac strace-4.5.19/configure.ac ---- strace-4.5.19.orig/configure.ac 2009-10-12 21:54:43.000000000 +0200 -+++ strace-4.5.19/configure.ac 2009-10-28 18:47:18.000000000 +0100 -@@ -187,6 +187,7 @@ - struct stat.st_level, - struct stat.st_rdev]) - AC_STAT64 -+AC_STATFS64 - - AC_TYPE_SIGNAL - AC_TYPE_UID_T -diff -durN strace-4.5.19.orig/file.c strace-4.5.19/file.c ---- strace-4.5.19.orig/file.c 2009-10-21 15:44:04.000000000 +0200 -+++ strace-4.5.19/file.c 2009-10-28 18:47:18.000000000 +0100 -@@ -1688,7 +1688,7 @@ - return 0; - } - --#ifdef LINUX -+#ifdef HAVE_STATFS64 - static void - printstatfs64(struct tcb *tcp, long addr) - { diff --git a/patches/strace/4.5.19/150-undef-syscall.patch b/patches/strace/4.5.19/150-undef-syscall.patch deleted file mode 100644 index 7d65e1d..0000000 --- a/patches/strace/4.5.19/150-undef-syscall.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -durN strace-4.5.19.orig/linux/syscallent.h strace-4.5.19/linux/syscallent.h ---- strace-4.5.19.orig/linux/syscallent.h 2009-09-01 21:53:29.000000000 +0200 -+++ strace-4.5.19/linux/syscallent.h 2009-10-28 18:47:18.000000000 +0100 -@@ -130,7 +130,11 @@ - { 2, TF, sys_statfs, "statfs" }, /* 99 */ - { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ - { 3, 0, sys_ioperm, "ioperm" }, /* 101 */ -- { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */ -+ { 2, TD, sys_socketcall, "socketcall" -+#ifdef __NR_socketcall -+ , SYS_socketcall -+#endif -+ }, /* 102 */ - { 3, 0, sys_syslog, "syslog" }, /* 103 */ - { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ - { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ -@@ -145,7 +149,11 @@ - { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */ - { 1, 0, sys_swapoff, "swapoff" }, /* 115 */ - { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ -- { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */ -+ { 6, 0, sys_ipc, "ipc" -+#ifdef __NR_ipc -+ , SYS_ipc -+#endif -+ }, /* 117 */ - { 1, TD, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ - { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */ -@@ -282,7 +290,11 @@ - { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */ - { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */ - { 5, 0, printargs, "SYS_251" }, /* 251 */ -- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */ -+ { 1, TP, sys_exit, "exit_group" -+#ifdef __NR_exit_group -+ , __NR_exit_group -+#endif -+ }, /* 252 */ - { 4, 0, printargs, "lookup_dcookie"}, /* 253 */ - { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */ - { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 255 */ diff --git a/patches/strace/4.5.19/160-fix-check-for-linux-netlink.patch b/patches/strace/4.5.19/160-fix-check-for-linux-netlink.patch deleted file mode 100644 index d8c6b2a..0000000 --- a/patches/strace/4.5.19/160-fix-check-for-linux-netlink.patch +++ /dev/null @@ -1,19 +0,0 @@ -Dmitry V. Levin [Tue, 3 Nov 2009 16:49:49 +0000] - -Fix check for linux/netlink.h on Linux 2.6.32-rc5+ - -* configure.ac (AC_CHECK_HEADERS): In check for linux/netlink.h, include - sys/socket.h instead of linux/socket.h beforehand. - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -258,7 +258,7 @@ AC_CHECK_HEADERS([ \ - ], [], []) - AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], - [], [], [#include <stddef.h> --#include <linux/socket.h>]) -+#include <sys/socket.h>]) - AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>]) - AC_CHECK_TYPES([struct sigcontext_struct, - struct sigcontext],,, [#include <signal.h>]) diff --git a/patches/strace/4.5.19/170-update-configure.patch b/patches/strace/4.5.19/170-update-configure.patch deleted file mode 100644 index 5d12276..0000000 --- a/patches/strace/4.5.19/170-update-configure.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -ruN strace-4.5.19.orig/config.h.in strace-4.5.19/config.h.in ---- strace-4.5.19.orig/config.h.in 2009-10-21 19:41:12.000000000 +0200 -+++ strace-4.5.19/config.h.in 2010-01-01 10:39:36.000000000 +0100 -@@ -161,6 +161,9 @@ - /* Define if stat64 is available in asm/stat.h. */ - #undef HAVE_STAT64 - -+/* Define if statfs64 is available in sys/statfs.h or sys/vfs.h. */ -+#undef HAVE_STATFS64 -+ - /* Define to 1 if stdbool.h conforms to C99. */ - #undef HAVE_STDBOOL_H - -diff -ruN strace-4.5.19.orig/configure strace-4.5.19/configure ---- strace-4.5.19.orig/configure 2010-01-01 10:38:49.000000000 +0100 -+++ strace-4.5.19/configure 2010-01-01 10:39:36.000000000 +0100 -@@ -5374,6 +5374,44 @@ - - fi - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs64 in sys/(statfs|vfs).h" >&5 -+$as_echo_n "checking for statfs64 in sys/(statfs|vfs).h... " >&6; } -+if test "${ac_cv_type_statfs64+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifdef LINUX -+#include <linux/types.h> -+#include <sys/statfs.h> -+#else -+#include <sys/vfs.h> -+#endif -+int -+main () -+{ -+struct statfs64 st; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_type_statfs64=yes -+else -+ ac_cv_type_statfs64=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_statfs64" >&5 -+$as_echo "$ac_cv_type_statfs64" >&6; } -+if test "$ac_cv_type_statfs64" = yes -+then -+ -+$as_echo "#define HAVE_STATFS64 1" >>confdefs.h -+ -+fi -+ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 - $as_echo_n "checking return type of signal handlers... " >&6; } -@@ -5880,7 +5851,7 @@ - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h> --#include <linux/socket.h> -+#include <sys/socket.h> - " - eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : -diff -ruN strace-4.5.19.orig/Makefile.in strace-4.5.19/Makefile.in ---- strace-4.5.19.orig/Makefile.in 2009-10-21 19:41:14.000000000 +0200 -+++ strace-4.5.19/Makefile.in 2010-01-01 10:39:36.000000000 +0100 -@@ -42,8 +42,9 @@ - subdir = . - DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -- $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS INSTALL \ -- NEWS TODO config.guess config.sub depcomp install-sh missing -+ $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \ -+ ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ -+ install-sh missing - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac diff --git a/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch b/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch deleted file mode 100644 index 49a71e1..0000000 --- a/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch +++ /dev/null @@ -1,78 +0,0 @@ -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> -Date: 2013-08-26 -Initial Package Version: 4.8 -Upstream Status: Unknown -Origin: Unknown -Description: Fixes compilation with glibc-2.18. -From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net. -http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm -Their changelog reports: - * Wed Aug 14 2013 schwab@suse.de - - strace-linux-ptrace-h.patch: handle conflict with struct - ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h> - - -Index: strace-4.8/process.c -=================================================================== ---- strace-4.8.orig/process.c -+++ strace-4.8/process.c -@@ -63,9 +63,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - # include <linux/ptrace.h> - # undef ia64_fpreg - # undef pt_all_user_regs -+# undef ptrace_peeksiginfo_args - #endif - - #if defined(SPARC64) -Index: strace-4.8/signal.c -=================================================================== ---- strace-4.8.orig/signal.c -+++ strace-4.8/signal.c -@@ -51,9 +51,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - # include <linux/ptrace.h> - # undef ia64_fpreg - # undef pt_all_user_regs -+# undef ptrace_peeksiginfo_args - #endif - - #ifdef IA64 -Index: strace-4.8/syscall.c -=================================================================== ---- strace-4.8.orig/syscall.c -+++ strace-4.8/syscall.c -@@ -48,9 +48,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - # include <linux/ptrace.h> - # undef ia64_fpreg - # undef pt_all_user_regs -+# undef ptrace_peeksiginfo_args - #endif - - #if defined(SPARC64) -Index: strace-4.8/util.c -=================================================================== ---- strace-4.8.orig/util.c -+++ strace-4.8/util.c -@@ -55,9 +55,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - # include <linux/ptrace.h> - # undef ia64_fpreg - # undef pt_all_user_regs -+# undef ptrace_peeksiginfo_args - #endif - - int |