strace: update to 4.12

9 files changed, 8 insertions, 69 deletions

diff --git a/package/strace/Makefile b/package/strace/Makefile
index f34debdb2..a810a35d7 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
-PKG_VERSION:=		4.11
-PKG_RELEASE:=		6
-PKG_HASH:=		e86a5f6cd8f941f67f3e4b28f4e60f3d9185c951cf266404533210a2e5cd8152
+PKG_VERSION:=		4.13
+PKG_RELEASE:=		1
+PKG_HASH:=		d48f732576c91ece36a5843d63f9be054c40ef59f1e4773986042636861625d7
 PKG_DESCR:=		system call trace program
 PKG_SECTION:=		app/debug
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
@@ -15,8 +15,7 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,STRACE,strace,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s \
-			CPPFLAGS_FOR_BUILD="-I$(LINUX_DIR)/include/uapi -I$(LINUX_DIR)/arch/$(ADK_TARGET_ARCH)/include/generated"
+XAKE_FLAGS+=		CPPFLAGS_FOR_BUILD="-I$(LINUX_DIR)/include/uapi -I$(LINUX_DIR)/arch/$(ADK_TARGET_ARCH)/include/generated"
 
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
 TARGET_CPPFLAGS+=	-DMSG_EXCEPT=020000 -D_LARGEFILE64_SOURCE=1
diff --git a/package/strace/patches/patch-Makefile_in b/package/strace/patches/patch-Makefile_in
index de7463474..74b9b2c20 100644
--- a/package/strace/patches/patch-Makefile_in
+++ b/package/strace/patches/patch-Makefile_in
@@ -1,6 +1,6 @@
---- strace-4.11.orig/Makefile.in	2015-12-22 00:24:05.000000000 +0100
-+++ strace-4.11/Makefile.in	2015-12-25 23:38:03.184768052 +0100
-@@ -925,6 +925,9 @@ EXTRA_DIST = \
+--- strace-4.13.orig/Makefile.in	2016-07-26 18:17:18.000000000 +0200
++++ strace-4.13/Makefile.in	2016-08-01 07:01:11.473850810 +0200
+@@ -1055,6 +1055,9 @@ EXTRA_DIST = \
  	linux/crisv10/get_scno.c	\
  	linux/crisv10/get_syscall_args.c	\
  	linux/crisv10/get_syscall_result.c	\
@@ -10,7 +10,7 @@
  	linux/crisv10/userent.h		\
  	linux/crisv32/arch_regs.c	\
  	linux/crisv32/arch_sigreturn.c	\
-@@ -932,6 +935,9 @@ EXTRA_DIST = \
+@@ -1062,6 +1065,9 @@ EXTRA_DIST = \
  	linux/crisv32/get_scno.c	\
  	linux/crisv32/get_syscall_args.c	\
  	linux/crisv32/get_syscall_result.c	\
