commit: d9c8a3a1347ca45d05c635dfb8f074feb1074c70
parent cb7177128d1e09109f9591ca8555dc49d34ef902
Author: Michael Forney <mforney@mforney.org>
Date: Tue, 21 Aug 2018 15:14:12 -0700
strace: Update to 4.24
Diffstat:
8 files changed, 74 insertions(+), 35 deletions(-)
diff --git a/pkg/strace/.gitignore b/pkg/strace/.gitignore
@@ -1,3 +1,3 @@
/src
-/strace-4.22.tar.xz
+/strace-4.24.tar.xz
/tools.ninja
diff --git a/pkg/strace/config.h b/pkg/strace/config.h
@@ -9,6 +9,7 @@
/* #undef BFIN */
#define COPYRIGHT_YEAR "2018"
#define ENABLE_ARM_OABI 0
+/* #undef ENABLE_STACKTRACE */
#define HAVE_ACCEPT4 1
/* #undef HAVE_ASM_CACHECTL_H */
/* #undef HAVE_ASM_GUARDED_STORAGE_H */
@@ -26,6 +27,10 @@
#define HAVE_DECL_CTL_PROC 1
#define HAVE_DECL_CTL_S390DBF 1
#define HAVE_DECL_CTL_SUNRPC 1
+#define HAVE_DECL_IFLA_AF_SPEC 1
+#define HAVE_DECL_IFLA_PORT_SELF 1
+#define HAVE_DECL_IFLA_PROTINFO 1
+#define HAVE_DECL_IFLA_XDP 0
#define HAVE_DECL_KERN_ACPI_VIDEO_FLAGS 1
#define HAVE_DECL_KERN_BOOTLOADER_TYPE 1
#define HAVE_DECL_KERN_COMPAT_LOG 1
@@ -101,6 +106,7 @@
#define HAVE_DECL_P_SID 0
#define HAVE_DECL_P_UID 0
#define HAVE_DECL_SYS_ERRLIST 0
+#define HAVE_DECL_TCA_STAB_DATA 1
#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
@@ -166,6 +172,7 @@
#define HAVE_DECL_VM_VFS_CACHE_PRESSURE 1
/* #undef HAVE_DEMANGLE_H */
#define HAVE_DLADDR 1
+/* #undef HAVE_ELFUTILS_LIBDWFL_H */
#define HAVE_ELF_H 1
#define HAVE_FALLOCATE 1
#define HAVE_FANOTIFY_MARK 1
@@ -255,6 +262,7 @@
#define HAVE_PROGRAM_INVOCATION_NAME 1
#define HAVE_PWRITEV 1
#define HAVE_READAHEAD 1
+/* #undef HAVE_S390_COMPAT_REGS */
#define HAVE_SCSI_SG_H 1
#define HAVE_SIGINFO_T_SI_OVERRUN 1
#define HAVE_SIGINFO_T_SI_SYSCALL 1
@@ -273,6 +281,29 @@
#define HAVE_STRSIGNAL 1
#define HAVE_STRUCT_BLK_USER_TRACE_SETUP 1
#define HAVE_STRUCT_BPF_INSN 1
+/* #undef HAVE_STRUCT_BPF_MAP_INFO */
+/* #undef HAVE_STRUCT_BPF_MAP_INFO_ID */
+/* #undef HAVE_STRUCT_BPF_MAP_INFO_IFINDEX */
+/* #undef HAVE_STRUCT_BPF_MAP_INFO_KEY_SIZE */
+/* #undef HAVE_STRUCT_BPF_MAP_INFO_MAP_FLAGS */
+/* #undef HAVE_STRUCT_BPF_MAP_INFO_MAX_ENTRIES */
+/* #undef HAVE_STRUCT_BPF_MAP_INFO_NAME */
+/* #undef HAVE_STRUCT_BPF_MAP_INFO_TYPE */
+/* #undef HAVE_STRUCT_BPF_MAP_INFO_VALUE_SIZE */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_CREATED_BY_UID */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_ID */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_IFINDEX */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_JITED_PROG_INSNS */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_JITED_PROG_LEN */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_LOAD_TIME */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_MAP_IDS */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_NAME */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_NR_MAP_IDS */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_TAG */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_TYPE */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_XLATED_PROG_INSNS */
+/* #undef HAVE_STRUCT_BPF_PROG_INFO_XLATED_PROG_LEN */
#define HAVE_STRUCT_BR_MDB_ENTRY 1
/* #undef HAVE_STRUCT_BR_MDB_ENTRY_FLAGS */
#define HAVE_STRUCT_BR_MDB_ENTRY_VID 1
@@ -288,9 +319,11 @@
/* #undef HAVE_STRUCT_CRYPTO_REPORT_HASH */
/* #undef HAVE_STRUCT_CRYPTO_REPORT_RNG */
#define HAVE_STRUCT_DCBMSG 1
+/* #undef HAVE_STRUCT_FIB_RULE_PORT_RANGE */
/* #undef HAVE_STRUCT_FIB_RULE_UID_RANGE */
#define HAVE_STRUCT_FLOCK 1
#define HAVE_STRUCT_FLOCK64 1
+#define HAVE_STRUCT_F_OWNER_EX 1
#define HAVE_STRUCT_GNET_STATS_BASIC 1
#define HAVE_STRUCT_GNET_STATS_QUEUE 1
#define HAVE_STRUCT_GNET_STATS_RATE_EST 1
@@ -298,10 +331,12 @@
/* #undef HAVE_STRUCT_IA64_FPREG */
#define HAVE_STRUCT_IFADDRLBLMSG 1
#define HAVE_STRUCT_IFLA_BRIDGE_ID 1
+#define HAVE_STRUCT_IFLA_CACHEINFO 1
#define HAVE_STRUCT_IFLA_PORT_VSI 1
#define HAVE_STRUCT_INPUT_ABSINFO_RESOLUTION 1
/* #undef HAVE_STRUCT_KCMP_EPOLL_SLOT */
/* #undef HAVE_STRUCT_KEYCTL_KDF_PARAMS */
+#define HAVE_STRUCT_KVM_CPUID2 1
#define HAVE_STRUCT_KVM_REGS 1
#define HAVE_STRUCT_KVM_SREGS 1
#define HAVE_STRUCT_KVM_USERSPACE_MEMORY_REGION 1
@@ -342,6 +377,7 @@
/* #undef HAVE_STRUCT_RTNL_LINK_STATS_RX_NOHANDLER */
#define HAVE_STRUCT_RTVIA 1
#define HAVE_STRUCT_SIGCONTEXT 1
+/* #undef HAVE_STRUCT_SOCKADDR_L2_L2_BDADDR_TYPE */
/* #undef HAVE_STRUCT_STAT64 */
/* #undef HAVE_STRUCT_STAT64_ST_MTIME_NSEC */
#define HAVE_STRUCT_STATFS 1
@@ -363,8 +399,10 @@
#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___AIO_SIGSET */
/* #undef HAVE_STRUCT___KERNEL_FLOCK */
/* #undef HAVE_STRUCT___KERNEL_FLOCK64 */
+/* #undef HAVE_STRUCT___KERNEL_F_OWNER_EX */
#define HAVE_STRUCT___OLD_KERNEL_STAT 1
#define HAVE_SYNC_FILE_RANGE 1
/* #undef HAVE_SYS_CONF_H */
@@ -385,6 +423,7 @@
/* #undef HAVE_UNION_BPF_ATTR_ATTACH_TYPE */
#define HAVE_UNION_BPF_ATTR_BPF_FD 1
/* #undef HAVE_UNION_BPF_ATTR_DUMMY */
+/* #undef HAVE_UNION_BPF_ATTR_EXPECTED_ATTACH_TYPE */
/* #undef HAVE_UNION_BPF_ATTR_FILE_FLAGS */
#define HAVE_UNION_BPF_ATTR_FLAGS 1
/* #undef HAVE_UNION_BPF_ATTR_INFO_BPF_FD */
@@ -403,6 +442,8 @@
#define HAVE_UNION_BPF_ATTR_MAP_FD 1
/* #undef HAVE_UNION_BPF_ATTR_MAP_FLAGS */
/* #undef HAVE_UNION_BPF_ATTR_MAP_ID */
+/* #undef HAVE_UNION_BPF_ATTR_MAP_IFINDEX */
+/* #undef HAVE_UNION_BPF_ATTR_MAP_NAME */
#define HAVE_UNION_BPF_ATTR_MAP_TYPE 1
#define HAVE_UNION_BPF_ATTR_MAX_ENTRIES 1
/* #undef HAVE_UNION_BPF_ATTR_NEXT_ID */
@@ -412,7 +453,17 @@
#define HAVE_UNION_BPF_ATTR_PATHNAME 1
/* #undef HAVE_UNION_BPF_ATTR_PROG_FLAGS */
/* #undef HAVE_UNION_BPF_ATTR_PROG_ID */
+/* #undef HAVE_UNION_BPF_ATTR_PROG_IFINDEX */
+/* #undef HAVE_UNION_BPF_ATTR_PROG_NAME */
#define HAVE_UNION_BPF_ATTR_PROG_TYPE 1
+/* #undef HAVE_UNION_BPF_ATTR_QUERY_ATTACH_FLAGS */
+/* #undef HAVE_UNION_BPF_ATTR_QUERY_ATTACH_TYPE */
+/* #undef HAVE_UNION_BPF_ATTR_QUERY_PROG_CNT */
+/* #undef HAVE_UNION_BPF_ATTR_QUERY_PROG_IDS */
+/* #undef HAVE_UNION_BPF_ATTR_QUERY_QUERY_FLAGS */
+/* #undef HAVE_UNION_BPF_ATTR_QUERY_TARGET_FD */
+/* #undef HAVE_UNION_BPF_ATTR_RAW_TRACEPOINT_NAME */
+/* #undef HAVE_UNION_BPF_ATTR_RAW_TRACEPOINT_PROG_FD */
/* #undef HAVE_UNION_BPF_ATTR_START_ID */
/* #undef HAVE_UNION_BPF_ATTR_TARGET_FD */
/* #undef HAVE_UNION_BPF_ATTR_TEST_DATA_IN */
@@ -428,6 +479,7 @@
#define HAVE_UNISTD_H 1
/* #undef HAVE_USTAT_H */
#define HAVE_UTIMENSAT 1
+/* #undef HAVE__STATIC_ASSERT */
#define HAVE___BUILTIN_POPCOUNT 1
#define HAVE___KERNEL_LONG_T 1
#define HAVE___KERNEL_ULONG_T 1
@@ -440,7 +492,7 @@
/* #undef M32_SIZEOF_KERNEL_LONG_T */
/* #undef M32_SIZEOF_LONG */
/* #undef M68K */
-#define MANPAGE_DATE "2018-04-04"
+#define MANPAGE_DATE "2018-07-07"
/* #undef METAG */
/* #undef MICROBLAZE */
/* #undef MIPS */
@@ -451,10 +503,10 @@
#define PACKAGE "strace"
#define PACKAGE_BUGREPORT "strace-devel@lists.strace.io"
#define PACKAGE_NAME "strace"
-#define PACKAGE_STRING "strace 4.22"
+#define PACKAGE_STRING "strace 4.24"
#define PACKAGE_TARNAME "strace"
#define PACKAGE_URL "https://strace.io"
-#define PACKAGE_VERSION "4.22"
+#define PACKAGE_VERSION "4.24"
/* #undef POWERPC */
/* #undef POWERPC64 */
/* #undef RISCV */
@@ -472,6 +524,7 @@
#define STDC_HEADERS 1
/* #undef TILE */
/* #undef USE_DEMANGLE */
+/* #undef USE_LIBDW */
/* #undef USE_LIBUNWIND */
#ifndef _ALL_SOURCE
# define _ALL_SOURCE 1
@@ -488,7 +541,8 @@
#ifndef __EXTENSIONS__
# define __EXTENSIONS__ 1
#endif
-#define VERSION "4.22"
+/* #undef USE_UNWINDER */
+#define VERSION "4.24"
#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
@@ -83,6 +83,7 @@ local libsrcs = {
'fstatfs64.c',
'getpagesize.c',
'ipc.c',
+ 'mmap_cache.c',
'sigreturn.c',
'socketcall.c',
'statfs.c',
@@ -138,6 +139,7 @@ local srcs = {
'fetch_struct_stat.c',
'fetch_struct_stat64.c',
'fetch_struct_statfs.c',
+ 'fetch_struct_xfs_quotastat.c',
'file_handle.c',
'file_ioctl.c',
'filter_qualify.c',
@@ -151,6 +153,7 @@ local srcs = {
'hdio.c',
'hostname.c',
'inotify.c',
+ 'inotify_ioctl.c',
'io.c',
'ioctl.c',
'ioperm.c',
@@ -175,7 +178,7 @@ local srcs = {
'membarrier.c',
'memfd_create.c',
'mknod.c',
- 'mmap_cache.c',
+ 'mmap_notify.c',
'mmsghdr.c',
'mount.c',
'mq.c',
@@ -184,6 +187,7 @@ local srcs = {
'net.c',
'netlink.c',
'netlink_crypto.c',
+ 'netlink_kobject_uevent.c',
'netlink_inet_diag.c',
'netlink_netfilter.c',
'netlink_netlink_diag.c',
@@ -202,13 +206,16 @@ local srcs = {
'or1k_atomic.c',
'pathtrace.c',
'perf.c',
+ 'perf_ioctl.c',
'personality.c',
'pkeys.c',
'poll.c',
'prctl.c',
+ 'print_aio_sigset.c',
'print_dev_t.c',
'print_group_req.c',
'print_ifindex.c',
+ 'print_mac.c',
'print_mq_attr.c',
'print_msgbuf.c',
'print_sg_req_info.c',
diff --git a/pkg/strace/mpers.txt b/pkg/strace/mpers.txt
@@ -2,7 +2,7 @@
block.c
btrfs.c
dirent.c
-evdev.c
+evdev_mpers.c
fetch_bpf_fprog.c
fetch_struct_flock.c
fetch_struct_keyctl_kdf_params.c
@@ -11,11 +11,14 @@ fetch_struct_msghdr.c
fetch_struct_stat.c
fetch_struct_stat64.c
fetch_struct_statfs.c
+fetch_struct_xfs_quotastat.c
hdio.c
ipc_msgctl.c
ipc_shmctl.c
loop.c
mtd.c
+perf_ioctl.c
+print_aio_sigset.c
print_group_req.c
print_mq_attr.c
print_msgbuf.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
@@ -1,25 +0,0 @@
-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 @@
-7
+8
diff --git a/pkg/strace/sha256 b/pkg/strace/sha256
@@ -1 +1 @@
-068cd09264c95e4d591bbcd3ea08f99a693ed8663cd5169b0fdad72eb5bdb39d strace-4.22.tar.xz
+1f4e59fc1edfa2bfb4adf2a748623dc25b105ec79713dd84404199f91b0b0634 strace-4.24.tar.xz
diff --git a/pkg/strace/url b/pkg/strace/url
@@ -1 +1 @@
-url = "https://github.com/strace/strace/releases/download/v4.22/strace-4.22.tar.xz"
+url = "https://github.com/strace/strace/releases/download/v4.24/strace-4.24.tar.xz"
