commit: 386c0061227b1c7d838727cf77247927e77ecda7
parent fc838b9d607e79dc94834fbba4a2e32201ad0f90
Author: Michael Forney <mforney@mforney.org>
Date: Wed, 18 Oct 2017 21:06:58 -0700
strace: Update to 4.19
Diffstat:
8 files changed, 131 insertions(+), 15 deletions(-)
diff --git a/pkg/strace/.gitignore b/pkg/strace/.gitignore
@@ -1,3 +1,3 @@
/src
-/strace-4.18.tar.xz
+/strace-4.19.tar.xz
/tools.ninja
diff --git a/pkg/strace/config.h b/pkg/strace/config.h
@@ -1,5 +1,3 @@
-#include <config-posix.h>
-
/* #undef AARCH64 */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
/* #undef ALPHA */
@@ -17,6 +15,7 @@
/* #undef HAVE_ASM_CACHECTL_H */
/* #undef HAVE_ASM_SIGCONTEXT_H */
/* #undef HAVE_ASM_SYSMIPS_H */
+/* #undef HAVE_BE64TOH */
#define HAVE_BLKGETSIZE64 1
/* #undef HAVE_BLUETOOTH_BLUETOOTH_H */
#define HAVE_DECL_BTRFS_COMPRESS_LZO 0
@@ -171,27 +170,37 @@
#define HAVE_FALLOCATE 1
#define HAVE_FANOTIFY_MARK 1
#define HAVE_FOPEN64 1
+#define HAVE_FORK 1
#define HAVE_FPUTS_UNLOCKED 1
+#define HAVE_FSTATAT 1
+#define HAVE_FTRUNCATE 1
+#define HAVE_FUTIMENS 1
/* #undef HAVE_GNU_STUBS */
/* #undef HAVE_GNU_STUBS_32_H */
/* #undef HAVE_GNU_STUBS_X32_H */
+#define HAVE_IF_INDEXTONAME 1
+#define HAVE_INTTYPES_H 1
/* #undef HAVE_LIBUNWIND_PTRACE_H */
#define HAVE_LINUX_BPF_H 1
#define HAVE_LINUX_BSG_H 1
#define HAVE_LINUX_BTRFS_H 1
+/* #undef HAVE_LINUX_CRYPTOUSER_H */
#define HAVE_LINUX_DM_IOCTL_H 1
#define HAVE_LINUX_DQBLK_XFS_H 1
#define HAVE_LINUX_FALLOC_H 1
+#define HAVE_LINUX_FIB_RULES_H 1
#define HAVE_LINUX_FIEMAP_H 1
-#define HAVE_LINUX_FILTER_H 1
#define HAVE_LINUX_GENETLINK_H 1
#define HAVE_LINUX_HIDDEV_H 1
+#define HAVE_LINUX_IF_ADDR_H 1
+#define HAVE_LINUX_IF_LINK_H 1
#define HAVE_LINUX_INPUT_H 1
#define HAVE_LINUX_IPC_H 1
#define HAVE_LINUX_IP_VS_H 1
#define HAVE_LINUX_MMTIMER_H 1
#define HAVE_LINUX_MQUEUE_H 1
#define HAVE_LINUX_MSG_H 1
+#define HAVE_LINUX_NEIGHBOUR_H 1
/* #undef HAVE_LINUX_NETFILTER_ARP_ARP_TABLES_H */
/* #undef HAVE_LINUX_NETFILTER_BRIDGE_EBTABLES_H */
/* #undef HAVE_LINUX_NETFILTER_IPV4_IP_TABLES_H */
@@ -212,12 +221,14 @@
/* #undef HAVE_M32_STRUCT_STAT64_ST_MTIME_NSEC */
/* #undef HAVE_M32_STRUCT_STAT_ST_MTIME_NSEC */
#define HAVE_MEMORY_H 1
+#define HAVE_MQUEUE_H 1
/* #undef HAVE_MX32_MPERS */
/* #undef HAVE_MX32_STRUCT_STAT */
/* #undef HAVE_MX32_STRUCT_STAT64 */
/* #undef HAVE_MX32_STRUCT_STAT64_ST_MTIME_NSEC */
/* #undef HAVE_MX32_STRUCT_STAT_ST_MTIME_NSEC */
/* #undef HAVE_NETINET_SCTP_H */
+#define HAVE_NETINET_TCP_H 1
#define HAVE_NETINET_UDP_H 1
/* #undef HAVE_NETIPX_IPX_H */
#define HAVE_OPEN64 1
@@ -232,16 +243,42 @@
#define HAVE_SIGINFO_T_SI_SYSCALL 1
#define HAVE_SIGINFO_T_SI_TIMERID 1
#define HAVE_SIGNALFD 1
+#define HAVE_SIG_ATOMIC_T 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STPCPY 1
+#define HAVE_STRERROR 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRNDUP 1
+#define HAVE_STROPTS_H 1
+#define HAVE_STRSIGNAL 1
#define HAVE_STRUCT_BLK_USER_TRACE_SETUP 1
+#define HAVE_STRUCT_BR_PORT_MSG 1
/* #undef HAVE_STRUCT_BTRFS_IOCTL_DEFRAG_RANGE_ARGS_START */
#define HAVE_STRUCT_BTRFS_IOCTL_FEATURE_FLAGS_COMPAT_FLAGS 1
#define HAVE_STRUCT_BTRFS_IOCTL_FS_INFO_ARGS_NODESIZE 1
#define HAVE_STRUCT_BTRFS_IOCTL_SEARCH_ARGS_V2_BUF_SIZE 1
+/* #undef HAVE_STRUCT_CRYPTO_REPORT_AEAD */
+/* #undef HAVE_STRUCT_CRYPTO_REPORT_BLKCIPHER */
+/* #undef HAVE_STRUCT_CRYPTO_REPORT_CIPHER */
+/* #undef HAVE_STRUCT_CRYPTO_REPORT_HASH */
+/* #undef HAVE_STRUCT_CRYPTO_REPORT_RNG */
+#define HAVE_STRUCT_DCBMSG 1
+/* #undef HAVE_STRUCT_FIB_RULE_UID_RANGE */
#define HAVE_STRUCT_FLOCK 1
#define HAVE_STRUCT_FLOCK64 1
/* #undef HAVE_STRUCT_IA64_FPREG */
+#define HAVE_STRUCT_IFADDRLBLMSG 1
+#define HAVE_STRUCT_IFLA_BRIDGE_ID 1
+#define HAVE_STRUCT_IFLA_PORT_VSI 1
#define HAVE_STRUCT_INPUT_ABSINFO_RESOLUTION 1
+/* #undef HAVE_STRUCT_KEYCTL_KDF_PARAMS */
#define HAVE_STRUCT_MMSGHDR 1
+#define HAVE_STRUCT_NDT_CONFIG 1
+#define HAVE_STRUCT_NDT_STATS 1
+#define HAVE_STRUCT_NDT_STATS_NDTS_TABLE_FULLS 1
+#define HAVE_STRUCT_NETCONFMSG 1
#define HAVE_STRUCT_PERF_EVENT_ATTR_AUX_WATERMARK 1
#define HAVE_STRUCT_PERF_EVENT_ATTR_BP_TYPE 1
#define HAVE_STRUCT_PERF_EVENT_ATTR_BRANCH_SAMPLE_TYPE 1
@@ -265,6 +302,11 @@
/* #undef HAVE_STRUCT_PERF_EVENT_ATTR_WRITE_BACKWARD */
#define HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS 1
/* #undef HAVE_STRUCT_PT_ALL_USER_REGS */
+#define HAVE_STRUCT_RTA_MFC_STATS 1
+#define HAVE_STRUCT_RTNL_LINK_STATS64 1
+/* #undef HAVE_STRUCT_RTNL_LINK_STATS64_RX_NOHANDLER */
+/* #undef HAVE_STRUCT_RTNL_LINK_STATS_RX_NOHANDLER */
+#define HAVE_STRUCT_RTVIA 1
#define HAVE_STRUCT_SIGCONTEXT 1
/* #undef HAVE_STRUCT_STAT64 */
/* #undef HAVE_STRUCT_STAT64_ST_MTIME_NSEC */
@@ -291,15 +333,25 @@
/* #undef HAVE_SYS_CONF_H */
#define HAVE_SYS_EVENTFD_H 1
#define HAVE_SYS_FANOTIFY_H 1
+#define HAVE_SYS_IPC_H 1
+#define HAVE_SYS_MSG_H 1
#define HAVE_SYS_QUOTA_H 1
#define HAVE_SYS_REG_H 1
+#define HAVE_SYS_SEM_H 1
+#define HAVE_SYS_SHM_H 1
#define HAVE_SYS_SIGNALFD_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_XATTR_H 1
#define HAVE_TYPEOF 1
/* #undef HAVE_UNION_BPF_ATTR_ATTACH_FLAGS */
#define HAVE_UNION_BPF_ATTR_BPF_FD 1
-#define HAVE_UNION_BPF_ATTR_LOG_BUF 1
+#define HAVE_UNION_BPF_ATTR_FLAGS 1
+/* #undef HAVE_UNION_BPF_ATTR_INNER_MAP_FD */
+/* #undef HAVE_UNION_BPF_ATTR_PROG_FLAGS */
+#define HAVE_UNISTD_H 1
/* #undef HAVE_USTAT_H */
+#define HAVE_UTIMENSAT 1
#define HAVE___BUILTIN_POPCOUNT 1
#define HAVE___KERNEL_LONG_T 1
#define HAVE___KERNEL_ULONG_T 1
@@ -310,6 +362,7 @@
/* #undef LINUX_MIPSN64 */
/* #undef LINUX_MIPSO32 */
/* #undef M68K */
+#define MANPAGE_DATE "2017-08-28"
/* #undef METAG */
/* #undef MICROBLAZE */
/* #undef MIPS */
@@ -318,10 +371,10 @@
#define PACKAGE "strace"
#define PACKAGE_BUGREPORT "strace-devel@lists.sourceforge.net"
#define PACKAGE_NAME "strace"
-#define PACKAGE_STRING "strace 4.18"
+#define PACKAGE_STRING "strace 4.19"
#define PACKAGE_TARNAME "strace"
#define PACKAGE_URL "https://strace.io"
-#define PACKAGE_VERSION "4.18"
+#define PACKAGE_VERSION "4.19"
/* #undef POWERPC */
/* #undef POWERPC64 */
/* #undef RISCV */
@@ -336,6 +389,7 @@
#define SIZEOF_STRUCT_I64_I32 16
/* #undef SPARC */
/* #undef SPARC64 */
+#define STDC_HEADERS 1
/* #undef TILE */
/* #undef USE_LIBUNWIND */
#ifndef _ALL_SOURCE
@@ -353,7 +407,7 @@
#ifndef __EXTENSIONS__
# define __EXTENSIONS__ 1
#endif
-#define VERSION "4.18"
+#define VERSION "4.19"
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
diff --git a/pkg/strace/gen.lua b/pkg/strace/gen.lua
@@ -96,9 +96,14 @@ local srcs = {
'affinity.c',
'aio.c',
'alpha.c',
+ 'basic_filters.c',
+ 'bind.c',
'bjm.c',
'block.c',
'bpf.c',
+ 'bpf_filter.c',
+ 'bpf_seccomp_filter.c',
+ 'bpf_sock_filter.c',
'btrfs.c',
'cacheflush.c',
'capability.c',
@@ -113,6 +118,7 @@ local srcs = {
'dm.c',
'dyxlat.c',
'epoll.c',
+ 'error_prints.c',
'evdev.c',
'eventfd.c',
'execve.c',
@@ -121,8 +127,9 @@ local srcs = {
'fanotify.c',
'fchownat.c',
'fcntl.c',
- 'fetch_seccomp_fprog.c',
+ 'fetch_bpf_fprog.c',
'fetch_struct_flock.c',
+ 'fetch_struct_keyctl_kdf_params.c',
'fetch_struct_mmsghdr.c',
'fetch_struct_msghdr.c',
'fetch_struct_stat.c',
@@ -130,8 +137,9 @@ local srcs = {
'fetch_struct_statfs.c',
'file_handle.c',
'file_ioctl.c',
- 'fs_x_ioctl.c',
+ 'filter_qualify.c',
'flock.c',
+ 'fs_x_ioctl.c',
'futex.c',
'get_robust_list.c',
'getcpu.c',
@@ -155,6 +163,7 @@ local srcs = {
'keyctl.c',
'ldt.c',
'link.c',
+ 'listen.c',
'lookup_dcookie.c',
'loop.c',
'lseek.c',
@@ -169,10 +178,19 @@ local srcs = {
'mtd.c',
'net.c',
'netlink.c',
+ 'netlink_crypto.c',
+ 'netlink_inet_diag.c',
+ 'netlink_netlink_diag.c',
+ 'netlink_packet_diag.c',
+ 'netlink_route.c',
+ 'netlink_selinux.c',
+ 'netlink_smc_diag.c',
'netlink_sock_diag.c',
+ 'netlink_unix_diag.c',
'nlattr.c',
'nsfs.c',
'numa.c',
+ 'number_set.c',
'oldstat.c',
'open.c',
'or1k_atomic.c',
@@ -183,6 +201,8 @@ local srcs = {
'poll.c',
'prctl.c',
'print_dev_t.c',
+ 'print_group_req.c',
+ 'print_ifindex.c',
'print_mq_attr.c',
'print_msgbuf.c',
'print_sg_req_info.c',
@@ -199,7 +219,6 @@ local srcs = {
'process.c',
'process_vm.c',
'ptp.c',
- 'qualify.c',
'quota.c',
'readahead.c',
'readlink.c',
@@ -209,12 +228,26 @@ local srcs = {
'rt_sigframe.c',
'rt_sigreturn.c',
'rtc.c',
+ 'rtnl_addr.c',
+ 'rtnl_addrlabel.c',
+ 'rtnl_dcb.c',
+ 'rtnl_link.c',
+ 'rtnl_mdb.c',
+ 'rtnl_neigh.c',
+ 'rtnl_neightbl.c',
+ 'rtnl_netconf.c',
+ 'rtnl_nsid.c',
+ 'rtnl_route.c',
+ 'rtnl_rule.c',
+ 'rtnl_tc.c',
+ 'rtnl_tc_action.c',
'sched.c',
'scsi.c',
'seccomp.c',
'sendfile.c',
'sg_io_v3.c',
'sg_io_v4.c',
+ 'shutdown.c',
'sigaltstack.c',
'signal.c',
'signalfd.c',
@@ -226,6 +259,7 @@ local srcs = {
'stat64.c',
'statx.c',
'strace.c',
+ 'string_to_uint.c',
'swapon.c',
'syscall.c',
'sysctl.c',
@@ -237,6 +271,7 @@ local srcs = {
'times.c',
'truncate.c',
'ubi.c',
+ 'ucopy.c',
'uid.c',
'uid16.c',
'umask.c',
diff --git a/pkg/strace/mpers.txt b/pkg/strace/mpers.txt
@@ -3,8 +3,9 @@ block.c
btrfs.c
dirent.c
evdev.c
-fetch_seccomp_fprog.c
+fetch_bpf_fprog.c
fetch_struct_flock.c
+fetch_struct_keyctl_kdf_params.c
fetch_struct_mmsghdr.c
fetch_struct_msghdr.c
fetch_struct_stat.c
@@ -15,6 +16,7 @@ ipc_msgctl.c
ipc_shmctl.c
loop.c
mtd.c
+print_group_req.c
print_mq_attr.c
print_msgbuf.c
print_sg_req_info.c
diff --git a/pkg/strace/patch/0001-Remove-netinet-in.h-include-from-rtnl_mdb.c.patch b/pkg/strace/patch/0001-Remove-netinet-in.h-include-from-rtnl_mdb.c.patch
@@ -0,0 +1,25 @@
+From 44eac9bc40ef4fcd5ad03826b9d5d3db7bf5bc7f Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Wed, 18 Oct 2017 21:02:15 -0700
+Subject: [PATCH] Remove netinet/in.h include from rtnl_mdb.c
+
+It conflicts with kernel headers on musl.
+---
+ rtnl_mdb.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/rtnl_mdb.c b/rtnl_mdb.c
+index 30c3473e..1b7405cf 100644
+--- a/rtnl_mdb.c
++++ b/rtnl_mdb.c
+@@ -35,7 +35,6 @@
+ # include "nlattr.h"
+ # include "print_fields.h"
+
+-# include <netinet/in.h>
+ # include <linux/if_bridge.h>
+ # include "netlink.h"
+
+--
+2.14.2
+
diff --git a/pkg/strace/rev b/pkg/strace/rev
@@ -1 +1 @@
-3
+4
diff --git a/pkg/strace/sha256 b/pkg/strace/sha256
@@ -1 +1 @@
-89ad887c1e6226bdbca8da31d589cadea4be0744b142eb47b768086c937fca08 strace-4.18.tar.xz
+7c93ebc6c29280f47c24a0eb86873a99ccb2cac6512c60a60ba4ef99ab807281 strace-4.19.tar.xz
diff --git a/pkg/strace/url b/pkg/strace/url
@@ -1 +1 @@
-url = "https://downloads.sourceforge.net/project/strace/strace/4.18/strace-4.18.tar.xz"
+url = "https://downloads.sourceforge.net/project/strace/strace/4.19/strace-4.19.tar.xz"
