diff options
| -rw-r--r-- | pkg/strace/.gitignore | 2 | ||||
| -rw-r--r-- | pkg/strace/config.h | 14 | ||||
| -rw-r--r-- | pkg/strace/gen.rc | 11 | ||||
| -rw-r--r-- | pkg/strace/mpers.txt | 1 | ||||
| -rw-r--r-- | pkg/strace/rev | 2 | ||||
| -rw-r--r-- | pkg/strace/scno.awk | 11 | ||||
| -rw-r--r-- | pkg/strace/sha256 | 2 | ||||
| -rw-r--r-- | pkg/strace/url | 2 |
8 files changed, 34 insertions, 11 deletions
diff --git a/pkg/strace/.gitignore b/pkg/strace/.gitignore index 1b8cf02d..f82223a0 100644 --- a/pkg/strace/.gitignore +++ b/pkg/strace/.gitignore @@ -1,3 +1,3 @@ /src -/strace-4.16.tar.xz +/strace-4.17.tar.xz /tools.ninja diff --git a/pkg/strace/config.h b/pkg/strace/config.h index 9509f8f6..35af97b1 100644 --- a/pkg/strace/config.h +++ b/pkg/strace/config.h @@ -9,6 +9,7 @@ #define ASM_SIGRTMIN 32 /* #undef AVR32 */ /* #undef BFIN */ +#define COPYRIGHT_YEAR "2017" /* #undef CRISV10 */ /* #undef CRISV32 */ #define ENABLE_ARM_OABI 0 @@ -102,6 +103,8 @@ #define HAVE_DECL_P_SID 0 #define HAVE_DECL_P_UID 0 #define HAVE_DECL_SYS_ERRLIST 0 +#define HAVE_DECL_V4L2_BUF_TYPE_SDR_CAPTURE 1 +#define HAVE_DECL_V4L2_BUF_TYPE_SDR_OUTPUT 1 #define HAVE_DECL_V4L2_BUF_TYPE_SLICED_VBI_CAPTURE 1 #define HAVE_DECL_V4L2_BUF_TYPE_SLICED_VBI_OUTPUT 1 #define HAVE_DECL_V4L2_BUF_TYPE_VBI_CAPTURE 1 @@ -192,6 +195,7 @@ /* #undef HAVE_LINUX_NETFILTER_BRIDGE_EBTABLES_H */ /* #undef HAVE_LINUX_NETFILTER_IPV4_IP_TABLES_H */ /* #undef HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H */ +/* #undef HAVE_LINUX_NSFS_H */ #define HAVE_LINUX_PERF_EVENT_H 1 #define HAVE_LINUX_QUOTA_H 1 #define HAVE_LINUX_SECCOMP_H 1 @@ -275,6 +279,8 @@ #define HAVE_STRUCT_TIMEX_TAI 1 #define HAVE_STRUCT_USER_DESC 1 #define HAVE_STRUCT_UTSNAME_DOMAINNAME 1 +#define HAVE_STRUCT_V4L2_SDR_FORMAT_BUFFERSIZE 1 +#define HAVE_STRUCT_V4L2_WINDOW_GLOBAL_ALPHA 1 /* #undef HAVE_STRUCT___KERNEL_FLOCK */ /* #undef HAVE_STRUCT___KERNEL_FLOCK64 */ #define HAVE_STRUCT___OLD_KERNEL_STAT 1 @@ -287,7 +293,7 @@ #define HAVE_SYS_SIGNALFD_H 1 #define HAVE_SYS_XATTR_H 1 #define HAVE_TYPEOF 1 -/* #undef HAVE_UNION_BPF_ATTR_ATTACH_TYPE */ +/* #undef HAVE_UNION_BPF_ATTR_ATTACH_FLAGS */ #define HAVE_UNION_BPF_ATTR_BPF_FD 1 #define HAVE_UNION_BPF_ATTR_LOG_BUF 1 /* #undef HAVE_USTAT_H */ @@ -309,10 +315,10 @@ #define PACKAGE "strace" #define PACKAGE_BUGREPORT "strace-devel@lists.sourceforge.net" #define PACKAGE_NAME "strace" -#define PACKAGE_STRING "strace 4.16" +#define PACKAGE_STRING "strace 4.17" #define PACKAGE_TARNAME "strace" #define PACKAGE_URL "https://strace.io" -#define PACKAGE_VERSION "4.16" +#define PACKAGE_VERSION "4.17" /* #undef POWERPC */ /* #undef POWERPC64 */ /* #undef RISCV */ @@ -344,7 +350,7 @@ #ifndef __EXTENSIONS__ # define __EXTENSIONS__ 1 #endif -#define VERSION "4.16" +#define VERSION "4.17" #if defined AC_APPLE_UNIVERSAL_BUILD # if defined __BIG_ENDIAN__ # define WORDS_BIGENDIAN 1 diff --git a/pkg/strace/gen.rc b/pkg/strace/gen.rc index 4c07740d..1edacdf1 100644 --- a/pkg/strace/gen.rc +++ b/pkg/strace/gen.rc @@ -16,6 +16,7 @@ build '$outdir'/ioctl_iocdef.h sed '$outdir'/ioctl_iocdef.i ; with\ { toolchain host cflags\ + -D 'X86_64=1' \ -I '$srcdir'/linux/x86_64\ -I '$srcdir'/linux\ -I '$outdir' @@ -47,8 +48,8 @@ mpers native_printer_defs.h printerdefs.awk build '$outdir'/syscallent.i cc '$srcdir'/linux/x86_64/syscallent.h ; with\ cflags '$cflags -P -E' -build '$outdir'/scno-syscallent.h sed '$outdir'/syscallent.i ; with\ - expr '-n ''/TRACE_INDIRECT_SUBCALL/d; s/^\[[[:space:]]*\($$(digits)\)\][[:space:]]*=[[:space:]]*{[^,]*,[^,]*,[^,]*,[[:space:]]*"\($$(al_nums)\)"[[:space:]]*},.*/\#ifndef __NR_\2\n\# define __NR_\2 (SYSCALL_BIT |\1)\n\#endif/p''' +build '$outdir'/scno-syscallent.h awk '$outdir'/syscallent.i '|' '$dir'/scno.awk ; with\ + expr '-f $dir/scno.awk' build '$outdir'/scno.h cat '$srcdir'/scno.head '$outdir'/scno-syscallent.h # this seems to be enough syscall headers to build @@ -60,6 +61,7 @@ libsrcs=(\ fstatfs.c\ fstatfs64.c\ ipc.c\ + sigreturn.c\ socketcall.c\ statfs.c\ statfs64.c\ @@ -145,6 +147,7 @@ srcs=(\ mtd.c\ net.c\ netlink.c\ + nsfs.c\ numa.c\ oldstat.c\ open.c\ @@ -179,6 +182,8 @@ srcs=(\ reboot.c\ renameat.c\ resource.c\ + rt_sigframe.c\ + rt_sigreturn.c\ rtc.c\ sched.c\ scsi.c\ @@ -189,13 +194,13 @@ srcs=(\ sigaltstack.c\ signal.c\ signalfd.c\ - sigreturn.c\ sock.c\ sockaddr.c\ socketutils.c\ sram_alloc.c\ stat.c\ stat64.c\ + statx.c\ strace.c\ swapon.c\ syscall.c\ diff --git a/pkg/strace/mpers.txt b/pkg/strace/mpers.txt index a8d0c8af..57c172e5 100644 --- a/pkg/strace/mpers.txt +++ b/pkg/strace/mpers.txt @@ -25,6 +25,7 @@ print_timeval.c print_timex.c printrusage.c printsiginfo.c +rt_sigreturn.c rtc.c sg_io_v3.c sigaltstack.c diff --git a/pkg/strace/rev b/pkg/strace/rev index d00491fd..0cfbf088 100644 --- a/pkg/strace/rev +++ b/pkg/strace/rev @@ -1 +1 @@ -1 +2 diff --git a/pkg/strace/scno.awk b/pkg/strace/scno.awk new file mode 100644 index 00000000..5306cddf --- /dev/null +++ b/pkg/strace/scno.awk @@ -0,0 +1,11 @@ +BEGIN { + FS = "\\[[[:space:]]*|[]\"]" +} + +{ + name = $4 + number = $2 + print "#ifndef __NR_" name + print "# define __NR_" name " (SYSCALL_BIT | " number ")" + print "#endif" +} diff --git a/pkg/strace/sha256 b/pkg/strace/sha256 index 109ae8b2..baaea0f0 100644 --- a/pkg/strace/sha256 +++ b/pkg/strace/sha256 @@ -1 +1 @@ -98487cb5178ec1259986cc9f6e2a844f50e5d1208c112cc22431a1e4d9adf0ef strace-4.16.tar.xz +81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419 strace-4.17.tar.xz diff --git a/pkg/strace/url b/pkg/strace/url index 5031d99a..b78ecbbf 100644 --- a/pkg/strace/url +++ b/pkg/strace/url @@ -1 +1 @@ -url = "https://downloads.sourceforge.net/project/strace/strace/4.16/strace-4.16.tar.xz" +url = "https://downloads.sourceforge.net/project/strace/strace/4.17/strace-4.17.tar.xz" |