summaryrefslogtreecommitdiff
path: root/packages/strace
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-12-02 20:44:39 (GMT)
committerAlexey Neyman <stilor@att.net>2017-12-02 20:44:39 (GMT)
commit98bc4decdeab1361bdc585c86591718fb08c8ffb (patch)
tree4e048ed57988306696efa3c5b81a80d48030e913 /packages/strace
parent2a1935f3ad41d360dd3d96a1b0486083293651dd (diff)
Run all patches through renumbering and update
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'packages/strace')
-rw-r--r--packages/strace/4.10/0000-aarch64_rt_sigreturn.patch (renamed from packages/strace/4.10/001_aarch64_rt_sigreturn.patch)8
-rw-r--r--packages/strace/4.10/0001-arm_mmap2.patch (renamed from packages/strace/4.10/002_arm_mmap2.patch)6
-rw-r--r--packages/strace/4.10/0002-aarch64_arch_regs.patch (renamed from packages/strace/4.10/003_aarch64_arch_regs.patch)13
-rw-r--r--packages/strace/4.10/0003-stat64-v.test.patch (renamed from packages/strace/4.10/004_stat64-v.test.patch)10
-rw-r--r--packages/strace/4.10/0004-select_test.patch (renamed from packages/strace/4.10/005_select_test.patch)9
-rw-r--r--packages/strace/4.10/0005-fix_aarch64_ioctl_decoding.patch (renamed from packages/strace/4.10/006_fix_aarch64_ioctl_decoding.patch)15
-rw-r--r--packages/strace/4.10/0006-fix_bexecve64_test.patch (renamed from packages/strace/4.10/007_fix_bexecve64_test.patch)4
-rw-r--r--packages/strace/4.10/0007-decode_mips_indirect_syscall.patch (renamed from packages/strace/4.10/008_decode_mips_indirect_syscall.patch)26
-rw-r--r--packages/strace/4.10/0008-upstream-musl_includes.patch (renamed from packages/strace/4.10/009-upstream-musl_includes.patch)8
-rw-r--r--packages/strace/4.10/0009-use-host-ioctl.patch (renamed from packages/strace/4.10/010-use-host-ioctl.patch)37
-rw-r--r--packages/strace/4.11/0000-use-host-ioctl.patch (renamed from packages/strace/4.11/010-use-host-ioctl.patch)37
-rw-r--r--packages/strace/4.12/0000-use-host-ioctl.patch (renamed from packages/strace/4.14/010-use-host-ioctl.patch)39
-rw-r--r--packages/strace/4.13/0000-use-host-ioctl.patch (renamed from packages/strace/4.12/010-use-host-ioctl.patch)39
-rw-r--r--packages/strace/4.14/0000-use-host-ioctl.patch (renamed from packages/strace/4.13/010-use-host-ioctl.patch)39
-rw-r--r--packages/strace/4.15/0000-use-host-ioctl.patch (renamed from packages/strace/4.15/010-use-host-ioctl.patch)39
-rw-r--r--packages/strace/4.19/0000-conflicting-decl.patch (renamed from packages/strace/4.19/100-conflicting-decl.patch)6
-rw-r--r--packages/strace/4.8/0000-strace-4.8-glibc_2.18_build_fix-1.patch (renamed from packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch)31
17 files changed, 204 insertions, 162 deletions
diff --git a/packages/strace/4.10/001_aarch64_rt_sigreturn.patch b/packages/strace/4.10/0000-aarch64_rt_sigreturn.patch
index 6b7bbe3..e99891d 100644
--- a/packages/strace/4.10/001_aarch64_rt_sigreturn.patch
+++ b/packages/strace/4.10/0000-aarch64_rt_sigreturn.patch
@@ -6,11 +6,13 @@ Date: Wed Mar 11 14:32:25 2015 +0000
* sigreturn.c (sys_sigreturn) [AARCH64]: Fix personality check.
-diff --git a/sigreturn.c b/sigreturn.c
-index 648bd0a..c253a0c 100644
+---
+ sigreturn.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/sigreturn.c
+++ b/sigreturn.c
-@@ -23,7 +23,7 @@ sys_sigreturn(struct tcb *tcp)
+@@ -23,7 +23,7 @@
# define OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK (5 * 4 + SIZEOF_STRUCT_SIGCONTEXT)
const long addr =
# ifdef AARCH64
diff --git a/packages/strace/4.10/002_arm_mmap2.patch b/packages/strace/4.10/0001-arm_mmap2.patch
index 41953e2..d244c0e 100644
--- a/packages/strace/4.10/002_arm_mmap2.patch
+++ b/packages/strace/4.10/0001-arm_mmap2.patch
@@ -7,8 +7,10 @@ Date: Mon Mar 9 16:55:06 2015 +0100
* 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
+---
+ linux/arm/syscallent.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/linux/arm/syscallent.h
+++ b/linux/arm/syscallent.h
@@ -218,7 +218,7 @@
diff --git a/packages/strace/4.10/003_aarch64_arch_regs.patch b/packages/strace/4.10/0002-aarch64_arch_regs.patch
index e5153b5..e4066d9 100644
--- a/packages/strace/4.10/003_aarch64_arch_regs.patch
+++ b/packages/strace/4.10/0002-aarch64_arch_regs.patch
@@ -6,11 +6,14 @@ Date: Thu Mar 12 11:54:08 2015 +0100
* Makefile.am (EXTRA_DIST): Add linux/aarch64/arch_regs.h.
-diff --git a/Makefile.am b/Makefile.am
-index 2030f9b..48fe1d7 100644
+---
+ Makefile.am | 1 +
+ linux/aarch64/arch_regs.h | 2 ++
+ 2 files changed, 3 insertions(+)
+
--- a/Makefile.am
+++ b/Makefile.am
-@@ -164,6 +164,7 @@ EXTRA_DIST = \
+@@ -164,6 +164,7 @@
linux/32/syscallent.h \
linux/64/ioctls_inc.h \
linux/64/syscallent.h \
@@ -18,8 +21,8 @@ index 2030f9b..48fe1d7 100644
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
+--- /dev/null
++++ b/linux/aarch64/arch_regs.h
@@ -0,0 +1,2 @@
+extern uint64_t *const aarch64_sp_ptr;
+extern uint32_t *const arm_sp_ptr;
diff --git a/packages/strace/4.10/004_stat64-v.test.patch b/packages/strace/4.10/0003-stat64-v.test.patch
index 53383e3..acb098b 100644
--- a/packages/strace/4.10/004_stat64-v.test.patch
+++ b/packages/strace/4.10/0003-stat64-v.test.patch
@@ -13,8 +13,10 @@ Date: Mon Mar 16 17:18:40 2015 +0000
Reported-by: Andreas Schwab <schwab@suse.de>
-diff --git a/tests/stat.c b/tests/stat.c
-index 21e37fb..2b04010 100644
+---
+ tests/stat.c | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
--- a/tests/stat.c
+++ b/tests/stat.c
@@ -14,22 +14,22 @@
@@ -58,7 +60,7 @@ index 21e37fb..2b04010 100644
static void
print_ftype(unsigned int mode)
-@@ -115,7 +115,7 @@ main(int ac, const char **av)
+@@ -115,7 +115,7 @@
assert(stat(av[1], &stb) == 0);
#endif
@@ -67,7 +69,7 @@ index 21e37fb..2b04010 100644
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)
+@@ -159,11 +159,15 @@
printf("(, st_flags=[0-9]+)?");
printf("(, st_fstype=[^,]*)?");
printf("(, st_gen=[0-9]+)?");
diff --git a/packages/strace/4.10/005_select_test.patch b/packages/strace/4.10/0004-select_test.patch
index cb56ec6..a778392 100644
--- a/packages/strace/4.10/005_select_test.patch
+++ b/packages/strace/4.10/0004-select_test.patch
@@ -8,8 +8,11 @@ Date: Thu Mar 12 16:47:38 2015 +0100
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
+---
+ tests/select.awk | 6 +++---
+ tests/select.test | 7 +++++--
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
--- a/tests/select.awk
+++ b/tests/select.awk
@@ -1,7 +1,7 @@
@@ -23,8 +26,6 @@ index 142504a..688cefe 100644
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 @@
diff --git a/packages/strace/4.10/006_fix_aarch64_ioctl_decoding.patch b/packages/strace/4.10/0005-fix_aarch64_ioctl_decoding.patch
index a270349..9f4c053 100644
--- a/packages/strace/4.10/006_fix_aarch64_ioctl_decoding.patch
+++ b/packages/strace/4.10/0005-fix_aarch64_ioctl_decoding.patch
@@ -9,29 +9,28 @@ Date: Thu Mar 12 18:07:00 2015 +0100
* 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
+---
+ linux/aarch64/ioctls_arch0.h | 2 +-
+ linux/aarch64/ioctls_arch1.h | 2 +-
+ linux/aarch64/ioctls_inc0.h | 2 +-
+ linux/aarch64/ioctls_inc1.h | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
--- 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 @@
diff --git a/packages/strace/4.10/007_fix_bexecve64_test.patch b/packages/strace/4.10/0006-fix_bexecve64_test.patch
index 6dc9b46..f5b255b 100644
--- a/packages/strace/4.10/007_fix_bexecve64_test.patch
+++ b/packages/strace/4.10/0006-fix_bexecve64_test.patch
@@ -1,5 +1,9 @@
commit b704e8fbb4d9cf90ac56f3c889de5b779c444db4
(loosely based on)
+---
+ tests/bexecve.test | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
--- a/tests/bexecve.test
+++ b/tests/bexecve.test
@@ -24,13 +24,14 @@
diff --git a/packages/strace/4.10/008_decode_mips_indirect_syscall.patch b/packages/strace/4.10/0007-decode_mips_indirect_syscall.patch
index d2d7217..8921dda 100644
--- a/packages/strace/4.10/008_decode_mips_indirect_syscall.patch
+++ b/packages/strace/4.10/0007-decode_mips_indirect_syscall.patch
@@ -1,8 +1,12 @@
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
+---
+ linux/mips/syscallent-o32.h | 2 +-
+ linux/syscall.h | 1 +
+ syscall.c | 24 ++++++++++++++++++++++++
+ 3 files changed, 26 insertions(+), 1 deletion(-)
+
+--- a/linux/mips/syscallent-o32.h
++++ b/linux/mips/syscallent-o32.h
@@ -1,6 +1,6 @@
#if defined LINUX_MIPSO32
/* For an O32 strace, decode the o32 syscalls. */
@@ -11,11 +15,9 @@ Index: strace-4.10/linux/mips/syscallent-o32.h
[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)
+--- a/syscall.c
++++ b/syscall.c
+@@ -606,6 +606,25 @@
}
#endif
@@ -41,7 +43,7 @@ Index: strace-4.10/syscall.c
int
printargs(struct tcb *tcp)
{
-@@ -1774,6 +1793,11 @@ trace_syscall_entering(struct tcb *tcp)
+@@ -1774,6 +1793,11 @@
goto ret;
}
@@ -53,8 +55,8 @@ Index: strace-4.10/syscall.c
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
+--- a/linux/syscall.h
++++ b/linux/syscall.h
@@ -277,6 +277,7 @@
int sys_symlinkat();
int sys_sync_file_range();
diff --git a/packages/strace/4.10/009-upstream-musl_includes.patch b/packages/strace/4.10/0008-upstream-musl_includes.patch
index c68f8d8..87717ca 100644
--- a/packages/strace/4.10/009-upstream-musl_includes.patch
+++ b/packages/strace/4.10/0008-upstream-musl_includes.patch
@@ -1,5 +1,13 @@
commit 3460dc486d333231998de0f19918204aacee9ae3
commit d34e00b293942b1012ddc49ed3ab379a32337611
+---
+ evdev.c | 2 ++
+ ioctl.c | 2 +-
+ ioctlsort.c | 2 +-
+ mknod.c | 1 +
+ printmode.c | 1 +
+ 5 files changed, 6 insertions(+), 2 deletions(-)
+
--- a/evdev.c
+++ b/evdev.c
@@ -28,6 +28,8 @@
diff --git a/packages/strace/4.10/010-use-host-ioctl.patch b/packages/strace/4.10/0009-use-host-ioctl.patch
index e9c34d3..857c7c0 100644
--- a/packages/strace/4.10/010-use-host-ioctl.patch
+++ b/packages/strace/4.10/0009-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-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
+---
+ Makefile.am | 14 ++++++++++++--
+ Makefile.in | 14 ++++++++++++--
+ ioctl_iocdef.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c | 3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.10.orig/ioctl_iocdef.c strace-4.10/ioctl_iocdef.c
+
+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
+--- a/ioctlsort.c
++++ b/ioctlsort.c
@@ -33,7 +33,8 @@
#include <stdio.h>
#include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.10.orig/ioctlsort.c strace-4.10/ioctlsort.c
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 = \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -159,6 +159,7 @@
debian/strace64.manpages \
debian/watch \
errnoent.sh \
@@ -69,7 +73,7 @@ diff -urpN strace-4.10.orig/Makefile.am strace-4.10/Makefile.am
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/syscallent.h \
-@@ -416,15 +417,24 @@ ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFL
+@@ -417,15 +418,24 @@
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)
@@ -96,10 +100,9 @@ diff -urpN strace-4.10.orig/Makefile.am strace-4.10/Makefile.am
$(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 = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -687,6 +687,7 @@
debian/strace64.manpages \
debian/watch \
errnoent.sh \
@@ -107,7 +110,7 @@ diff -urpN strace-4.10.orig/Makefile.in strace-4.10/Makefile.in
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/syscallent.h \
-@@ -921,7 +922,7 @@ ioctlsort_CFLAGS = $(AM_CFLAGS) $(CFLAGS
+@@ -921,7 +922,7 @@
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))
@@ -116,7 +119,7 @@ diff -urpN strace-4.10.orig/Makefile.in strace-4.10/Makefile.in
@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
+@@ -3414,13 +3415,22 @@
exit 1; \
fi
diff --git a/packages/strace/4.11/010-use-host-ioctl.patch b/packages/strace/4.11/0000-use-host-ioctl.patch
index 5155200..99f8c4c 100644
--- a/packages/strace/4.11/010-use-host-ioctl.patch
+++ b/packages/strace/4.11/0000-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-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
+---
+ Makefile.am | 14 ++++++++++++--
+ Makefile.in | 14 ++++++++++++--
+ ioctl_iocdef.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c | 3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.11.orig/ioctl_iocdef.c strace-4.11/ioctl_iocdef.c
+
+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
+--- a/ioctlsort.c
++++ b/ioctlsort.c
@@ -33,7 +33,8 @@
#include <stdio.h>
#include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.11.orig/ioctlsort.c strace-4.11/ioctlsort.c
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 = \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -239,6 +239,7 @@
debian/watch \
errnoent.sh \
generate_sen.sh \
@@ -69,7 +73,7 @@ diff -urpN strace-4.11.orig/Makefile.am strace-4.11/Makefile.am
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/ioctls_inc_align32.h \
-@@ -666,17 +667,26 @@ ioctlent_h = $(patsubst $(srcdir)/$(OS)/
+@@ -666,17 +667,26 @@
ioctlent%.h: ioctlsort%
./$< > $@
@@ -98,10 +102,9 @@ diff -urpN strace-4.11.orig/Makefile.am strace-4.11/Makefile.am
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 = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -848,6 +848,7 @@
debian/watch \
errnoent.sh \
generate_sen.sh \
@@ -109,7 +112,7 @@ diff -urpN strace-4.11.orig/Makefile.in strace-4.11/Makefile.in
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/ioctls_inc_align32.h \
-@@ -1243,7 +1244,7 @@ ioctlent_h = $(patsubst $(srcdir)/$(OS)/
+@@ -1243,7 +1244,7 @@
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)
@@ -118,7 +121,7 @@ diff -urpN strace-4.11.orig/Makefile.in strace-4.11/Makefile.in
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
+@@ -4829,13 +4830,22 @@
exit 1; \
fi
diff --git a/packages/strace/4.14/010-use-host-ioctl.patch b/packages/strace/4.12/0000-use-host-ioctl.patch
index 2c7671f..932ccda 100644
--- a/packages/strace/4.14/010-use-host-ioctl.patch
+++ b/packages/strace/4.12/0000-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-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
+---
+ Makefile.am | 14 ++++++++++++--
+ Makefile.in | 14 ++++++++++++--
+ ioctl_iocdef.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c | 3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.14.orig/ioctl_iocdef.c strace-4.14/ioctl_iocdef.c
+
+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
+--- a/ioctlsort.c
++++ b/ioctlsort.c
@@ -33,7 +33,8 @@
#include <stdio.h>
#include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.14.orig/ioctlsort.c strace-4.14/ioctlsort.c
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 = \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -274,6 +274,7 @@
debian/watch \
errnoent.sh \
generate_sen.sh \
@@ -69,7 +73,7 @@ diff -urpN strace-4.14.orig/Makefile.am strace-4.14/Makefile.am
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/ioctls_inc_align32.h \
-@@ -739,10 +740,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -712,10 +713,19 @@
ioctlent%.h: ioctlsort%
./$< > $@
@@ -90,7 +94,7 @@ diff -urpN strace-4.14.orig/Makefile.am strace-4.14/Makefile.am
$(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
+@@ -723,7 +733,7 @@
BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
@@ -99,10 +103,9 @@ diff -urpN strace-4.14.orig/Makefile.am strace-4.14/Makefile.am
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 = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -952,6 +952,7 @@
debian/watch \
errnoent.sh \
generate_sen.sh \
@@ -110,7 +113,7 @@ diff -urpN strace-4.14.orig/Makefile.in strace-4.14/Makefile.in
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/ioctls_inc_align32.h \
-@@ -1406,7 +1407,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+@@ -1351,7 +1352,7 @@
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)
@@ -119,7 +122,7 @@ diff -urpN strace-4.14.orig/Makefile.in strace-4.14/Makefile.in
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
+@@ -5506,13 +5507,22 @@
rm -f $<-t
mv $@-t $@
diff --git a/packages/strace/4.12/010-use-host-ioctl.patch b/packages/strace/4.13/0000-use-host-ioctl.patch
index bd5a40e..ee59695 100644
--- a/packages/strace/4.12/010-use-host-ioctl.patch
+++ b/packages/strace/4.13/0000-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-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
+---
+ Makefile.am | 14 ++++++++++++--
+ Makefile.in | 14 ++++++++++++--
+ ioctl_iocdef.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c | 3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.12.orig/ioctl_iocdef.c strace-4.12/ioctl_iocdef.c
+
+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
+--- a/ioctlsort.c
++++ b/ioctlsort.c
@@ -33,7 +33,8 @@
#include <stdio.h>
#include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.12.orig/ioctlsort.c strace-4.12/ioctlsort.c
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 = \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -283,6 +283,7 @@
debian/watch \
errnoent.sh \
generate_sen.sh \
@@ -69,7 +73,7 @@ diff -urpN strace-4.12.orig/Makefile.am strace-4.12/Makefile.am
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/ioctls_inc_align32.h \
-@@ -712,10 +713,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -721,10 +722,19 @@
ioctlent%.h: ioctlsort%
./$< > $@
@@ -90,7 +94,7 @@ diff -urpN strace-4.12.orig/Makefile.am strace-4.12/Makefile.am
$(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
+@@ -732,7 +742,7 @@
BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
@@ -99,10 +103,9 @@ diff -urpN strace-4.12.orig/Makefile.am strace-4.12/Makefile.am
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 = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -978,6 +978,7 @@
debian/watch \
errnoent.sh \
generate_sen.sh \
@@ -110,7 +113,7 @@ diff -urpN strace-4.12.orig/Makefile.in strace-4.12/Makefile.in
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/ioctls_inc_align32.h \
-@@ -1351,7 +1352,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+@@ -1377,7 +1378,7 @@
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)
@@ -119,7 +122,7 @@ diff -urpN strace-4.12.orig/Makefile.in strace-4.12/Makefile.in
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
+@@ -5730,13 +5731,22 @@
rm -f $<-t
mv $@-t $@
diff --git a/packages/strace/4.13/010-use-host-ioctl.patch b/packages/strace/4.14/0000-use-host-ioctl.patch
index 40ebbf3..5e90362 100644
--- a/packages/strace/4.13/010-use-host-ioctl.patch
+++ b/packages/strace/4.14/0000-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-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
+---
+ Makefile.am | 14 ++++++++++++--
+ Makefile.in | 14 ++++++++++++--
+ ioctl_iocdef.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c | 3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.13.orig/ioctl_iocdef.c strace-4.13/ioctl_iocdef.c
+
+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
+--- a/ioctlsort.c
++++ b/ioctlsort.c
@@ -33,7 +33,8 @@
#include <stdio.h>
#include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.13.orig/ioctlsort.c strace-4.13/ioctlsort.c
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 = \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -289,6 +289,7 @@
debian/watch \
errnoent.sh \
generate_sen.sh \
@@ -69,7 +73,7 @@ diff -urpN strace-4.13.orig/Makefile.am strace-4.13/Makefile.am
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/ioctls_inc_align32.h \
-@@ -721,10 +722,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -739,10 +740,19 @@
ioctlent%.h: ioctlsort%
./$< > $@
@@ -90,7 +94,7 @@ diff -urpN strace-4.13.orig/Makefile.am strace-4.13/Makefile.am
$(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
+@@ -750,7 +760,7 @@
BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
@@ -99,10 +103,9 @@ diff -urpN strace-4.13.orig/Makefile.am strace-4.13/Makefile.am
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 = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -995,6 +995,7 @@
debian/watch \
errnoent.sh \
generate_sen.sh \
@@ -110,7 +113,7 @@ diff -urpN strace-4.13.orig/Makefile.in strace-4.13/Makefile.in
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/ioctls_inc_align32.h \
-@@ -1377,7 +1378,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+@@ -1406,7 +1407,7 @@
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)
@@ -119,7 +122,7 @@ diff -urpN strace-4.13.orig/Makefile.in strace-4.13/Makefile.in
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
+@@ -5896,13 +5897,22 @@
rm -f $<-t
mv $@-t $@
diff --git a/packages/strace/4.15/010-use-host-ioctl.patch b/packages/strace/4.15/0000-use-host-ioctl.patch
index 71d380a..74e8c52 100644
--- a/packages/strace/4.15/010-use-host-ioctl.patch
+++ b/packages/strace/4.15/0000-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-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
+---
+ Makefile.am | 14 ++++++++++++--
+ Makefile.in | 14 ++++++++++++--
+ ioctl_iocdef.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c | 3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.15.orig/ioctl_iocdef.c strace-4.15/ioctl_iocdef.c
+
+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
+--- a/ioctlsort.c
++++ b/ioctlsort.c
@@ -33,7 +33,8 @@
#include <stdio.h>
#include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.15.orig/ioctlsort.c strace-4.15/ioctlsort.c
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 = \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -298,6 +298,7 @@
debian/watch \
errnoent.sh \
generate_sen.sh \
@@ -69,7 +73,7 @@ diff -urpN strace-4.15.orig/Makefile.am strace-4.15/Makefile.am
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/ioctls_inc_align16.h \
-@@ -815,10 +816,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -815,10 +816,19 @@
ioctlent%.h: ioctlsort%
./$< > $@
@@ -90,7 +94,7 @@ diff -urpN strace-4.15.orig/Makefile.am strace-4.15/Makefile.am
$(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
+@@ -826,7 +836,7 @@
BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
@@ -99,10 +103,9 @@ diff -urpN strace-4.15.orig/Makefile.am strace-4.15/Makefile.am
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 = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1036,6 +1036,7 @@
debian/watch \
errnoent.sh \
generate_sen.sh \
@@ -110,7 +113,7 @@ diff -urpN strace-4.15.orig/Makefile.in strace-4.15/Makefile.in
ioctlsort.c \
linux/32/ioctls_inc.h \
linux/32/ioctls_inc_align16.h \
-@@ -1514,7 +1515,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+@@ -1514,7 +1515,7 @@
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)
@@ -119,7 +122,7 @@ diff -urpN strace-4.15.orig/Makefile.in strace-4.15/Makefile.in
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
+@@ -6177,13 +6178,22 @@
rm -f $<-t
mv $@-t $@
diff --git a/packages/strace/4.19/100-conflicting-decl.patch b/packages/strace/4.19/0000-conflicting-decl.patch
index 992eac8..92427e1 100644
--- a/packages/strace/4.19/100-conflicting-decl.patch
+++ b/packages/strace/4.19/0000-conflicting-decl.patch
@@ -18,8 +18,10 @@ Date: Fri Sep 8 12:12:57 2017 +0300
* error_prints.c (program_invocation_name): Declare only in case
of [!HAVE_PROGRAM_INVOCATION_NAME].
-diff --git a/error_prints.c b/error_prints.c
-index 8519b924..710e99b0 100644
+---
+ error_prints.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
--- a/error_prints.c
+++ b/error_prints.c
@@ -37,7 +37,9 @@
diff --git a/packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch b/packages/strace/4.8/0000-strace-4.8-glibc_2.18_build_fix-1.patch
index 49a71e1..042f82a 100644
--- a/packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
+++ b/packages/strace/4.8/0000-strace-4.8-glibc_2.18_build_fix-1.patch
@@ -12,10 +12,15 @@ Their changelog reports:
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
+---
+ process.c | 2 ++
+ signal.c | 2 ++
+ syscall.c | 2 ++
+ util.c | 2 ++
+ 4 files changed, 8 insertions(+)
+
+--- a/process.c
++++ b/process.c
@@ -63,9 +63,11 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
@@ -28,10 +33,8 @@ Index: strace-4.8/process.c
#endif
#if defined(SPARC64)
-Index: strace-4.8/signal.c
-===================================================================
---- strace-4.8.orig/signal.c
-+++ strace-4.8/signal.c
+--- a/signal.c
++++ b/signal.c
@@ -51,9 +51,11 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
@@ -44,10 +47,8 @@ Index: strace-4.8/signal.c
#endif
#ifdef IA64
-Index: strace-4.8/syscall.c
-===================================================================
---- strace-4.8.orig/syscall.c
-+++ strace-4.8/syscall.c
+--- a/syscall.c
++++ b/syscall.c
@@ -48,9 +48,11 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
@@ -60,10 +61,8 @@ Index: strace-4.8/syscall.c
#endif
#if defined(SPARC64)
-Index: strace-4.8/util.c
-===================================================================
---- strace-4.8.orig/util.c
-+++ strace-4.8/util.c
+--- a/util.c
++++ b/util.c
@@ -55,9 +55,11 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
generated by cgit v0.10.2-6-g49f6 at 2024-05-02 07:53:06 (GMT)