diff --git a/package/strace/patches/patch-linux_32_syscallent_h b/package/strace/patches/patch-linux_32_syscallent_h
deleted file mode 100644
index 9d3c98a19..000000000
--- a/package/strace/patches/patch-linux_32_syscallent_h
+++ /dev/null
@@ -1,17 +0,0 @@
---- strace-4.11.orig/linux/32/syscallent.h	2015-12-05 00:12:14.000000000 +0100
-+++ strace-4.11/linux/32/syscallent.h	2015-12-25 15:36:04.814035892 +0100
-@@ -1,5 +1,5 @@
--#ifndef ARCH_mmap
--# define ARCH_mmap mmap
-+#ifndef sys_ARCH_mmap
-+# define sys_ARCH_mmap sys_mmap
- #endif
- [  0] = { 2,	0,		SEN(io_setup),			"io_setup"		},
- [  1] = { 1,	0,		SEN(io_destroy),		"io_destroy"		},
-@@ -276,5 +276,5 @@
- [283] = { 2,	0,		SEN(membarrier),		"membarrier",		},
- [284] = { 3,	TM,		SEN(mlock2),			"mlock2"		},
- 
--#undef ARCH_mmap
-+#undef sys_ARCH_mmap
- #undef ARCH_WANT_SYNC_FILE_RANGE2
diff --git a/package/strace/patches/patch-linux_arc_syscallent_h b/package/strace/patches/patch-linux_arc_syscallent_h
deleted file mode 100644
index c58ed81f8..000000000
--- a/package/strace/patches/patch-linux_arc_syscallent_h
+++ /dev/null
@@ -1,8 +0,0 @@
---- strace-4.11.orig/linux/arc/syscallent.h	2015-07-13 00:31:40.000000000 +0200
-+++ strace-4.11/linux/arc/syscallent.h	2015-12-25 15:36:04.814035892 +0100
-@@ -1,4 +1,4 @@
--#define ARCH_mmap mmap_pgoff
-+#define sys_ARCH_mmap sys_mmap_pgoff
- #include "32/syscallent.h"
- [244] = { 3,	0,	SEN(printargs),	"arc_cacheflush"},
- [245] = { 1,	0,	SEN(printargs),	"arc_settls"	},
diff --git a/package/strace/patches/patch-linux_nios2_syscallent_h b/package/strace/patches/patch-linux_nios2_syscallent_h
deleted file mode 100644
index ad1f80f04..000000000
--- a/package/strace/patches/patch-linux_nios2_syscallent_h
+++ /dev/null
@@ -1,8 +0,0 @@
---- strace-4.11.orig/linux/nios2/syscallent.h	2015-07-13 00:31:40.000000000 +0200
-+++ strace-4.11/linux/nios2/syscallent.h	2015-12-25 15:36:04.814035892 +0100
-@@ -1,4 +1,4 @@
--#define ARCH_mmap mmap_pgoff
-+#define sys_ARCH_mmap sys_mmap_pgoff
- #include "32/syscallent.h"
- [244] = {4,    0,	SEN(cacheflush), "cacheflush"},
- [245 ... 259] = { },
diff --git a/package/strace/patches/patch-linux_or1k_syscallent_h b/package/strace/patches/patch-linux_or1k_syscallent_h
deleted file mode 100644
index d39ad9643..000000000
--- a/package/strace/patches/patch-linux_or1k_syscallent_h
+++ /dev/null
@@ -1,8 +0,0 @@
---- strace-4.11.orig/linux/or1k/syscallent.h	2015-07-13 00:31:40.000000000 +0200
-+++ strace-4.11/linux/or1k/syscallent.h	2015-12-25 15:36:04.814035892 +0100
-@@ -1,4 +1,4 @@
--#define ARCH_mmap mmap_pgoff
-+#define sys_ARCH_mmap sys_mmap_pgoff
- #include "32/syscallent.h"
- [244] = { 3,	NF,	SEN(or1k_atomic),	"or1k_atomic"	},
- [245 ... 259] = { },
diff --git a/package/strace/patches/patch-linux_tile_syscallent1_h b/package/strace/patches/patch-linux_tile_syscallent1_h
deleted file mode 100644
index 79dfd0229..000000000
--- a/package/strace/patches/patch-linux_tile_syscallent1_h
+++ /dev/null
@@ -1,8 +0,0 @@
---- strace-4.11.orig/linux/tile/syscallent1.h	2015-07-13 00:31:40.000000000 +0200
-+++ strace-4.11/linux/tile/syscallent1.h	2015-12-25 15:36:04.814035892 +0100
-@@ -1,4 +1,4 @@
--#define ARCH_mmap mmap_4koff
-+#define sys_ARCH_mmap sys_mmap_4koff
- #define ARCH_WANT_SYNC_FILE_RANGE2 1
- #include "32/syscallent.h"
- [244] = { 1,	0,	SEN(printargs),	"cmpxchg_badaddr"	},
diff --git a/package/strace/patches/patch-pathtrace_c b/package/strace/patches/patch-pathtrace_c
deleted file mode 100644
index cbe0ac27d..000000000
--- a/package/strace/patches/patch-pathtrace_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- strace-4.11.orig/pathtrace.c	2015-11-23 00:21:35.000000000 +0100
-+++ strace-4.11/pathtrace.c	2015-12-25 15:36:04.814035892 +0100
-@@ -216,6 +216,7 @@ pathtrace_match(struct tcb *tcp)
- 	case SEN_mmap:
- 	case SEN_mmap_4koff:
- 	case SEN_mmap_pgoff:
-+	case SEN_ARCH_mmap:
- 		/* x, x, x, x, fd */
- 		return fdmatch(tcp, tcp->u_arg[4]);
- 
diff --git a/package/strace/src/linux/crisv32/syscallent.h b/package/strace/src/linux/crisv32/syscallent.h
index 91c910ea9..cad0fa00c 100644
--- a/package/strace/src/linux/crisv32/syscallent.h
+++ b/package/strace/src/linux/crisv32/syscallent.h
@@ -105,7 +105,6 @@
 [ 87] = { 2,	TF,		sys_swapon,			"swapon"		},
 [ 88] = { 4,	0,		sys_reboot,			"reboot"		},
 [ 89] = { 3,	TD,		sys_readdir,			"readdir"		},
-[ 90] = { 6,	TD|TM|SI,	sys_old_mmap,			"old_mmap"		},
 [ 91] = { 2,	TM|SI,		sys_munmap,			"munmap"		},
 [ 92] = { 2,	TF,		sys_truncate,			"truncate"		},
 [ 93] = { 2,	TD,		sys_ftruncate,			"ftruncate"		},