commit: 7d3adb79b0bba23366a12818164d01d2141fc42d parent e087141fc0305785196dea644ffd22ecb9613ef9 Author: Michael Forney <mforney@mforney.org> Date: Tue, 2 Mar 2021 12:48:25 -0800 strace: Update to 5.11 In this release, most source files were moved under a src/ directory.Diffstat:
19 files changed, 719 insertions(+), 993 deletions(-)diff --git a/pkg/strace/.gitignore b/pkg/strace/.gitignore@@ -1,3 +1,3 @@ /src -/strace-5.10.tar.xz +/strace-5.11.tar.xz /tools.ninjadiff --git a/pkg/strace/config.h b/pkg/strace/config.h@@ -7,7 +7,7 @@ #define ASM_SIGRTMIN 32 /* #undef AVR32 */ /* #undef BFIN */ -#define COPYRIGHT_YEAR "2020" +#define COPYRIGHT_YEAR "2021" /* #undef CSKY */ #define ENABLE_ARM_OABI 0 /* #undef ENABLE_STACKTRACE */ @@ -19,11 +19,6 @@ /* #undef HAVE_BE64TOH */ /* #undef HAVE_BLUETOOTH_BLUETOOTH_H */ /* #undef HAVE_BROKEN_CC */ -#define HAVE_DECL_BTRFS_COMPRESS_LZO 0 -#define HAVE_DECL_BTRFS_COMPRESS_NONE 0 -#define HAVE_DECL_BTRFS_COMPRESS_ZLIB 0 -#define HAVE_DECL_BTRFS_COMPRESS_ZSTD 0 -#define HAVE_DECL_CLOSE_RANGE_UNSHARE 1 #define HAVE_DECL_CTL_ABI 1 #define HAVE_DECL_CTL_ARLAN 1 #define HAVE_DECL_CTL_BUS 1 @@ -39,118 +34,6 @@ #define HAVE_DECL_CTL_S390DBF 1 #define HAVE_DECL_CTL_SUNRPC 1 #define HAVE_DECL_CTL_VM 1 -#define HAVE_DECL_IFLA_ADDRESS 1 -#define HAVE_DECL_IFLA_AF_SPEC 1 -#define HAVE_DECL_IFLA_ALT_IFNAME 1 -#define HAVE_DECL_IFLA_BROADCAST 1 -#define HAVE_DECL_IFLA_CARRIER 1 -#define HAVE_DECL_IFLA_CARRIER_CHANGES 1 -#define HAVE_DECL_IFLA_CARRIER_DOWN_COUNT 1 -#define HAVE_DECL_IFLA_CARRIER_UP_COUNT 1 -#define HAVE_DECL_IFLA_COST 1 -#define HAVE_DECL_IFLA_EVENT 1 -#define HAVE_DECL_IFLA_EXT_MASK 1 -#define HAVE_DECL_IFLA_GROUP 1 -#define HAVE_DECL_IFLA_GSO_MAX_SEGS 1 -#define HAVE_DECL_IFLA_GSO_MAX_SIZE 1 -#define HAVE_DECL_IFLA_IFALIAS 1 -#define HAVE_DECL_IFLA_IFNAME 1 -#define HAVE_DECL_IFLA_IF_NETNSID 1 -#define HAVE_DECL_IFLA_LINK 1 -#define HAVE_DECL_IFLA_LINKINFO 1 -#define HAVE_DECL_IFLA_LINKMODE 1 -#define HAVE_DECL_IFLA_LINK_NETNSID 1 -#define HAVE_DECL_IFLA_MAP 1 -#define HAVE_DECL_IFLA_MASTER 1 -#define HAVE_DECL_IFLA_MAX_MTU 1 -#define HAVE_DECL_IFLA_MIN_MTU 1 -#define HAVE_DECL_IFLA_MTU 1 -#define HAVE_DECL_IFLA_NET_NS_FD 1 -#define HAVE_DECL_IFLA_NET_NS_PID 1 -#define HAVE_DECL_IFLA_NEW_IFINDEX 1 -#define HAVE_DECL_IFLA_NEW_NETNSID 1 -#define HAVE_DECL_IFLA_NUM_RX_QUEUES 1 -#define HAVE_DECL_IFLA_NUM_TX_QUEUES 1 -#define HAVE_DECL_IFLA_NUM_VF 1 -#define HAVE_DECL_IFLA_OPERSTATE 1 -#define HAVE_DECL_IFLA_PAD 1 -#define HAVE_DECL_IFLA_PERM_ADDRESS 1 -#define HAVE_DECL_IFLA_PHYS_PORT_ID 1 -#define HAVE_DECL_IFLA_PHYS_PORT_NAME 1 -#define HAVE_DECL_IFLA_PHYS_SWITCH_ID 1 -#define HAVE_DECL_IFLA_PORT_SELF 1 -#define HAVE_DECL_IFLA_PRIORITY 1 -#define HAVE_DECL_IFLA_PROMISCUITY 1 -#define HAVE_DECL_IFLA_PROP_LIST 1 -#define HAVE_DECL_IFLA_PROTINFO 1 -#define HAVE_DECL_IFLA_PROTO_DOWN 1 -#define HAVE_DECL_IFLA_PROTO_DOWN_REASON 1 -#define HAVE_DECL_IFLA_QDISC 1 -#define HAVE_DECL_IFLA_STATS 1 -#define HAVE_DECL_IFLA_STATS64 1 -#define HAVE_DECL_IFLA_TXQLEN 1 -#define HAVE_DECL_IFLA_UNSPEC 1 -#define HAVE_DECL_IFLA_VFINFO_LIST 1 -#define HAVE_DECL_IFLA_VF_PORTS 1 -#define HAVE_DECL_IFLA_WEIGHT 1 -#define HAVE_DECL_IFLA_WIRELESS 1 -#define HAVE_DECL_IFLA_XDP 1 -#define HAVE_DECL_IFLA_XDP_ATTACHED 1 -#define HAVE_DECL_IFLA_XDP_DRV_PROG_ID 1 -#define HAVE_DECL_IFLA_XDP_EXPECTED_FD 1 -#define HAVE_DECL_IFLA_XDP_FD 1 -#define HAVE_DECL_IFLA_XDP_FLAGS 1 -#define HAVE_DECL_IFLA_XDP_HW_PROG_ID 1 -#define HAVE_DECL_IFLA_XDP_PROG_ID 1 -#define HAVE_DECL_IFLA_XDP_SKB_PROG_ID 1 -#define HAVE_DECL_IFLA_XDP_UNSPEC 1 -#define HAVE_DECL_IORING_OP_ACCEPT 1 -#define HAVE_DECL_IORING_OP_ASYNC_CANCEL 1 -#define HAVE_DECL_IORING_OP_CLOSE 1 -#define HAVE_DECL_IORING_OP_CONNECT 1 -#define HAVE_DECL_IORING_OP_EPOLL_CTL 1 -#define HAVE_DECL_IORING_OP_FADVISE 1 -#define HAVE_DECL_IORING_OP_FALLOCATE 1 -#define HAVE_DECL_IORING_OP_FILES_UPDATE 1 -#define HAVE_DECL_IORING_OP_FSYNC 1 -#define HAVE_DECL_IORING_OP_LINK_TIMEOUT 1 -#define HAVE_DECL_IORING_OP_MADVISE 1 -#define HAVE_DECL_IORING_OP_NOP 1 -#define HAVE_DECL_IORING_OP_OPENAT 1 -#define HAVE_DECL_IORING_OP_OPENAT2 1 -#define HAVE_DECL_IORING_OP_POLL_ADD 1 -#define HAVE_DECL_IORING_OP_POLL_REMOVE 1 -#define HAVE_DECL_IORING_OP_PROVIDE_BUFFERS 1 -#define HAVE_DECL_IORING_OP_READ 1 -#define HAVE_DECL_IORING_OP_READV 1 -#define HAVE_DECL_IORING_OP_READ_FIXED 1 -#define HAVE_DECL_IORING_OP_RECV 1 -#define HAVE_DECL_IORING_OP_RECVMSG 1 -#define HAVE_DECL_IORING_OP_REMOVE_BUFFERS 1 -#define HAVE_DECL_IORING_OP_SEND 1 -#define HAVE_DECL_IORING_OP_SENDMSG 1 -#define HAVE_DECL_IORING_OP_SPLICE 1 -#define HAVE_DECL_IORING_OP_STATX 1 -#define HAVE_DECL_IORING_OP_SYNC_FILE_RANGE 1 -#define HAVE_DECL_IORING_OP_TEE 1 -#define HAVE_DECL_IORING_OP_TIMEOUT 1 -#define HAVE_DECL_IORING_OP_TIMEOUT_REMOVE 1 -#define HAVE_DECL_IORING_OP_WRITE 1 -#define HAVE_DECL_IORING_OP_WRITEV 1 -#define HAVE_DECL_IORING_OP_WRITE_FIXED 1 -#define HAVE_DECL_IORING_REGISTER_BUFFERS 1 -#define HAVE_DECL_IORING_REGISTER_ENABLE_RINGS 1 -#define HAVE_DECL_IORING_REGISTER_EVENTFD 1 -#define HAVE_DECL_IORING_REGISTER_EVENTFD_ASYNC 1 -#define HAVE_DECL_IORING_REGISTER_FILES 1 -#define HAVE_DECL_IORING_REGISTER_FILES_UPDATE 1 -#define HAVE_DECL_IORING_REGISTER_PERSONALITY 1 -#define HAVE_DECL_IORING_REGISTER_PROBE 1 -#define HAVE_DECL_IORING_REGISTER_RESTRICTIONS 1 -#define HAVE_DECL_IORING_UNREGISTER_BUFFERS 1 -#define HAVE_DECL_IORING_UNREGISTER_EVENTFD 1 -#define HAVE_DECL_IORING_UNREGISTER_FILES 1 -#define HAVE_DECL_IORING_UNREGISTER_PERSONALITY 1 #define HAVE_DECL_KERN_ACCT 1 #define HAVE_DECL_KERN_ACPI_VIDEO_FLAGS 1 #define HAVE_DECL_KERN_BOOTLOADER_TYPE 1 @@ -452,68 +335,6 @@ #define HAVE_DECL_TCA_STATS_RATE_EST 1 #define HAVE_DECL_TCA_STATS_RATE_EST64 1 #define HAVE_DECL_TCA_STATS_UNSPEC 1 -#define HAVE_DECL_V4L2_BUF_TYPE_META_CAPTURE 1 -#define HAVE_DECL_V4L2_BUF_TYPE_META_OUTPUT 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 -#define HAVE_DECL_V4L2_BUF_TYPE_SLICED_VBI_OUTPUT 1 -#define HAVE_DECL_V4L2_BUF_TYPE_VBI_CAPTURE 1 -#define HAVE_DECL_V4L2_BUF_TYPE_VBI_OUTPUT 1 -#define HAVE_DECL_V4L2_BUF_TYPE_VIDEO_CAPTURE 1 -#define HAVE_DECL_V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE 1 -#define HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OUTPUT 1 -#define HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE 1 -#define HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY 1 -#define HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OVERLAY 1 -#define HAVE_DECL_V4L2_COLORSPACE_470_SYSTEM_BG 1 -#define HAVE_DECL_V4L2_COLORSPACE_470_SYSTEM_M 1 -#define HAVE_DECL_V4L2_COLORSPACE_BT2020 1 -#define HAVE_DECL_V4L2_COLORSPACE_BT878 1 -#define HAVE_DECL_V4L2_COLORSPACE_DCI_P3 1 -#define HAVE_DECL_V4L2_COLORSPACE_DEFAULT 1 -#define HAVE_DECL_V4L2_COLORSPACE_JPEG 1 -#define HAVE_DECL_V4L2_COLORSPACE_OPRGB 1 -#define HAVE_DECL_V4L2_COLORSPACE_RAW 1 -#define HAVE_DECL_V4L2_COLORSPACE_REC709 1 -#define HAVE_DECL_V4L2_COLORSPACE_SMPTE170M 1 -#define HAVE_DECL_V4L2_COLORSPACE_SMPTE240M 1 -#define HAVE_DECL_V4L2_COLORSPACE_SRGB 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_AREA 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_BITMASK 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_BOOLEAN 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_BUTTON 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_CTRL_CLASS 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_INTEGER 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_INTEGER64 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_INTEGER_MENU 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_MENU 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_STRING 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_U16 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_U32 1 -#define HAVE_DECL_V4L2_CTRL_TYPE_U8 1 -#define HAVE_DECL_V4L2_FIELD_ALTERNATE 1 -#define HAVE_DECL_V4L2_FIELD_ANY 1 -#define HAVE_DECL_V4L2_FIELD_BOTTOM 1 -#define HAVE_DECL_V4L2_FIELD_INTERLACED 1 -#define HAVE_DECL_V4L2_FIELD_INTERLACED_BT 1 -#define HAVE_DECL_V4L2_FIELD_INTERLACED_TB 1 -#define HAVE_DECL_V4L2_FIELD_NONE 1 -#define HAVE_DECL_V4L2_FIELD_SEQ_BT 1 -#define HAVE_DECL_V4L2_FIELD_SEQ_TB 1 -#define HAVE_DECL_V4L2_FIELD_TOP 1 -#define HAVE_DECL_V4L2_FRMSIZE_TYPE_CONTINUOUS 1 -#define HAVE_DECL_V4L2_FRMSIZE_TYPE_DISCRETE 1 -#define HAVE_DECL_V4L2_FRMSIZE_TYPE_STEPWISE 1 -#define HAVE_DECL_V4L2_MEMORY_DMABUF 1 -#define HAVE_DECL_V4L2_MEMORY_MMAP 1 -#define HAVE_DECL_V4L2_MEMORY_OVERLAY 1 -#define HAVE_DECL_V4L2_MEMORY_USERPTR 1 -#define HAVE_DECL_V4L2_TUNER_ANALOG_TV 1 -#define HAVE_DECL_V4L2_TUNER_DIGITAL_TV 1 -#define HAVE_DECL_V4L2_TUNER_RADIO 1 -#define HAVE_DECL_V4L2_TUNER_RF 1 -#define HAVE_DECL_V4L2_TUNER_SDR 1 #define HAVE_DECL_VM_BLOCK_DUMP 1 #define HAVE_DECL_VM_DIRTY_BACKGROUND 1 #define HAVE_DECL_VM_DIRTY_EXPIRE_CS 1 @@ -534,11 +355,6 @@ #define HAVE_DECL_VM_SWAPPINESS 1 #define HAVE_DECL_VM_SWAP_TOKEN_TIMEOUT 1 #define HAVE_DECL_VM_VFS_CACHE_PRESSURE 1 -#define HAVE_DECL_XDP_ATTACHED_DRV 1 -#define HAVE_DECL_XDP_ATTACHED_HW 1 -#define HAVE_DECL_XDP_ATTACHED_MULTI 1 -#define HAVE_DECL_XDP_ATTACHED_NONE 1 -#define HAVE_DECL_XDP_ATTACHED_SKB 1 /* #undef HAVE_DEMANGLE_H */ #define HAVE_DLADDR 1 /* #undef HAVE_ELFUTILS_LIBDWFL_H */ @@ -564,30 +380,18 @@ /* #undef HAVE_LIBUNWIND_PTRACE_H */ #define HAVE_LINUX_BPF_H 1 #define HAVE_LINUX_BSG_H 1 -#define HAVE_LINUX_BTRFS_H 1 -#define HAVE_LINUX_CLOSE_RANGE_H 1 -#define HAVE_LINUX_CRYPTOUSER_H 1 #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_HIDDEV_H 1 -#define HAVE_LINUX_IF_ADDR_H 1 -#define HAVE_LINUX_IF_BRIDGE_H 1 -#define HAVE_LINUX_IF_LINK_H 1 -#define HAVE_LINUX_INPUT_H 1 #define HAVE_LINUX_IO_URING_H 1 #define HAVE_LINUX_IPC_H 1 #define HAVE_LINUX_IP_VS_H 1 #define HAVE_LINUX_KCMP_H 1 #define HAVE_LINUX_KVM_H 1 -#define HAVE_LINUX_LOOP_H 1 #define HAVE_LINUX_MEMFD_H 1 #define HAVE_LINUX_MMTIMER_H 1 -#define HAVE_LINUX_MOUNT_H 1 #define HAVE_LINUX_MQUEUE_H 1 -#define HAVE_LINUX_NEIGHBOUR_H 1 #define HAVE_LINUX_NETFILTER_ARP_ARP_TABLES_H 1 #define HAVE_LINUX_NETFILTER_BRIDGE_EBTABLES_H 1 #define HAVE_LINUX_NETFILTER_IPSET_IP_SET_H 1 @@ -604,17 +408,13 @@ #define HAVE_LINUX_NETFILTER_NF_TABLES_H 1 #define HAVE_LINUX_NETFILTER_XT_OSF_H 1 #define HAVE_LINUX_NSFS_H 1 -#define HAVE_LINUX_OPENAT2_H 1 #define HAVE_LINUX_PERF_EVENT_H 1 #define HAVE_LINUX_QUOTA_H 1 -#define HAVE_LINUX_RTNETLINK_H 1 #define HAVE_LINUX_SCHED_H 1 #define HAVE_LINUX_SECCOMP_H 1 #define HAVE_LINUX_SECUREBITS_H 1 -#define HAVE_LINUX_TEE_H 1 #define HAVE_LINUX_USERFAULTFD_H 1 #define HAVE_LINUX_UTSNAME_H 1 -#define HAVE_LINUX_VIDEODEV2_H 1 /* #undef HAVE_M32_MPERS */ /* #undef HAVE_M32_STRUCT_STAT */ /* #undef HAVE_M32_STRUCT_STAT64 */ @@ -636,6 +436,7 @@ #define HAVE_PATHS_H 1 #define HAVE_PREADV 1 #define HAVE_PROCESS_VM_READV 1 +#define HAVE_PROCESS_VM_WRITEV 1 #define HAVE_PROGRAM_INVOCATION_NAME 1 #define HAVE_PWRITEV 1 #define HAVE_READAHEAD 1 @@ -701,33 +502,8 @@ #define HAVE_STRUCT_BPF_PROG_INFO_TYPE 1 #define HAVE_STRUCT_BPF_PROG_INFO_XLATED_PROG_INSNS 1 #define HAVE_STRUCT_BPF_PROG_INFO_XLATED_PROG_LEN 1 -#define HAVE_STRUCT_BR_MDB_ENTRY 1 -#define HAVE_STRUCT_BR_MDB_ENTRY_ADDR 1 -#define HAVE_STRUCT_BR_MDB_ENTRY_FLAGS 1 -#define HAVE_STRUCT_BR_MDB_ENTRY_VID 1 -#define HAVE_STRUCT_BR_PORT_MSG 1 -#define HAVE_STRUCT_BR_PORT_MSG_IFINDEX 1 -#define HAVE_STRUCT_BTRFS_IOCTL_DEFRAG_RANGE_ARGS_START 1 -#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_LOGICAL_INO_ARGS 1 -#define HAVE_STRUCT_BTRFS_IOCTL_LOGICAL_INO_ARGS_INODES 1 #define HAVE_STRUCT_CLONE_ARGS_CGROUP 1 -#define HAVE_STRUCT_CRYPTO_REPORT_AEAD 1 -#define HAVE_STRUCT_CRYPTO_REPORT_AEAD_IVSIZE 1 -#define HAVE_STRUCT_CRYPTO_REPORT_BLKCIPHER 1 -#define HAVE_STRUCT_CRYPTO_REPORT_BLKCIPHER_IVSIZE 1 -#define HAVE_STRUCT_CRYPTO_REPORT_CIPHER 1 -#define HAVE_STRUCT_CRYPTO_REPORT_CIPHER_MAX_KEYSIZE 1 -#define HAVE_STRUCT_CRYPTO_REPORT_HASH 1 -#define HAVE_STRUCT_CRYPTO_REPORT_HASH_DIGESTSIZE 1 -#define HAVE_STRUCT_CRYPTO_REPORT_RNG 1 -#define HAVE_STRUCT_CRYPTO_REPORT_RNG_SEEDSIZE 1 -#define HAVE_STRUCT_CRYPTO_USER_ALG 1 -#define HAVE_STRUCT_CRYPTO_USER_ALG_CRU_FLAGS 1 #define HAVE_STRUCT_DCBMSG 1 -#define HAVE_STRUCT_FIB_RULE_PORT_RANGE 1 -#define HAVE_STRUCT_FIB_RULE_UID_RANGE 1 #define HAVE_STRUCT_FLOCK 1 #define HAVE_STRUCT_FLOCK64 1 #define HAVE_STRUCT_F_OWNER_EX 1 @@ -737,35 +513,12 @@ #define HAVE_STRUCT_GNET_STATS_RATE_EST64 1 /* #undef HAVE_STRUCT_IA64_FPREG */ #define HAVE_STRUCT_IFADDRLBLMSG 1 -#define HAVE_STRUCT_IFLA_BRIDGE_ID 1 -#define HAVE_STRUCT_IFLA_BRIDGE_ID_ADDR 1 -#define HAVE_STRUCT_IFLA_CACHEINFO 1 -#define HAVE_STRUCT_IFLA_PORT_VSI 1 -#define HAVE_STRUCT_IFLA_PORT_VSI_PAD 1 -#define HAVE_STRUCT_INPUT_ABSINFO 1 -#define HAVE_STRUCT_INPUT_ABSINFO_RESOLUTION 1 -#define HAVE_STRUCT_INPUT_KEYMAP_ENTRY 1 -#define HAVE_STRUCT_INPUT_KEYMAP_ENTRY_SCANCODE 1 -#define HAVE_STRUCT_INPUT_MASK 1 -#define HAVE_STRUCT_INPUT_MASK_CODES_PTR 1 #define HAVE_STRUCT_IOCB_AIO_FLAGS 1 #define HAVE_STRUCT_IOCB_AIO_RW_FLAGS 1 -#define HAVE_STRUCT_IO_CQRING_OFFSETS 1 -#define HAVE_STRUCT_IO_CQRING_OFFSETS_CQES 1 #define HAVE_STRUCT_IO_CQRING_OFFSETS_FLAGS 1 -#define HAVE_STRUCT_IO_SQRING_OFFSETS 1 -#define HAVE_STRUCT_IO_SQRING_OFFSETS_RESV2 1 -#define HAVE_STRUCT_IO_URING_FILES_UPDATE 1 -#define HAVE_STRUCT_IO_URING_FILES_UPDATE_FDS 1 -#define HAVE_STRUCT_IO_URING_PARAMS 1 -#define HAVE_STRUCT_IO_URING_PARAMS_CQ_OFF 1 #define HAVE_STRUCT_IO_URING_PARAMS_FEATURES 1 #define HAVE_STRUCT_IO_URING_PARAMS_RESV 1 #define HAVE_STRUCT_IO_URING_PARAMS_WQ_FD 1 -#define HAVE_STRUCT_IO_URING_PROBE 1 -#define HAVE_STRUCT_IO_URING_PROBE_OP 1 -#define HAVE_STRUCT_IO_URING_PROBE_OPS 1 -#define HAVE_STRUCT_IO_URING_PROBE_OP_RESV2 1 #define HAVE_STRUCT_KCMP_EPOLL_SLOT 1 #define HAVE_STRUCT_KEYCTL_KDF_PARAMS 1 #define HAVE_STRUCT_KEYCTL_PKEY_PARAMS 1 @@ -774,17 +527,9 @@ #define HAVE_STRUCT_KVM_REGS 1 #define HAVE_STRUCT_KVM_SREGS 1 #define HAVE_STRUCT_KVM_USERSPACE_MEMORY_REGION 1 -#define HAVE_STRUCT_LOOP_CONFIG 1 -#define HAVE_STRUCT_LOOP_CONFIG___RESERVED 1 #define HAVE_STRUCT_MMSGHDR 1 #define HAVE_STRUCT_MTD_WRITE_REQ 1 -#define HAVE_STRUCT_NDT_CONFIG 1 -#define HAVE_STRUCT_NDT_CONFIG_NDTC_PROXY_QLEN 1 -#define HAVE_STRUCT_NDT_STATS 1 -#define HAVE_STRUCT_NDT_STATS_NDTS_TABLE_FULLS 1 #define HAVE_STRUCT_NETCONFMSG 1 -#define HAVE_STRUCT_OPEN_HOW 1 -#define HAVE_STRUCT_OPEN_HOW_RESOLVE 1 #define HAVE_STRUCT_PERF_EVENT_ATTR_AUX_SAMPLE_SIZE 1 #define HAVE_STRUCT_PERF_EVENT_ATTR_AUX_WATERMARK 1 #define HAVE_STRUCT_PERF_EVENT_ATTR_BP_TYPE 1 @@ -812,14 +557,6 @@ /* #undef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS */ #define HAVE_STRUCT_PTRACE_SYSCALL_INFO 1 /* #undef HAVE_STRUCT_PT_ALL_USER_REGS */ -#define HAVE_STRUCT_RTA_MFC_STATS 1 -#define HAVE_STRUCT_RTA_MFC_STATS_MFCS_WRONG_IF 1 -#define HAVE_STRUCT_RTNL_LINK_STATS 1 -#define HAVE_STRUCT_RTNL_LINK_STATS64 1 -#define HAVE_STRUCT_RTNL_LINK_STATS64_RX_NOHANDLER 1 -#define HAVE_STRUCT_RTNL_LINK_STATS_RX_NOHANDLER 1 -#define HAVE_STRUCT_RTVIA 1 -#define HAVE_STRUCT_RTVIA_RTVIA_ADDR 1 #define HAVE_STRUCT_SIGCONTEXT 1 /* #undef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL */ /* #undef HAVE_STRUCT_SOCKADDR_L2_L2_BDADDR_TYPE */ @@ -838,75 +575,11 @@ #define HAVE_STRUCT_STATX 1 #define HAVE_STRUCT_STAT_ST_MTIME_NSEC 1 #define HAVE_STRUCT_TC_SIZESPEC 1 -#define HAVE_STRUCT_TEE_IOCL_SUPP_RECV_ARG 1 -#define HAVE_STRUCT_TEE_IOCL_SUPP_RECV_ARG_PARAMS 1 -#define HAVE_STRUCT_TEE_IOCL_SUPP_SEND_ARG 1 -#define HAVE_STRUCT_TEE_IOCL_SUPP_SEND_ARG_PARAMS 1 -#define HAVE_STRUCT_TEE_IOCTL_BUF_DATA 1 -#define HAVE_STRUCT_TEE_IOCTL_BUF_DATA_BUF_LEN 1 -#define HAVE_STRUCT_TEE_IOCTL_CANCEL_ARG 1 -#define HAVE_STRUCT_TEE_IOCTL_CANCEL_ARG_SESSION 1 -#define HAVE_STRUCT_TEE_IOCTL_CLOSE_SESSION_ARG 1 -#define HAVE_STRUCT_TEE_IOCTL_CLOSE_SESSION_ARG_SESSION 1 -#define HAVE_STRUCT_TEE_IOCTL_INVOKE_ARG 1 -#define HAVE_STRUCT_TEE_IOCTL_INVOKE_ARG_PARAMS 1 -#define HAVE_STRUCT_TEE_IOCTL_OPEN_SESSION_ARG 1 -#define HAVE_STRUCT_TEE_IOCTL_OPEN_SESSION_ARG_PARAMS 1 -#define HAVE_STRUCT_TEE_IOCTL_PARAM 1 -#define HAVE_STRUCT_TEE_IOCTL_PARAM_C 1 -#define HAVE_STRUCT_TEE_IOCTL_SHM_ALLOC_DATA 1 -#define HAVE_STRUCT_TEE_IOCTL_SHM_ALLOC_DATA_ID 1 -#define HAVE_STRUCT_TEE_IOCTL_SHM_REGISTER_DATA 1 -#define HAVE_STRUCT_TEE_IOCTL_SHM_REGISTER_DATA_ID 1 -#define HAVE_STRUCT_TEE_IOCTL_VERSION_DATA 1 -#define HAVE_STRUCT_TEE_IOCTL_VERSION_DATA_GEN_CAPS 1 #define HAVE_STRUCT_UBI_ATTACH_REQ_MAX_BEB_PER1024 1 +#define HAVE_STRUCT_UBI_MKVOL_REQ_FLAGS 1 #define HAVE_STRUCT_USER_DESC 1 #define HAVE_STRUCT_USER_DESC_LM 1 #define HAVE_STRUCT_UTSNAME_DOMAINNAME 1 -#define HAVE_STRUCT_V4L2_AREA 1 -#define HAVE_STRUCT_V4L2_AREA_HEIGHT 1 -#define HAVE_STRUCT_V4L2_CAPABILITY 1 -#define HAVE_STRUCT_V4L2_CAPABILITY_DEVICE_CAPS 1 -#define HAVE_STRUCT_V4L2_CAPABILITY_RESERVED 1 -#define HAVE_STRUCT_V4L2_CLIP 1 -#define HAVE_STRUCT_V4L2_CLIP_NEXT 1 -#define HAVE_STRUCT_V4L2_CREATE_BUFFERS 1 -#define HAVE_STRUCT_V4L2_CREATE_BUFFERS_RESERVED 1 -#define HAVE_STRUCT_V4L2_EXT_CONTROLS 1 -#define HAVE_STRUCT_V4L2_EXT_CONTROLS_CONTROLS 1 -#define HAVE_STRUCT_V4L2_EXT_CONTROL_STRING 1 -#define HAVE_STRUCT_V4L2_FORMAT 1 -#define HAVE_STRUCT_V4L2_FORMAT_FMT 1 -#define HAVE_STRUCT_V4L2_FORMAT_FMT_PIX_MP 1 -#define HAVE_STRUCT_V4L2_FORMAT_FMT_SDR 1 -#define HAVE_STRUCT_V4L2_FORMAT_FMT_SLICED 1 -#define HAVE_STRUCT_V4L2_FRMIVALENUM 1 -#define HAVE_STRUCT_V4L2_FRMIVALENUM_RESERVED 1 -#define HAVE_STRUCT_V4L2_FRMIVAL_STEPWISE 1 -#define HAVE_STRUCT_V4L2_FRMIVAL_STEPWISE_STEP 1 -#define HAVE_STRUCT_V4L2_FRMSIZEENUM 1 -#define HAVE_STRUCT_V4L2_FRMSIZEENUM_RESERVED 1 -#define HAVE_STRUCT_V4L2_FRMSIZE_DISCRETE 1 -#define HAVE_STRUCT_V4L2_FRMSIZE_DISCRETE_HEIGHT 1 -#define HAVE_STRUCT_V4L2_FRMSIZE_STEPWISE 1 -#define HAVE_STRUCT_V4L2_FRMSIZE_STEPWISE_STEP_HEIGHT 1 -#define HAVE_STRUCT_V4L2_META_FORMAT 1 -#define HAVE_STRUCT_V4L2_PIX_FORMAT 1 -#define HAVE_STRUCT_V4L2_PIX_FORMAT_MPLANE 1 -#define HAVE_STRUCT_V4L2_PIX_FORMAT_XFER_FUNC 1 -#define HAVE_STRUCT_V4L2_PLANE_PIX_FORMAT 1 -#define HAVE_STRUCT_V4L2_PLANE_PIX_FORMAT_RESERVED 1 -#define HAVE_STRUCT_V4L2_SDR_FORMAT 1 -#define HAVE_STRUCT_V4L2_SDR_FORMAT_BUFFERSIZE 1 -#define HAVE_STRUCT_V4L2_SLICED_VBI_CAP 1 -#define HAVE_STRUCT_V4L2_SLICED_VBI_CAP_RESERVED 1 -#define HAVE_STRUCT_V4L2_SLICED_VBI_FORMAT 1 -#define HAVE_STRUCT_V4L2_SLICED_VBI_FORMAT_RESERVED 1 -#define HAVE_STRUCT_V4L2_VBI_FORMAT 1 -#define HAVE_STRUCT_V4L2_VBI_FORMAT_RESERVED 1 -#define HAVE_STRUCT_V4L2_WINDOW 1 -#define HAVE_STRUCT_V4L2_WINDOW_GLOBAL_ALPHA 1 /* #undef HAVE_STRUCT___AIO_SIGSET */ /* #undef HAVE_STRUCT___KERNEL_FLOCK */ /* #undef HAVE_STRUCT___KERNEL_FLOCK64 */ @@ -1048,7 +721,7 @@ /* #undef M32_SIZEOF_LONG */ /* #undef M32_SIZEOF_STRUCT_MSQID64_DS */ /* #undef M68K */ -#define MANPAGE_DATE "2020-11-29" +#define MANPAGE_DATE "2021-02-07" /* #undef METAG */ /* #undef MICROBLAZE */ /* #undef MIPS */ @@ -1060,10 +733,10 @@ #define PACKAGE "strace" #define PACKAGE_BUGREPORT "strace-devel@lists.strace.io" #define PACKAGE_NAME "strace" -#define PACKAGE_STRING "strace 5.10" +#define PACKAGE_STRING "strace 5.11" #define PACKAGE_TARNAME "strace" #define PACKAGE_URL "https://strace.io" -#define PACKAGE_VERSION "5.10" +#define PACKAGE_VERSION "5.11" /* #undef POWERPC */ /* #undef POWERPC64 */ /* #undef POWERPC64LE */ @@ -1101,7 +774,7 @@ # define __EXTENSIONS__ 1 #endif /* #undef USE_UNWINDER */ -#define VERSION "5.10" +#define VERSION "5.11" #if defined AC_APPLE_UNIVERSAL_BUILD # if defined __BIG_ENDIAN__ # define WORDS_BIGENDIAN 1diff --git a/pkg/strace/gen.lua b/pkg/strace/gen.lua@@ -1,9 +1,9 @@ cflags{ '-D HAVE_CONFIG_H', -- it is important that the arch-specific directory is searched first - '-I $srcdir/linux/x86_64', - '-I $srcdir/linux', - '-I $srcdir', + '-I $srcdir/src/linux/x86_64', + '-I $srcdir/src/linux/generic', + '-I $srcdir/src', '-I $outdir', '-isystem $builddir/pkg/linux-headers/include', } @@ -13,7 +13,7 @@ build('cat', '$outdir/config.h', { '$dir/config.h', }) -build('cpp', '$outdir/ioctl_iocdef.i', '$srcdir/ioctl_iocdef.c') +build('cpp', '$outdir/ioctl_iocdef.i', '$srcdir/src/ioctl_iocdef.c') build('sed', '$outdir/ioctl_iocdef.h', '$outdir/ioctl_iocdef.i', { expr=[[-n 's/^DEFINE HOST/#define /p']], }) @@ -22,18 +22,18 @@ sub('tools.ninja', function() toolchain(config.host) cflags{ '-D X86_64=1', - '-I $srcdir/linux/x86_64', - '-I $srcdir/linux', + '-I $srcdir/src/linux/x86_64', + '-I $srcdir/src/linux', '-I $outdir', } for i = 0, 2 do build('cat', '$outdir/ioctls_all'..i..'.h', { - '$srcdir/linux/x86_64/ioctls_inc'..i..'.h', - '$srcdir/linux/x86_64/ioctls_arch'..i..'.h', + '$srcdir/src/linux/x86_64/ioctls_inc'..i..'.h', + '$srcdir/src/linux/x86_64/ioctls_arch'..i..'.h', }) build('cc', '$outdir/ioctlsort'..i..'.c.o', { - '$srcdir/ioctlsort.c', + '$srcdir/src/ioctlsort.c', '|', '$outdir/ioctl_iocdef.h', '$outdir/ioctls_all'..i..'.h', }, {cflags=string.format([[$cflags -D 'IOCTLSORT_INC="ioctls_all%d.h"']], i)}) exe('ioctlsort'..i, {'ioctlsort'..i..'.c.o'}) @@ -44,7 +44,7 @@ end) local mpers = lines('mpers.txt') for _, f in ipairs(mpers) do - build('cpp', '$outdir/'..f..'.mpers.i', {'$srcdir/'..f, '|', '$outdir/config.h'}, { + build('cpp', '$outdir/'..f..'.mpers.i', {'$srcdir/src/'..f, '|', '$outdir/config.h'}, { cflags='$cflags -DIN_MPERS_BOOTSTRAP', }) end @@ -59,283 +59,285 @@ makempers('printers.h', 'printers.awk') makempers('native_printer_decls.h', 'printerdecls.awk') makempers('native_printer_defs.h', 'printerdefs.awk') -build('cpp', '$outdir/syscallent.i', '$srcdir/linux/x86_64/syscallent.h') +build('cpp', '$outdir/syscallent.i', '$srcdir/src/linux/x86_64/syscallent.h') build('awk', '$outdir/scno-syscallent.h', {'$outdir/syscallent.i', '|', '$dir/scno.awk'}, { expr='-f $dir/scno.awk', }) -build('cat', '$outdir/scno.h', {'$srcdir/scno.head', '$outdir/scno-syscallent.h'}) +build('cat', '$outdir/scno.h', {'$srcdir/src/scno.head', '$outdir/scno-syscallent.h'}) -- this seems to be enough syscall headers to build -local syscalls = expand{'$srcdir/linux/', { +local syscalls = expand{'$srcdir/src/linux/', { '32/syscallent.h', '64/syscallent.h', 'arm/syscallent.h', 'i386/syscallent.h', 'sparc/syscallent.h', 'sparc64/syscallent.h', - 'subcall.h', - 'syscallent-common.h', + 'generic/subcallent.h', + 'generic/syscallent-common.h', 'x86_64/syscallent.h', }} build('awk', '$outdir/sen.h', {syscalls, '|', '$dir/sen.awk'}, { expr='-f $dir/sen.awk', }) -local srcs = { - 'access.c', - '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', - 'chdir.c', - 'chmod.c', - 'clone.c', - 'close_range.c', - 'copy_file_range.c', - 'count.c', - 'delay.c', - 'desc.c', - 'dirent.c', - 'dirent64.c', - 'dirent_types.c', - 'dm.c', - 'dup.c', - 'dyxlat.c', - 'epoll.c', - 'error_prints.c', - 'evdev.c', - 'evdev_mpers.c', - 'eventfd.c', - 'execve.c', - 'fadvise.c', - 'fallocate.c', - 'fanotify.c', - 'fchownat.c', - 'fcntl.c', - 'fetch_bpf_fprog.c', - 'fetch_indirect_syscall_args.c', - 'fetch_struct_flock.c', - 'fetch_struct_keyctl_kdf_params.c', - 'fetch_struct_mmsghdr.c', - 'fetch_struct_msghdr.c', - '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', - 'filter_seccomp.c', - 'flock.c', - 'fs_x_ioctl.c', - 'fsconfig.c', - 'fsmount.c', - 'fsopen.c', - 'fspick.c', - 'fstatfs.c', - 'fstatfs64.c', - 'futex.c', - 'get_personality.c', - 'get_robust_list.c', - 'getcpu.c', - 'getcwd.c', - 'getpagesize.c', - 'getpid.c', - 'getrandom.c', - 'hdio.c', - 'hostname.c', - 'inotify.c', - 'inotify_ioctl.c', - 'io.c', - 'io_uring.c', - 'ioctl.c', - 'ioperm.c', - 'iopl.c', - 'ioprio.c', - 'ipc.c', - 'ipc_msg.c', - 'ipc_msgctl.c', - 'ipc_sem.c', - 'ipc_semctl.c', - 'ipc_shm.c', - 'ipc_shmctl.c', - 'kcmp.c', - 'kexec.c', - 'keyctl.c', - 'kvm.c', - 'ldt.c', - 'link.c', - 'listen.c', - 'lookup_dcookie.c', - 'loop.c', - 'lseek.c', - 'mem.c', - 'membarrier.c', - 'memfd_create.c', - 'mknod.c', - 'mmap_cache.c', - 'mmap_notify.c', - 'mmsghdr.c', - 'mount.c', - 'move_mount.c', - 'mq.c', - 'msghdr.c', - 'mtd.c', - 'nbd_ioctl.c', - 'net.c', - 'netlink.c', - 'netlink_crypto.c', - 'netlink_inet_diag.c', - 'netlink_kobject_uevent.c', - 'netlink_netfilter.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', - 'open_tree.c', - 'or1k_atomic.c', - 'pathtrace.c', - 'perf.c', - 'perf_ioctl.c', - 'personality.c', - 'pidfd_getfd.c', - 'pidfd_open.c', - 'pidns.c', - 'pkeys.c', - 'poll.c', - 'prctl.c', - 'print_aio_sigset.c', - 'print_dev_t.c', - 'print_group_req.c', - 'print_ifindex.c', - 'print_instruction_pointer.c', - 'print_kernel_version.c', - 'print_mac.c', - 'print_mq_attr.c', - 'print_msgbuf.c', - 'print_sg_req_info.c', - 'print_sigevent.c', - 'print_statfs.c', - 'print_struct_stat.c', - 'print_syscall_number.c', - 'print_time.c', - 'print_timespec32.c', - 'print_timespec64.c', - 'print_timeval.c', - 'print_timeval64.c', - 'print_timex.c', - 'printmode.c', - 'printrusage.c', - 'printsiginfo.c', - 'process.c', - 'process_vm.c', - 'ptp.c', - 'ptrace_syscall_info.c', - 'quota.c', - 'random_ioctl.c', - 'readahead.c', - 'readlink.c', - 'reboot.c', - 'renameat.c', - 'resource.c', - 'retval.c', - 'riscv.c', - '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', - 's390.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', - 'sigreturn.c', - 'sock.c', - 'sockaddr.c', - 'socketcall.c', - 'socketutils.c', - 'sparc.c', - 'sram_alloc.c', - 'stage_output.c', - 'stat.c', - 'stat64.c', - 'statfs.c', - 'statfs64.c', - 'statx.c', - 'string_to_uint.c', - 'swapon.c', - 'sync_file_range.c', - 'sync_file_range2.c', - 'syscall.c', - 'sysctl.c', - 'sysinfo.c', - 'syslog.c', - 'sysmips.c', - 'tee.c', - 'term.c', - 'time.c', - 'times.c', - 'trie.c', - 'truncate.c', - 'ubi.c', - 'ucopy.c', - 'uid.c', - 'uid16.c', - 'umask.c', - 'umount.c', - 'uname.c', - 'upeek.c', - 'upoke.c', - 'userfaultfd.c', - 'ustat.c', - 'util.c', - 'utime.c', - 'utimes.c', - 'v4l2.c', - 'wait.c', - 'watchdog_ioctl.c', - 'xattr.c', - 'xgetdents.c', - 'xlat.c', - 'xmalloc.c', -} +local srcs = paths[[src/( + access.c + 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 + chdir.c + chmod.c + clone.c + close_range.c + copy_file_range.c + count.c + delay.c + desc.c + dirent.c + dirent64.c + dirent_types.c + dm.c + dup.c + dyxlat.c + epoll.c + error_prints.c + evdev.c + evdev_mpers.c + eventfd.c + execve.c + fadvise.c + fallocate.c + fanotify.c + fchownat.c + fcntl.c + fetch_bpf_fprog.c + fetch_indirect_syscall_args.c + fetch_struct_flock.c + fetch_struct_keyctl_kdf_params.c + fetch_struct_mmsghdr.c + fetch_struct_msghdr.c + fetch_struct_stat.c + fetch_struct_stat64.c + fetch_struct_statfs.c + fetch_struct_xfs_quotastat.c + file_handle.c + filter_qualify.c + filter_seccomp.c + flock.c + fs_0x94_ioctl.c + fs_f_ioctl.c + fs_x_ioctl.c + fsconfig.c + fsmount.c + fsopen.c + fspick.c + fstatfs.c + fstatfs64.c + futex.c + get_personality.c + get_robust_list.c + getcpu.c + getcwd.c + getpagesize.c + getpid.c + getrandom.c + gpio_ioctl.c + hdio.c + hostname.c + inotify.c + inotify_ioctl.c + io.c + io_uring.c + ioctl.c + ioperm.c + ioprio.c + ipc.c + ipc_msg.c + ipc_msgctl.c + ipc_sem.c + ipc_semctl.c + ipc_shm.c + ipc_shmctl.c + kcmp.c + kexec.c + keyctl.c + kvm.c + ldt.c + link.c + listen.c + lookup_dcookie.c + loop.c + lseek.c + mem.c + membarrier.c + memfd_create.c + mknod.c + mmap_cache.c + mmap_notify.c + mmsghdr.c + mount.c + move_mount.c + mq.c + msghdr.c + mtd.c + nbd_ioctl.c + net.c + netlink.c + netlink_crypto.c + netlink_inet_diag.c + netlink_kobject_uevent.c + netlink_netfilter.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 + open_tree.c + or1k_atomic.c + pathtrace.c + perf.c + perf_ioctl.c + personality.c + pidfd_getfd.c + pidfd_open.c + pidns.c + pkeys.c + poke.c + poll.c + prctl.c + print_kernel_sigset.c + print_dev_t.c + print_group_req.c + print_ifindex.c + print_instruction_pointer.c + print_kernel_version.c + print_mac.c + print_mq_attr.c + print_msgbuf.c + print_sg_req_info.c + print_sigevent.c + print_statfs.c + print_struct_stat.c + print_syscall_number.c + print_time.c + print_timespec32.c + print_timespec64.c + print_timeval.c + print_timeval64.c + print_timex.c + printmode.c + printrusage.c + printsiginfo.c + process.c + process_vm.c + ptp.c + ptrace_syscall_info.c + quota.c + random_ioctl.c + readahead.c + readlink.c + reboot.c + renameat.c + resource.c + retval.c + riscv.c + 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 + s390.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 + sigreturn.c + sock.c + sockaddr.c + socketcall.c + socketutils.c + sparc.c + sram_alloc.c + stage_output.c + stat.c + stat64.c + statfs.c + statfs64.c + statx.c + string_to_uint.c + swapon.c + sync_file_range.c + sync_file_range2.c + syscall.c + sysctl.c + sysinfo.c + syslog.c + sysmips.c + tee.c + term.c + time.c + times.c + trie.c + truncate.c + ubi.c + ucopy.c + uid.c + uid16.c + umask.c + umount.c + uname.c + upeek.c + upoke.c + userfaultfd.c + ustat.c + util.c + utime.c + utimes.c + v4l2.c + wait.c + watchdog_ioctl.c + xattr.c + xgetdents.c + xlat.c + xmalloc.c +)]] build('sed', '$outdir/sys_func.h', expand{'$srcdir/', srcs}, { expr=[[-n 's/^SYS_FUNC(.*/extern &;/p']], @@ -356,8 +358,8 @@ pkg.deps = { } lib('libstrace.a', srcs) -exe('strace', {'strace.c', 'libstrace.a'}) +exe('strace', {'src/strace.c', 'libstrace.a'}) file('bin/strace', '755', '$outdir/strace') -man{'strace.1'} +man{'doc/strace.1'} fetch 'curl'diff --git a/pkg/strace/mpers.txt b/pkg/strace/mpers.txt@@ -1,4 +1,4 @@ -# 2,<awk '/^mpers_source_files =/ {for (i=3; i<=NF; ++i) print $i}' src/mpers.am +# 2,<awk '/^mpers_source_files =/ {for (i=3; i<=NF; ++i) print $i}' src/src/mpers.am block.c btrfs.c dirent.c @@ -19,7 +19,7 @@ ipc_shmctl.c loop.c mtd.c perf_ioctl.c -print_aio_sigset.c +print_kernel_sigset.c print_group_req.c print_mq_attr.c print_msgbuf.cdiff --git a/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch b/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch@@ -1,17 +1,17 @@ -From 5c0b5a421c4dd366e75945fbcba2591835d6e7ed Mon Sep 17 00:00:00 2001 +From 5df1446d7d0c88d93e063b17b6ec9b872d13f1f8 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Fri, 5 Jul 2019 20:52:24 -0700 Subject: [PATCH] Don't return expression in void function --- - defs.h | 2 +- + src/defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/defs.h b/defs.h -index 7151e90c..656c04a5 100644 ---- a/defs.h -+++ b/defs.h -@@ -704,7 +704,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *); +diff --git a/src/defs.h b/src/defs.h +index 3475d36a2..518e57346 100644 +--- a/src/defs.h ++++ b/src/defs.h +@@ -722,7 +722,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *); static inline void pathtrace_select(const char *path) { @@ -21,5 +21,5 @@ index 7151e90c..656c04a5 100644 static inline bool -- -2.28.0 +2.30.0diff --git a/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch b/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch@@ -1,63 +1,94 @@ -From 4df6fee4836c6ecceb33221ec93f36592973bd12 Mon Sep 17 00:00:00 2001 +From 62a54ba2c7356ade3e2eb7f66647410daafc5718 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 6 Jul 2019 01:33:01 -0700 Subject: [PATCH] Use __typeof__ spelling of typeof --- - btrfs.c | 8 ++++---- - defs.h | 4 ++-- - file_ioctl.c | 4 ++-- - gcc_compat.h | 2 +- - list.h | 10 +++++----- + src/btrfs.c | 12 ++++++------ + src/defs.h | 6 +++--- + src/fs_0x94_ioctl.c | 2 +- + src/fs_f_ioctl.c | 2 +- + src/gcc_compat.h | 2 +- + src/list.h | 10 +++++----- + src/macros.h | 2 +- + src/net.c | 2 +- + src/ubi.c | 2 +- tests/btrfs.c | 2 +- tests/fcntl-common.c | 2 +- - 7 files changed, 16 insertions(+), 16 deletions(-) + 11 files changed, 22 insertions(+), 22 deletions(-) -diff --git a/btrfs.c b/btrfs.c -index 77ce151f..6e6cb721 100644 ---- a/btrfs.c -+++ b/btrfs.c -@@ -248,7 +248,7 @@ btrfs_print_logical_ino_container(struct tcb *tcp, - tprints(", ..."); +diff --git a/src/btrfs.c b/src/btrfs.c +index eb6f7e02b..819fcf084 100644 +--- a/src/btrfs.c ++++ b/src/btrfs.c +@@ -214,7 +214,7 @@ btrfs_print_logical_ino_container(struct tcb *tcp, + tprint_more_data_follows(); } else { const uint64_t val_addr = - inodes_addr + offsetof(typeof(container), val); + inodes_addr + offsetof(__typeof__(container), val); uint64_t record[3]; - tprints(", val="); - print_array(tcp, val_addr, container.elem_cnt / 3, -@@ -287,7 +287,7 @@ btrfs_print_ino_path_container(struct tcb *tcp, - tprints(", ..."); + tprint_struct_next(); + tprints_field_name("val"); +@@ -255,7 +255,7 @@ btrfs_print_ino_path_container(struct tcb *tcp, + tprint_more_data_follows(); } else { uint64_t val_addr = - fspath_addr + offsetof(typeof(container), val); + fspath_addr + offsetof(__typeof__(container), val); uint64_t offset; - tprints(", val="); - print_array(tcp, val_addr, container.elem_cnt, -@@ -320,7 +320,7 @@ btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr) - } else { + tprint_struct_next(); + tprints_field_name("val"); +@@ -296,7 +296,7 @@ btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr) uint64_t record; - tprints(", qgroups="); + tprint_struct_next(); + tprints_field_name("qgroups"); - print_array(tcp, qgi_addr + offsetof(typeof(inherit), qgroups), + print_array(tcp, qgi_addr + offsetof(__typeof__(inherit), qgroups), inherit.num_qgroups, &record, sizeof(record), tfetch_mem, print_uint64_array_member, 0); } -@@ -1139,7 +1139,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, - } else { +@@ -1137,7 +1137,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, + PRINT_FIELD_OBJ_PTR(args, key, + print_btrfs_ioctl_search_key, + entering(tcp), !abbrev(tcp)); +- decode_search_arg_buf(tcp, arg + offsetof(typeof(args), buf), ++ decode_search_arg_buf(tcp, arg + offsetof(__typeof__(args), buf), + sizeof(args.buf), args.key.nr_items); + tprint_struct_end(); + if (entering(tcp)) +@@ -1173,7 +1173,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, + entering(tcp), !abbrev(tcp)); + tprint_struct_next(); + PRINT_FIELD_U(args, buf_size); +- decode_search_arg_buf(tcp, arg + offsetof(typeof(args), buf), ++ decode_search_arg_buf(tcp, arg + offsetof(__typeof__(args), buf), + args.buf_size, args.key.nr_items); + tprint_struct_end(); + if (entering(tcp)) +@@ -1250,7 +1250,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, struct btrfs_ioctl_space_info info; - tprints(", spaces="); + tprint_struct_next(); + tprints_field_name("spaces"); - print_array(tcp, arg + offsetof(typeof(args), spaces), + print_array(tcp, arg + offsetof(__typeof__(args), spaces), args.total_spaces, &info, sizeof(info), tfetch_mem, print_btrfs_ioctl_space_info, 0); -diff --git a/defs.h b/defs.h -index 656c04a5..732542e4 100644 ---- a/defs.h -+++ b/defs.h -@@ -1760,8 +1760,8 @@ scno_is_valid(kernel_ulong_t scno) +diff --git a/src/defs.h b/src/defs.h +index 518e57346..00a36249e 100644 +--- a/src/defs.h ++++ b/src/defs.h +@@ -1039,7 +1039,7 @@ print_local_array_ex(struct tcb *tcp, + # define print_local_array_upto(tcp_, start_addr_, upto_, print_func_) \ + print_local_array_ex((tcp_), (start_addr_), \ + CLAMP((upto_), 0, \ +- (typeof(upto_)) ARRAY_SIZE(start_addr_)), \ ++ (__typeof__(upto_)) ARRAY_SIZE(start_addr_)), \ + sizeof((start_addr_)[0]), (print_func_), \ + NULL, 0, NULL, NULL) + +@@ -1805,8 +1805,8 @@ scno_is_valid(kernel_ulong_t scno) # define ILOG2_ITER_(val_, ret_, bit_) \ do { \ @@ -68,32 +99,36 @@ index 656c04a5..732542e4 100644 << (1 << (bit_))) - 1)) << (bit_); \ (val_) >>= shift_; \ (ret_) |= shift_; \ -diff --git a/file_ioctl.c b/file_ioctl.c -index d9a07ab0..63c2bcb3 100644 ---- a/file_ioctl.c -+++ b/file_ioctl.c -@@ -157,7 +157,7 @@ file_ioctl(struct tcb *const tcp, const unsigned int code, - if (abbrev(tcp) && args.dest_count > count) - limit = &count; +diff --git a/src/fs_0x94_ioctl.c b/src/fs_0x94_ioctl.c +index f42ec2f0c..65381ec1b 100644 +--- a/src/fs_0x94_ioctl.c ++++ b/src/fs_0x94_ioctl.c +@@ -95,7 +95,7 @@ decode_file_dedupe_range(struct tcb *const tcp, const kernel_ulong_t arg) + if (abbrev(tcp) && range.dest_count > count) + limit = &count; -- rc = print_array(tcp, arg + offsetof(typeof(args), info), -+ rc = print_array(tcp, arg + offsetof(__typeof__(args), info), - args.dest_count, &info, sizeof(info), - tfetch_mem, - print_file_dedupe_range_info, limit); -@@ -202,7 +202,7 @@ file_ioctl(struct tcb *const tcp, const unsigned int code, - struct fiemap_extent fe; - tprints(", fm_extents="); - print_array(tcp, -- arg + offsetof(typeof(args), fm_extents), -+ arg + offsetof(__typeof__(args), fm_extents), - args.fm_mapped_extents, &fe, sizeof(fe), - tfetch_mem, - print_fiemap_extent, 0); -diff --git a/gcc_compat.h b/gcc_compat.h -index 4c23ebc9..8eaa54bf 100644 ---- a/gcc_compat.h -+++ b/gcc_compat.h +- rc = print_array(tcp, arg + offsetof(typeof(range), info), ++ rc = print_array(tcp, arg + offsetof(__typeof__(range), info), + range.dest_count, &info, sizeof(info), + tfetch_mem, + print_file_dedupe_range_info, limit); +diff --git a/src/fs_f_ioctl.c b/src/fs_f_ioctl.c +index 4509f3d58..f763cad8d 100644 +--- a/src/fs_f_ioctl.c ++++ b/src/fs_f_ioctl.c +@@ -72,7 +72,7 @@ decode_fiemap(struct tcb *const tcp, const kernel_ulong_t arg) + struct fiemap_extent fe; + tprint_struct_next(); + tprints_field_name("fm_extents"); +- print_array(tcp, arg + offsetof(typeof(args), fm_extents), ++ print_array(tcp, arg + offsetof(__typeof__(args), fm_extents), + args.fm_mapped_extents, &fe, sizeof(fe), + tfetch_mem, print_fiemap_extent, 0); + } +diff --git a/src/gcc_compat.h b/src/gcc_compat.h +index 9b9bc9389..65f47f73f 100644 +--- a/src/gcc_compat.h ++++ b/src/gcc_compat.h @@ -59,7 +59,7 @@ # endif @@ -103,10 +138,10 @@ index 4c23ebc9..8eaa54bf 100644 # define FAIL_BUILD_ON_ZERO(expr) (sizeof(int[-1 + 2 * !!(expr)]) * 0) /* &(a)[0] is a pointer and not an array, shouldn't be treated as the same */ # define MUST_BE_ARRAY(a) FAIL_BUILD_ON_ZERO(!SAME_TYPE((a), &(a)[0])) -diff --git a/list.h b/list.h -index ddaf33ca..bf747a4b 100644 ---- a/list.h -+++ b/list.h +diff --git a/src/list.h b/src/list.h +index 4de4cb3be..f4ec11f0e 100644 +--- a/src/list.h ++++ b/src/list.h @@ -158,7 +158,7 @@ list_is_empty(const struct list_item *l) * @param field Name of the field that holds the respective struct list_item. */ @@ -145,11 +180,50 @@ index ddaf33ca..bf747a4b 100644 &var_->field_ != head_; var_ = _tmp, _tmp = list_next(_tmp, field_)) #endif /* !STRACE_LIST_H */ +diff --git a/src/macros.h b/src/macros.h +index 467f5d042..be54782bf 100644 +--- a/src/macros.h ++++ b/src/macros.h +@@ -39,7 +39,7 @@ + + # define sizeof_field(type_, member_) (sizeof(((type_ *)0)->member_)) + +-# define typeof_field(type_, member_) typeof(((type_ *)0)->member_) ++# define typeof_field(type_, member_) __typeof__(((type_ *)0)->member_) + + # ifndef offsetofend + # define offsetofend(type_, member_) \ +diff --git a/src/net.c b/src/net.c +index 9942df21a..dc62e59cb 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -459,7 +459,7 @@ SYS_FUNC(socketpair) + #define MAYBE_PRINT_FIELD_LEN(print_prefix_, where_, field_, \ + len_, print_func_, ...) \ + do { \ +- unsigned int start = offsetof(typeof(where_), field_); \ ++ unsigned int start = offsetof(__typeof__(where_), field_); \ + unsigned int end = start + sizeof(where_.field_); \ + if (len_ > start) { \ + print_prefix_; \ +diff --git a/src/ubi.c b/src/ubi.c +index 93cec79c4..9047df640 100644 +--- a/src/ubi.c ++++ b/src/ubi.c +@@ -84,7 +84,7 @@ static bool + print_ubi_rnvol_req_ent_array_member(struct tcb *tcp, void *elem_buf, + size_t elem_size, void *data) + { +- typeof(&((struct ubi_rnvol_req *) NULL)->ents[0]) p = elem_buf; ++ __typeof__(&((struct ubi_rnvol_req *) NULL)->ents[0]) p = elem_buf; + + tprint_struct_begin(); + PRINT_FIELD_D(*p, vol_id); diff --git a/tests/btrfs.c b/tests/btrfs.c -index 2a474dc4..2423f65e 100644 +index fd240259c..6d98c0b9c 100644 --- a/tests/btrfs.c +++ b/tests/btrfs.c -@@ -954,7 +954,7 @@ btrfs_print_tree_search_buf(struct btrfs_ioctl_search_key *key, +@@ -849,7 +849,7 @@ btrfs_print_tree_search_buf(struct btrfs_ioctl_search_key *key, printf("buf=["); for (i = 0; i < key->nr_items; i++) { struct btrfs_ioctl_search_header *sh; @@ -159,7 +233,7 @@ index 2a474dc4..2423f65e 100644 printf(", "); printf("{transid=%" PRI__u64 ", objectid=", diff --git a/tests/fcntl-common.c b/tests/fcntl-common.c -index ec18aa79..637bb405 100644 +index 155166617..ebc2e07aa 100644 --- a/tests/fcntl-common.c +++ b/tests/fcntl-common.c @@ -22,7 +22,7 @@ @@ -172,5 +246,5 @@ index ec18aa79..637bb405 100644 # define TYPEOF_FLOCK_OFF_T off_t #endif -- -2.28.0 +2.30.0diff --git a/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch b/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch@@ -1,4 +1,4 @@ -From 4c3d1d35211e789a14352787f16c2db2fc6293f7 Mon Sep 17 00:00:00 2001 +From b1d79a14c7df4f1698ac2243873a3b09b22cf8bb Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 6 Jul 2019 01:40:36 -0700 Subject: [PATCH] Make tcp_sysent a static inline function @@ -6,14 +6,14 @@ Subject: [PATCH] Make tcp_sysent a static inline function This way we can include the second operand to the conditional operator without evaluating the macro argument multiple times. --- - defs.h | 8 ++++++-- + src/defs.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/defs.h b/defs.h -index 732542e4..e7ff7d0b 100644 ---- a/defs.h -+++ b/defs.h -@@ -374,8 +374,12 @@ struct tcb { +diff --git a/src/defs.h b/src/defs.h +index 00a36249e..2768fcd46 100644 +--- a/src/defs.h ++++ b/src/defs.h +@@ -386,8 +386,12 @@ struct tcb { # define syscall_tampered_nofail(tcp) ((tcp)->flags & TCB_TAMPERED_NO_FAIL) # define has_seccomp_filter(tcp) ((tcp)->flags & TCB_SECCOMP_FILTER) @@ -29,5 +29,5 @@ index 732542e4..e7ff7d0b 100644 # include "xlat.h" -- -2.28.0 +2.30.0diff --git a/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch b/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch@@ -1,14 +1,14 @@ -From d57542b29ffe81ac355c2889aa5cf326b60e7d67 Mon Sep 17 00:00:00 2001 +From d98579a234b81512a4def2bc740457fcd0637ac2 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 6 Jul 2019 01:54:05 -0700 Subject: [PATCH] Avoid empty initializer lists --- - bpf.c | 4 ++-- - net.c | 2 +- - sched.c | 2 +- - signal.c | 2 +- - strace.c | 2 +- + src/bpf.c | 4 ++-- + src/net.c | 2 +- + src/sched.c | 2 +- + src/signal.c | 2 +- + src/strace.c | 2 +- tests/btrfs.c | 8 ++++---- tests/clock_nanosleep.c | 2 +- tests/nanosleep.c | 2 +- @@ -19,11 +19,11 @@ Subject: [PATCH] Avoid empty initializer lists tests/waitid.c | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) -diff --git a/bpf.c b/bpf.c -index 0ec33ba4..16cbf257 100644 ---- a/bpf.c -+++ b/bpf.c -@@ -43,7 +43,7 @@ bpf_cmd_decoder(struct tcb *const tcp, \ +diff --git a/src/bpf.c b/src/bpf.c +index 7d2f4b85d..4e8bbe09a 100644 +--- a/src/bpf.c ++++ b/src/bpf.c +@@ -42,7 +42,7 @@ bpf_cmd_decoder(struct tcb *const tcp, \ #define BEGIN_BPF_CMD_DECODER(bpf_cmd) \ static DECL_BPF_CMD_DECODER(decode_ ## bpf_cmd) \ { \ @@ -32,7 +32,7 @@ index 0ec33ba4..16cbf257 100644 const size_t attr_size = bpf_cmd ## _struct_size; \ const unsigned int len = MIN(size, attr_size); \ memcpy(&attr, data, len); \ -@@ -150,7 +150,7 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len) +@@ -153,7 +153,7 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len) if (abbrev(tcp)) { printaddr(addr); } else { @@ -41,11 +41,11 @@ index 0ec33ba4..16cbf257 100644 struct ebpf_insn insn; print_array(tcp, addr, len, &insn, sizeof(insn), -diff --git a/net.c b/net.c -index 2099f0ac..316cecf2 100644 ---- a/net.c -+++ b/net.c -@@ -655,7 +655,7 @@ print_tpacket_stats(struct tcb *const tcp, const kernel_ulong_t addr, +diff --git a/src/net.c b/src/net.c +index dc62e59cb..c80958500 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -681,7 +681,7 @@ print_tpacket_stats(struct tcb *const tcp, const kernel_ulong_t addr, static void print_icmp_filter(struct tcb *const tcp, const kernel_ulong_t addr, int len) { @@ -54,11 +54,11 @@ index 2099f0ac..316cecf2 100644 if (len > (int) sizeof(filter)) len = sizeof(filter); -diff --git a/sched.c b/sched.c -index ff427e48..2f46a836 100644 ---- a/sched.c -+++ b/sched.c -@@ -99,7 +99,7 @@ static void +diff --git a/src/sched.c b/src/sched.c +index a9bbe64ff..661077e2f 100644 +--- a/src/sched.c ++++ b/src/sched.c +@@ -97,7 +97,7 @@ static void print_sched_attr(struct tcb *const tcp, const kernel_ulong_t addr, unsigned int usize) { @@ -67,11 +67,11 @@ index ff427e48..2f46a836 100644 unsigned int size; bool is_set = false; -diff --git a/signal.c b/signal.c -index 49b4ebd5..a809d260 100644 ---- a/signal.c -+++ b/signal.c -@@ -246,7 +246,7 @@ print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr, +diff --git a/src/signal.c b/src/signal.c +index 5fc0789c3..cdea7f5b8 100644 +--- a/src/signal.c ++++ b/src/signal.c +@@ -249,7 +249,7 @@ print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr, printaddr(addr); return; } @@ -80,11 +80,11 @@ index 49b4ebd5..a809d260 100644 if (umoven_or_printaddr(tcp, addr, len, mask)) return; tprints(sprintsigmask_n("", mask, len)); -diff --git a/strace.c b/strace.c -index 2897195c..280f1a68 100644 ---- a/strace.c -+++ b/strace.c -@@ -3381,7 +3381,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig) +diff --git a/src/strace.c b/src/strace.c +index ab82a9908..24180a15f 100644 +--- a/src/strace.c ++++ b/src/strace.c +@@ -3387,7 +3387,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig) syscall_entering_finish(tcp, res); return res; } else { @@ -94,10 +94,10 @@ index 2897195c..280f1a68 100644 if (res != 0) { res = syscall_exiting_trace(tcp, &ts, res); diff --git a/tests/btrfs.c b/tests/btrfs.c -index 2423f65e..3b5ade66 100644 +index 6d98c0b9c..a0e587479 100644 --- a/tests/btrfs.c +++ b/tests/btrfs.c -@@ -382,7 +382,7 @@ btrfs_test_subvol_ioctls(void) +@@ -279,7 +279,7 @@ btrfs_test_subvol_ioctls(void) char *long_subvol_name; void *bad_pointer = (void *) (unsigned long) 0xdeadbeeffffffeedULL; uint64_t u64val = 0xdeadbeefbadc0dedULL; @@ -106,7 +106,7 @@ index 2423f65e..3b5ade66 100644 struct btrfs_ioctl_vol_args_v2 vol_args_v2 = { .fd = 2, .flags = max_flags_plus_one(2), -@@ -629,7 +629,7 @@ btrfs_test_balance_ioctls(void) +@@ -526,7 +526,7 @@ btrfs_test_balance_ioctls(void) .devid = 1, }, }; @@ -115,7 +115,7 @@ index 2423f65e..3b5ade66 100644 ioctl(-1, BTRFS_IOC_BALANCE_CTL, 1); printf("ioctl(-1, %s, %sBTRFS_BALANCE_CTL_PAUSE%s) = -1 EBADF (%m)\n", -@@ -841,7 +841,7 @@ btrfs_print_defrag_range_args(struct btrfs_ioctl_defrag_range_args *args, +@@ -736,7 +736,7 @@ btrfs_print_defrag_range_args(struct btrfs_ioctl_defrag_range_args *args, static void btrfs_test_defrag_ioctls(void) { @@ -124,7 +124,7 @@ index 2423f65e..3b5ade66 100644 struct btrfs_ioctl_defrag_range_args args = { .start = 0, .len = -1ULL, -@@ -1170,7 +1170,7 @@ btrfs_test_ino_lookup_ioctl(void) +@@ -1065,7 +1065,7 @@ btrfs_test_ino_lookup_ioctl(void) static void btrfs_test_space_info_ioctl(void) { @@ -134,7 +134,7 @@ index 2423f65e..3b5ade66 100644 ioctl(-1, BTRFS_IOC_SPACE_INFO, NULL); printf("ioctl(-1, %s, NULL) = -1 EBADF (%m)\n", diff --git a/tests/clock_nanosleep.c b/tests/clock_nanosleep.c -index 854fdb3f..0de48963 100644 +index 51bd0d7f7..a1053fd1e 100644 --- a/tests/clock_nanosleep.c +++ b/tests/clock_nanosleep.c @@ -39,7 +39,7 @@ main(void) @@ -147,7 +147,7 @@ index 854fdb3f..0de48963 100644 const struct itimerval itv = { .it_interval.tv_usec = 222222, diff --git a/tests/nanosleep.c b/tests/nanosleep.c -index d55b395c..e41b6b1f 100644 +index 8ff6a86b8..6377f38ee 100644 --- a/tests/nanosleep.c +++ b/tests/nanosleep.c @@ -53,7 +53,7 @@ main(void) @@ -160,7 +160,7 @@ index d55b395c..e41b6b1f 100644 const struct itimerval itv = { .it_value.tv_usec = 111111 }; diff --git a/tests/restart_syscall.c b/tests/restart_syscall.c -index a42d3b9b..3e48b1c1 100644 +index e4e83dc09..da83d1dc7 100644 --- a/tests/restart_syscall.c +++ b/tests/restart_syscall.c @@ -26,7 +26,7 @@ main(void) @@ -173,7 +173,7 @@ index a42d3b9b..3e48b1c1 100644 const struct itimerval itv = { .it_value.tv_usec = 111111 }; const struct timespec req = { .tv_nsec = 222222222 }; diff --git a/tests/setrlimit.c b/tests/setrlimit.c -index 886cf65a..89ed1077 100644 +index d4953f6f8..60d54fbd8 100644 --- a/tests/setrlimit.c +++ b/tests/setrlimit.c @@ -39,7 +39,7 @@ main(void) @@ -186,7 +186,7 @@ index 886cf65a..89ed1077 100644 continue; rlimit[0] = libc_rlim.rlim_cur; diff --git a/tests/timer_create.c b/tests/timer_create.c -index 2c4dae19..59bc2dd0 100644 +index 1059a01d8..692eecf03 100644 --- a/tests/timer_create.c +++ b/tests/timer_create.c @@ -26,7 +26,7 @@ main(void) @@ -199,7 +199,7 @@ index 2c4dae19..59bc2dd0 100644 .sigev_notify = 0xdefaced, .sigev_signo = 0xfacefeed, diff --git a/tests/wait4.c b/tests/wait4.c -index 048e6225..b7bf7c8a 100644 +index faf9423f8..eacee2366 100644 --- a/tests/wait4.c +++ b/tests/wait4.c @@ -89,7 +89,7 @@ k_wait4(const unsigned int pid, void const *wstatus, @@ -212,7 +212,7 @@ index 048e6225..b7bf7c8a 100644 assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0); diff --git a/tests/waitid.c b/tests/waitid.c -index 8716fa08..4ec091f4 100644 +index a14899530..b08881ae7 100644 --- a/tests/waitid.c +++ b/tests/waitid.c @@ -130,7 +130,7 @@ do_waitid(const unsigned int idtype, @@ -225,5 +225,5 @@ index 8716fa08..4ec091f4 100644 assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0); -- -2.28.0 +2.30.0diff --git a/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch b/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch@@ -1,41 +1,41 @@ -From a5642a0735182fca95b8a1191df91233f88393a0 Mon Sep 17 00:00:00 2001 +From 39bde60243deec54676cd119f08192a1c8f7b06b Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sun, 7 Jul 2019 21:25:13 -0700 Subject: [PATCH] Avoid pointer arithmetic on `void *` --- - netlink_smc_diag.c | 4 ++-- - print_timespec.h | 6 ++++-- - sockaddr.c | 2 +- - ucopy.c | 8 ++++---- - 4 files changed, 11 insertions(+), 9 deletions(-) + src/netlink_smc_diag.c | 4 ++-- + src/print_timespec.h | 6 ++++-- + src/sockaddr.c | 2 +- + src/ucopy.c | 10 +++++----- + 4 files changed, 12 insertions(+), 10 deletions(-) -diff --git a/netlink_smc_diag.c b/netlink_smc_diag.c -index 16815fde..09a748a8 100644 ---- a/netlink_smc_diag.c -+++ b/netlink_smc_diag.c +diff --git a/src/netlink_smc_diag.c b/src/netlink_smc_diag.c +index 7d2872dc9..fd6c276cb 100644 +--- a/src/netlink_smc_diag.c ++++ b/src/netlink_smc_diag.c @@ -41,7 +41,7 @@ DECL_NETLINK_DIAG_DECODER(decode_smc_diag_req) if (len >= sizeof(req)) { if (!umoven_or_printaddr(tcp, addr + offset, sizeof(req) - offset, - (void *) &req + offset)) { + (char *) &req + offset)) { - PRINT_FIELD_FLAGS("", req, diag_ext, + PRINT_FIELD_FLAGS(req, diag_ext, smc_diag_extended_flags, "1<<SMC_DIAG_\?\?\?-1"); -@@ -212,7 +212,7 @@ DECL_NETLINK_DIAG_DECODER(decode_smc_diag_msg) +@@ -250,7 +250,7 @@ DECL_NETLINK_DIAG_DECODER(decode_smc_diag_msg) if (len >= sizeof(msg)) { if (!umoven_or_printaddr(tcp, addr + offset, sizeof(msg) - offset, - (void *) &msg + offset)) { + (char *) &msg + offset)) { - PRINT_FIELD_XVAL("", msg, diag_state, + PRINT_FIELD_XVAL(msg, diag_state, smc_states, "SMC_???"); - PRINT_FIELD_XVAL(", ", msg, diag_fallback, -diff --git a/print_timespec.h b/print_timespec.h -index 0f0e296d..4449f857 100644 ---- a/print_timespec.h -+++ b/print_timespec.h + tprint_struct_next(); +diff --git a/src/print_timespec.h b/src/print_timespec.h +index feb6599f1..3351755cb 100644 +--- a/src/print_timespec.h ++++ b/src/print_timespec.h @@ -67,6 +67,8 @@ bool PRINT_TIMESPEC_ARRAY_DATA_SIZE(const void *arg, const unsigned int nmemb, const size_t size) @@ -58,11 +58,11 @@ index 0f0e296d..4449f857 100644 } tprints("]"); -diff --git a/sockaddr.c b/sockaddr.c -index b0046331..35e36392 100644 ---- a/sockaddr.c -+++ b/sockaddr.c -@@ -481,7 +481,7 @@ print_sockaddr_data_ll(struct tcb *tcp, const void *const buf, +diff --git a/src/sockaddr.c b/src/sockaddr.c +index ca8c86ce8..1f2ee0122 100644 +--- a/src/sockaddr.c ++++ b/src/sockaddr.c +@@ -497,7 +497,7 @@ print_sockaddr_data_ll(struct tcb *tcp, const void *const buf, static void print_sockaddr_data_raw(const void *const buf, const int addrlen) { @@ -70,12 +70,12 @@ index b0046331..35e36392 100644 + const char *const data = (const char *)buf + SIZEOF_SA_FAMILY; const int datalen = addrlen - SIZEOF_SA_FAMILY; - tprints("sa_data="); -diff --git a/ucopy.c b/ucopy.c -index 59af8641..3ff59781 100644 ---- a/ucopy.c -+++ b/ucopy.c -@@ -165,7 +165,7 @@ vm_read_mem(const pid_t pid, void *laddr, + tprints_field_name("sa_data"); +diff --git a/src/ucopy.c b/src/ucopy.c +index 6cebb8e26..e8ca2ad5d 100644 +--- a/src/ucopy.c ++++ b/src/ucopy.c +@@ -186,7 +186,7 @@ vm_read_mem(const pid_t pid, void *laddr, break; len = next_len; @@ -84,7 +84,7 @@ index 59af8641..3ff59781 100644 page_start += page_size; taddr = page_start; } -@@ -227,7 +227,7 @@ umoven_peekdata(const int pid, kernel_ulong_t addr, unsigned int len, +@@ -278,7 +278,7 @@ umoven_peekdata(const int pid, kernel_ulong_t addr, unsigned int len, memcpy(laddr, &u.x[residue], m); residue = 0; addr += sizeof(long); @@ -93,7 +93,7 @@ index 59af8641..3ff59781 100644 nread += m; len -= m; } -@@ -324,10 +324,10 @@ umovestr_peekdata(const int pid, kernel_ulong_t addr, unsigned int len, +@@ -375,10 +375,10 @@ umovestr_peekdata(const int pid, kernel_ulong_t addr, unsigned int len, memcpy(laddr, &u.x[residue], m); while (residue < sizeof(long)) if (u.x[residue++] == '\0') @@ -106,6 +106,15 @@ index 59af8641..3ff59781 100644 nread += m; len -= m; } +@@ -509,7 +509,7 @@ upoken_pokedata(const int pid, kernel_ulong_t addr, unsigned int len, + + addr += sizeof(long); + nwritten += sizeof(long); +- our_addr += sizeof(long); ++ our_addr = (char *)our_addr + sizeof(long); + len -= sizeof(long); + } + -- -2.28.0 +2.30.0diff --git a/pkg/strace/patch/0006-Avoid-empty-struct-definition.patch b/pkg/strace/patch/0006-Avoid-empty-struct-definition.patch@@ -1,16 +1,16 @@ -From 9373bbf0bc3d17265f165845eb16c85843e92cf6 Mon Sep 17 00:00:00 2001 +From 4abe148a0e2dc930a5cdb8d92e88af203898368a Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sun, 7 Jul 2019 21:50:31 -0700 Subject: [PATCH] Avoid empty struct definition --- - fetch_struct_stat64.c | 8 +------- + src/fetch_struct_stat64.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) -diff --git a/fetch_struct_stat64.c b/fetch_struct_stat64.c -index 8b445ba3..5b7641a1 100644 ---- a/fetch_struct_stat64.c -+++ b/fetch_struct_stat64.c +diff --git a/src/fetch_struct_stat64.c b/src/fetch_struct_stat64.c +index b5125d420..b45a48da5 100644 +--- a/src/fetch_struct_stat64.c ++++ b/src/fetch_struct_stat64.c @@ -32,12 +32,6 @@ # endif /* HAVE_MX32_STRUCT_STAT64 */ #endif /* MPERS_IS_m32 || MPERS_IS_mx32 */ @@ -34,5 +34,5 @@ index 8b445ba3..5b7641a1 100644 return false; -- -2.22.0 +2.30.0diff --git a/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch b/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch@@ -1,19 +1,19 @@ -From 1d0a51b8e89231e92b0b3280dd850eccfa6cf143 Mon Sep 17 00:00:00 2001 +From 2aafc896306daf6fc8a470993ffd6d300d2e410c Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sun, 7 Jul 2019 21:53:16 -0700 Subject: [PATCH] Don't omit second operand to '?' operator --- - open.c | 5 +++-- - prctl.c | 2 +- - strace.c | 6 +++--- + src/open.c | 5 +++-- + src/prctl.c | 2 +- + src/strace.c | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) -diff --git a/open.c b/open.c -index eb6af088..16e64946 100644 ---- a/open.c -+++ b/open.c -@@ -77,8 +77,9 @@ sprint_open_modes64(uint64_t flags) +diff --git a/src/open.c b/src/open.c +index 4af4320b0..8191470ed 100644 +--- a/src/open.c ++++ b/src/open.c +@@ -63,8 +63,9 @@ sprint_open_modes64(uint64_t flags) } *p = '\0'; @@ -25,10 +25,10 @@ index eb6af088..16e64946 100644 } const char * -diff --git a/prctl.c b/prctl.c -index b904fa34..1366a89e 100644 ---- a/prctl.c -+++ b/prctl.c +diff --git a/src/prctl.c b/src/prctl.c +index 58b644946..6147082eb 100644 +--- a/src/prctl.c ++++ b/src/prctl.c @@ -76,7 +76,7 @@ sprint_sve_val(kernel_ulong_t arg) const char *flags_str = sprintflags("", pr_sve_vl_flags, flags); @@ -38,11 +38,11 @@ index b904fa34..1366a89e 100644 return out; } -diff --git a/strace.c b/strace.c -index 280f1a68..11a3d9dd 100644 ---- a/strace.c -+++ b/strace.c -@@ -2251,7 +2251,7 @@ init(int argc, char *argv[]) +diff --git a/src/strace.c b/src/strace.c +index 24180a15f..a71860e55 100644 +--- a/src/strace.c ++++ b/src/strace.c +@@ -2257,7 +2257,7 @@ init(int argc, char *argv[]) break; case GETOPT_TS: tflag_long_set = true; @@ -51,7 +51,7 @@ index 280f1a68..11a3d9dd 100644 error_opt_arg(c, lopt, optarg); break; case 'T': -@@ -2351,10 +2351,10 @@ init(int argc, char *argv[]) +@@ -2357,10 +2357,10 @@ init(int argc, char *argv[]) qualify_kvm(optarg); break; case GETOPT_QUAL_QUIET: @@ -65,5 +65,5 @@ index 280f1a68..11a3d9dd 100644 default: error_msg_and_help(NULL); -- -2.28.0 +2.30.0diff --git a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch b/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch@@ -1,21 +1,20 @@ -From 0308e8cd17c92f96a61d8b231336caa299d7683d Mon Sep 17 00:00:00 2001 +From ac6d6953ee3bbb0a2717bb814c78f5671a993407 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sun, 7 Jul 2019 21:58:46 -0700 Subject: [PATCH] Avoid unnecessary VLAs --- - count.c | 2 +- - desc.c | 7 ++++--- - nlattr.c | 2 +- - socketutils.c | 4 ++-- - syscall.c | 2 +- - util.c | 5 ++--- - 6 files changed, 11 insertions(+), 11 deletions(-) + src/count.c | 2 +- + src/nlattr.c | 2 +- + src/socketutils.c | 4 ++-- + src/syscall.c | 2 +- + src/util.c | 5 ++--- + 5 files changed, 7 insertions(+), 8 deletions(-) -diff --git a/count.c b/count.c -index a397eba2..89682ae9 100644 ---- a/count.c -+++ b/count.c +diff --git a/src/count.c b/src/count.c +index afd4b3758..c1ed46588 100644 +--- a/src/count.c ++++ b/src/count.c @@ -414,7 +414,7 @@ call_summary_pers(FILE *outf) fprintf(outf, column_fmts[i], (val_), cwidths[c]); \ break @@ -25,42 +24,11 @@ index a397eba2..89682ae9 100644 for (size_t i = 0; i <= last_column; ++i) { const size_t c = columns[i]; -diff --git a/desc.c b/desc.c -index 32fc1882..f15b04e1 100644 ---- a/desc.c -+++ b/desc.c -@@ -175,11 +175,11 @@ SYS_FUNC(select) - - static int - umove_kulong_array_or_printaddr(struct tcb *const tcp, const kernel_ulong_t addr, -- kernel_ulong_t *const ptr, const size_t n) -+ kernel_ulong_t *const ptr, uint32_t *ptr32, -+ const size_t n) - { - #ifndef current_klongsize - if (current_klongsize < sizeof(*ptr)) { -- uint32_t ptr32[n]; - int r = umove_or_printaddr(tcp, addr, &ptr32); - if (!r) { - size_t i; -@@ -200,10 +200,11 @@ do_pselect6(struct tcb *const tcp, const print_obj_by_addr_fn print_ts, - int rc = decode_select(tcp, tcp->u_arg, print_ts, sprint_ts); - if (entering(tcp)) { - kernel_ulong_t data[2]; -+ uint32_t data32[ARRAY_SIZE(data)]; - - tprints(", "); - if (!umove_kulong_array_or_printaddr(tcp, tcp->u_arg[5], -- data, ARRAY_SIZE(data))) { -+ data, data32, ARRAY_SIZE(data))) { - tprints("{"); - /* NB: kernel requires data[1] == NSIG_BYTES */ - print_sigset_addr_len(tcp, data[0], data[1]); -diff --git a/nlattr.c b/nlattr.c -index 7f13642c..247ba2d5 100644 ---- a/nlattr.c -+++ b/nlattr.c -@@ -341,7 +341,7 @@ decode_nla_hwaddr(struct tcb *const tcp, +diff --git a/src/nlattr.c b/src/nlattr.c +index 8ac034031..648181ac8 100644 +--- a/src/nlattr.c ++++ b/src/nlattr.c +@@ -344,7 +344,7 @@ decode_nla_hwaddr(struct tcb *const tcp, if (len > MAX_ADDR_LEN) return false; @@ -69,10 +37,10 @@ index 7f13642c..247ba2d5 100644 const uintptr_t arphrd = (uintptr_t) opaque_data; if (!umoven_or_printaddr(tcp, addr, len, buf)) { -diff --git a/socketutils.c b/socketutils.c -index be459714..819abc92 100644 ---- a/socketutils.c -+++ b/socketutils.c +diff --git a/src/socketutils.c b/src/socketutils.c +index 40a8c1991..1482787ff 100644 +--- a/src/socketutils.c ++++ b/src/socketutils.c @@ -144,7 +144,7 @@ inet_parse_response(const void *const data, const int data_len, return -1; } @@ -91,11 +59,11 @@ index be459714..819abc92 100644 if (!inet_ntop(diag_msg->idiag_family, diag_msg->id.idiag_dst, dst_buf, text_size)) -diff --git a/syscall.c b/syscall.c -index d228ae4d..c8fdd85e 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -295,7 +295,7 @@ decode_socket_subcall(struct tcb *tcp) +diff --git a/src/syscall.c b/src/syscall.c +index 52f2f29f6..cbb51fff4 100644 +--- a/src/syscall.c ++++ b/src/syscall.c +@@ -303,7 +303,7 @@ decode_socket_subcall(struct tcb *tcp) const kernel_ulong_t scno = SYS_socket_subcall + call; const unsigned int nargs = sysent[scno].nargs; @@ -104,10 +72,10 @@ index d228ae4d..c8fdd85e 100644 if (umoven(tcp, tcp->u_arg[1], nargs * current_wordsize, buf) < 0) return; -diff --git a/util.c b/util.c -index 481144bf..b65479a0 100644 ---- a/util.c -+++ b/util.c +diff --git a/src/util.c b/src/util.c +index 31b3876a3..8e12df0f1 100644 +--- a/src/util.c ++++ b/src/util.c @@ -493,8 +493,7 @@ enum sock_proto getfdproto(struct tcb *tcp, int fd) { @@ -128,5 +96,5 @@ index 481144bf..b65479a0 100644 return SOCK_PROTO_UNKNOWN; else { -- -2.28.0 +2.30.0diff --git a/pkg/strace/patch/0009-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch b/pkg/strace/patch/0009-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch@@ -1,33 +1,33 @@ -From 80d9bfb16cb9318f33521ea92a1c194e206cc479 Mon Sep 17 00:00:00 2001 +From b8db0d40427b083351f080cfd151346f23302e03 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sun, 7 Jul 2019 22:29:34 -0700 Subject: [PATCH] Avoid index ranges and empty initializer lists in syscallent arrays --- - linux/alpha/syscallent.h | 34 +++++++-------- - linux/arm/syscallent.h | 2 +- - linux/avr32/syscallent.h | 4 +- - linux/bfin/syscallent.h | 2 +- - linux/i386/syscallent.h | 6 +-- - linux/m68k/syscallent.h | 2 +- - linux/microblaze/syscallent.h | 6 +-- - linux/mips/syscallent-compat.h | 46 ++++++++++---------- - linux/powerpc/syscallent.h | 2 +- - linux/powerpc64/syscallent.h | 10 ++--- - linux/s390/syscallent.h | 42 +++++++++--------- - linux/s390x/syscallent.h | 78 +++++++++++++++++----------------- - linux/sh/syscallent.h | 12 +++--- - linux/sh64/syscallent.h | 22 ++++++---- - linux/sparc/syscallent.h | 4 +- - linux/sparc64/syscallent.h | 36 ++++++++-------- - linux/xtensa/syscallent.h | 32 +++++++------- + src/linux/alpha/syscallent.h | 34 ++++++------- + src/linux/arm/syscallent.h | 2 +- + src/linux/avr32/syscallent.h | 4 +- + src/linux/bfin/syscallent.h | 2 +- + src/linux/i386/syscallent.h | 6 +-- + src/linux/m68k/syscallent.h | 2 +- + src/linux/microblaze/syscallent.h | 6 +-- + src/linux/mips/syscallent-compat.h | 46 +++++++++--------- + src/linux/powerpc/syscallent.h | 2 +- + src/linux/powerpc64/syscallent.h | 10 ++-- + src/linux/s390/syscallent.h | 42 ++++++++-------- + src/linux/s390x/syscallent.h | 78 +++++++++++++++--------------- + src/linux/sh/syscallent.h | 12 ++--- + src/linux/sh64/syscallent.h | 22 ++++++--- + src/linux/sparc/syscallent.h | 4 +- + src/linux/sparc64/syscallent.h | 36 +++++++------- + src/linux/xtensa/syscallent.h | 32 ++++++------ 17 files changed, 173 insertions(+), 167 deletions(-) -diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h -index fa86c9ae..21280054 100644 ---- a/linux/alpha/syscallent.h -+++ b/linux/alpha/syscallent.h +diff --git a/src/linux/alpha/syscallent.h b/src/linux/alpha/syscallent.h +index f9e971ed3..36f29509b 100644 +--- a/src/linux/alpha/syscallent.h ++++ b/src/linux/alpha/syscallent.h @@ -60,7 +60,7 @@ [ 50] = { 5, 0, SEN(printargs), "osf_setlogin" }, /* not implemented */ [ 51] = { 1, TF, SEN(acct), "acct" }, @@ -149,10 +149,10 @@ index fa86c9ae..21280054 100644 [405] = { 1, TP|SE, SEN(exit), "exit_group" }, [406] = { 3, 0, SEN(lookup_dcookie), "lookup_dcookie" }, [407] = { 1, TD, SEN(epoll_create), "epoll_create" }, -diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h -index b744074e..a4a1dd41 100644 ---- a/linux/arm/syscallent.h -+++ b/linux/arm/syscallent.h +diff --git a/src/linux/arm/syscallent.h b/src/linux/arm/syscallent.h +index 4fd351305..3ec054c84 100644 +--- a/src/linux/arm/syscallent.h ++++ b/src/linux/arm/syscallent.h @@ -433,7 +433,7 @@ * ARM specific syscalls. Encoded with scno 0x000f00xx. * Remapped by shuffle_scno() to be directly after __ARM_NR_cmpxchg. @@ -162,10 +162,10 @@ index b744074e..a4a1dd41 100644 [ARM_FIRST_SHUFFLED_SYSCALL+1+1] = { 0, 0, SEN(printargs), "breakpoint" }, [ARM_FIRST_SHUFFLED_SYSCALL+1+2] = { 3, TM, SEN(printargs), "cacheflush" }, [ARM_FIRST_SHUFFLED_SYSCALL+1+3] = { 0, 0, SEN(printargs), "usr26" }, -diff --git a/linux/avr32/syscallent.h b/linux/avr32/syscallent.h -index 491ff8e9..3338de47 100644 ---- a/linux/avr32/syscallent.h -+++ b/linux/avr32/syscallent.h +diff --git a/src/linux/avr32/syscallent.h b/src/linux/avr32/syscallent.h +index 5d4624abe..14aff66a2 100644 +--- a/src/linux/avr32/syscallent.h ++++ b/src/linux/avr32/syscallent.h @@ -228,7 +228,7 @@ [219] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [220] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, @@ -184,10 +184,10 @@ index 491ff8e9..3338de47 100644 [283] = { 2, TD, SEN(setns), "setns" }, [284] = { 5, TD, SEN(pread), "pread64" }, [285] = { 5, TD, SEN(pwrite), "pwrite64" }, -diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h -index 53d5c235..df2a8003 100644 ---- a/linux/bfin/syscallent.h -+++ b/linux/bfin/syscallent.h +diff --git a/src/linux/bfin/syscallent.h b/src/linux/bfin/syscallent.h +index 16287d085..90f55b5c2 100644 +--- a/src/linux/bfin/syscallent.h ++++ b/src/linux/bfin/syscallent.h @@ -229,7 +229,7 @@ [219] = { 3, TM, SEN(madvise), "madvise" }, [220] = { 3, TD, SEN(getdents64), "getdents64" }, @@ -197,10 +197,10 @@ index 53d5c235..df2a8003 100644 [224] = { 0, PU|NF, SEN(gettid), "gettid" }, [225] = { 4, TD, SEN(readahead), "readahead" }, [226] = { 5, TF, SEN(setxattr), "setxattr" }, -diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h -index c6e9cd9b..2ee607aa 100644 ---- a/linux/i386/syscallent.h -+++ b/linux/i386/syscallent.h +diff --git a/src/linux/i386/syscallent.h b/src/linux/i386/syscallent.h +index 3c4cb9fe4..fe9e8b4a6 100644 +--- a/src/linux/i386/syscallent.h ++++ b/src/linux/i386/syscallent.h @@ -229,7 +229,7 @@ [219] = { 3, TM, SEN(madvise), "madvise" }, [220] = { 3, TD, SEN(getdents64), "getdents64" }, @@ -228,10 +228,10 @@ index c6e9cd9b..2ee607aa 100644 [286] = { 5, 0, SEN(add_key), "add_key" }, [287] = { 4, 0, SEN(request_key), "request_key" }, [288] = { 5, 0, SEN(keyctl), "keyctl" }, -diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h -index e5ebefe1..742a951d 100644 ---- a/linux/m68k/syscallent.h -+++ b/linux/m68k/syscallent.h +diff --git a/src/linux/m68k/syscallent.h b/src/linux/m68k/syscallent.h +index 67f66d719..2205f4982 100644 +--- a/src/linux/m68k/syscallent.h ++++ b/src/linux/m68k/syscallent.h @@ -225,7 +225,7 @@ [215] = { 1, TC|NF, SEN(setfsuid), "setfsuid32" }, [216] = { 1, TC|NF, SEN(setfsgid), "setfsgid32" }, @@ -241,10 +241,10 @@ index e5ebefe1..742a951d 100644 [220] = { 3, TD, SEN(getdents64), "getdents64" }, [221] = { 0, PU|NF, SEN(gettid), "gettid" }, [222] = { 2, TS|TP, SEN(tkill), "tkill" }, -diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h -index 1c816318..001308d6 100644 ---- a/linux/microblaze/syscallent.h -+++ b/linux/microblaze/syscallent.h +diff --git a/src/linux/microblaze/syscallent.h b/src/linux/microblaze/syscallent.h +index d3446abdb..7d8c7394f 100644 +--- a/src/linux/microblaze/syscallent.h ++++ b/src/linux/microblaze/syscallent.h @@ -229,7 +229,7 @@ [219] = { 3, TM, SEN(madvise), "madvise" }, [220] = { 3, TD, SEN(getdents64), "getdents64" }, @@ -272,10 +272,10 @@ index 1c816318..001308d6 100644 [286] = { 5, 0, SEN(add_key), "add_key" }, [287] = { 4, 0, SEN(request_key), "request_key" }, [288] = { 5, 0, SEN(keyctl), "keyctl" }, -diff --git a/linux/mips/syscallent-compat.h b/linux/mips/syscallent-compat.h -index 61ccfe4e..9444e4c4 100644 ---- a/linux/mips/syscallent-compat.h -+++ b/linux/mips/syscallent-compat.h +diff --git a/src/linux/mips/syscallent-compat.h b/src/linux/mips/syscallent-compat.h +index 29cc42632..b1274f890 100644 +--- a/src/linux/mips/syscallent-compat.h ++++ b/src/linux/mips/syscallent-compat.h @@ -69,13 +69,13 @@ [ 61] = { 0, 0, SEN(printargs), "svr4_chroot" }, [ 62] = { 0, 0, SEN(printargs), "svr4_fcntl" }, @@ -436,10 +436,10 @@ index 61ccfe4e..9444e4c4 100644 [3260] = { 0, 0, SEN(printargs), "posix_netboot" }, [3261] = { 0, 0, SEN(printargs), "posix_netunboot" }, [3262] = { 0, 0, SEN(printargs), "posix_rdump" }, -diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h -index db4dd2b5..b6508a9b 100644 ---- a/linux/powerpc/syscallent.h -+++ b/linux/powerpc/syscallent.h +diff --git a/src/linux/powerpc/syscallent.h b/src/linux/powerpc/syscallent.h +index 98b29e5e8..38056daf6 100644 +--- a/src/linux/powerpc/syscallent.h ++++ b/src/linux/powerpc/syscallent.h @@ -231,7 +231,7 @@ [221] = { 6, 0, SEN(futex_time32), "futex" }, [222] = { 3, 0, SEN(sched_setaffinity), "sched_setaffinity" }, @@ -449,10 +449,10 @@ index db4dd2b5..b6508a9b 100644 [225] = { 5, 0, SEN(printargs), "tuxcall" }, [226] = { 4, TD|TN, SEN(sendfile64), "sendfile64" }, [227] = { 2, TM, SEN(io_setup), "io_setup" }, -diff --git a/linux/powerpc64/syscallent.h b/linux/powerpc64/syscallent.h -index 9c306d28..53c0096b 100644 ---- a/linux/powerpc64/syscallent.h -+++ b/linux/powerpc64/syscallent.h +diff --git a/src/linux/powerpc64/syscallent.h b/src/linux/powerpc64/syscallent.h +index a5035cb31..86ffe0099 100644 +--- a/src/linux/powerpc64/syscallent.h ++++ b/src/linux/powerpc64/syscallent.h @@ -199,14 +199,14 @@ [189] = { 0, TP, SEN(vfork), "vfork" }, [190] = { 2, 0, SEN(getrlimit), "ugetrlimit" }, @@ -491,10 +491,10 @@ index 9c306d28..53c0096b 100644 [255] = { 1, 0, SEN(printargs), "rtas" }, [256] = { 5, 0, SEN(printargs), "sys_debug_setcontext" }, [257] = { 5, 0, SEN(vserver), "vserver" }, -diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h -index 7af96b5c..97fe42e2 100644 ---- a/linux/s390/syscallent.h -+++ b/linux/s390/syscallent.h +diff --git a/src/linux/s390/syscallent.h b/src/linux/s390/syscallent.h +index 5b83b3d15..ccb956441 100644 +--- a/src/linux/s390/syscallent.h ++++ b/src/linux/s390/syscallent.h @@ -26,8 +26,8 @@ [ 14] = { 3, TF, SEN(mknod), "mknod" }, [ 15] = { 2, TF, SEN(chmod), "chmod" }, @@ -625,10 +625,10 @@ index 7af96b5c..97fe42e2 100644 [243] = { 2, TM, SEN(io_setup), "io_setup" }, [244] = { 1, TM, SEN(io_destroy), "io_destroy" }, [245] = { 5, 0, SEN(io_getevents_time32), "io_getevents" }, -diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h -index 6daa310e..8542e839 100644 ---- a/linux/s390x/syscallent.h -+++ b/linux/s390x/syscallent.h +diff --git a/src/linux/s390x/syscallent.h b/src/linux/s390x/syscallent.h +index d64141075..8225b5ec4 100644 +--- a/src/linux/s390x/syscallent.h ++++ b/src/linux/s390x/syscallent.h @@ -21,29 +21,29 @@ [ 10] = { 1, TF, SEN(unlink), "unlink" }, [ 11] = { 3, TF|TP|TSD|SE|SI, SEN(execve), "execve" }, @@ -836,10 +836,10 @@ index 6daa310e..8542e839 100644 [265] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [266] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [267] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" }, -diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h -index 5349f720..48d65c5e 100644 ---- a/linux/sh/syscallent.h -+++ b/linux/sh/syscallent.h +diff --git a/src/linux/sh/syscallent.h b/src/linux/sh/syscallent.h +index 64f3d6f1f..d79c2e8ed 100644 +--- a/src/linux/sh/syscallent.h ++++ b/src/linux/sh/syscallent.h @@ -197,7 +197,7 @@ [185] = { 2, TC, SEN(capset), "capset" }, [186] = { 2, TS, SEN(sigaltstack), "sigaltstack" }, @@ -893,10 +893,10 @@ index 5349f720..48d65c5e 100644 [294] = { 4, TM, SEN(migrate_pages), "migrate_pages" }, [295] = { 4, TD|TF, SEN(openat), "openat" }, [296] = { 3, TD|TF, SEN(mkdirat), "mkdirat" }, -diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h -index 4ec35d31..b9040a15 100644 ---- a/linux/sh64/syscallent.h -+++ b/linux/sh64/syscallent.h +diff --git a/src/linux/sh64/syscallent.h b/src/linux/sh64/syscallent.h +index 94e6cea3a..ad192a1b9 100644 +--- a/src/linux/sh64/syscallent.h ++++ b/src/linux/sh64/syscallent.h @@ -89,7 +89,7 @@ [ 79] = { 2, TCL, SEN(settimeofday), "settimeofday" }, [ 80] = { 2, TC, SEN(getgroups16), "getgroups" }, @@ -984,10 +984,10 @@ index 4ec35d31..b9040a15 100644 [322] = { 4, TM, SEN(migrate_pages), "migrate_pages" }, [323] = { 4, TD|TF, SEN(openat), "openat" }, [324] = { 3, TD|TF, SEN(mkdirat), "mkdirat" }, -diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h -index a385368a..acdbff6e 100644 ---- a/linux/sparc/syscallent.h -+++ b/linux/sparc/syscallent.h +diff --git a/src/linux/sparc/syscallent.h b/src/linux/sparc/syscallent.h +index e3321f448..1f83f1619 100644 +--- a/src/linux/sparc/syscallent.h ++++ b/src/linux/sparc/syscallent.h @@ -57,7 +57,7 @@ [ 49] = { 0, TC|PU|NF, SEN(geteuid16), "geteuid" }, [ 50] = { 0, TC|PU|NF, SEN(getegid16), "getegid" }, @@ -1006,10 +1006,10 @@ index a385368a..acdbff6e 100644 [165] = { 4, TF, SEN(quotactl), "quotactl" }, [166] = { 1, 0, SEN(set_tid_address), "set_tid_address" }, [167] = { 5, TF, SEN(mount), "mount" }, -diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h -index 5faa721c..eec17849 100644 ---- a/linux/sparc64/syscallent.h -+++ b/linux/sparc64/syscallent.h +diff --git a/src/linux/sparc64/syscallent.h b/src/linux/sparc64/syscallent.h +index 94471f0c7..f0bfccd56 100644 +--- a/src/linux/sparc64/syscallent.h ++++ b/src/linux/sparc64/syscallent.h @@ -36,10 +36,10 @@ [ 28] = { 2, TS, SEN(sigaltstack), "sigaltstack" }, [ 29] = { 0, TS, SEN(pause), "pause" }, @@ -1117,10 +1117,10 @@ index 5faa721c..eec17849 100644 [232] = { 6, TD, SEN(splice), "splice" }, [233] = { 1, 0, SEN(stime), "stime" }, [234] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, -diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h -index a94fd93d..eb189ffc 100644 ---- a/linux/xtensa/syscallent.h -+++ b/linux/xtensa/syscallent.h +diff --git a/src/linux/xtensa/syscallent.h b/src/linux/xtensa/syscallent.h +index eb6425d53..5289872d7 100644 +--- a/src/linux/xtensa/syscallent.h ++++ b/src/linux/xtensa/syscallent.h @@ -7,7 +7,7 @@ [ 0] = { 0, 0, SEN(printargs), "spill" }, @@ -1243,5 +1243,5 @@ index a94fd93d..eb189ffc 100644 [321] = { 6, TD|TF, SEN(fanotify_mark), "fanotify_mark" }, [322] = { 6, 0, SEN(process_vm_readv), "process_vm_readv" }, -- -2.28.0 +2.30.0diff --git a/pkg/strace/patch/0010-Use-alloca-when-VLAs-aren-t-available.patch b/pkg/strace/patch/0010-Use-alloca-when-VLAs-aren-t-available.patch@@ -1,17 +1,17 @@ -From 0ad7047e306f4aef8f4a6346e9dfff8079b1c571 Mon Sep 17 00:00:00 2001 +From 4a468614678d3ae7b58e95428352268c975d1812 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Thu, 30 Jan 2020 21:57:34 -0800 Subject: [PATCH] Use alloca when VLAs aren't available --- - evdev.c | 14 +++++++++++--- + src/evdev.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -diff --git a/evdev.c b/evdev.c -index 1d4e9aef..58e705ae 100644 ---- a/evdev.c -+++ b/evdev.c -@@ -181,9 +181,13 @@ decode_bitset(struct tcb *const tcp, const kernel_ulong_t arg, +diff --git a/src/evdev.c b/src/evdev.c +index 198d799f3..f74ab9a71 100644 +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -169,9 +169,13 @@ decode_bitset(struct tcb *const tcp, const kernel_ulong_t arg, return RVAL_IOCTL_DECODED; } @@ -26,7 +26,7 @@ index 1d4e9aef..58e705ae 100644 return RVAL_IOCTL_DECODED; if (xlat_verbose(xlat_verbosity) != XLAT_STYLE_RAW) { -@@ -238,9 +242,13 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code, +@@ -227,9 +231,13 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code, return RVAL_IOCTL_DECODED; } @@ -37,19 +37,19 @@ index 1d4e9aef..58e705ae 100644 +#endif - if (umove_or_printaddr(tcp, arg, &buffer)) -+ if (umoven_or_printaddr(tcp, arg, size * sizeof(int), &buffer)) ++ if (umoven_or_printaddr(tcp, arg, size * sizeof(int), buffer)) return RVAL_IOCTL_DECODED; - tprints("{code="); -@@ -249,7 +257,7 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code, - tprints(", values=["); + tprint_struct_begin(); +@@ -241,7 +249,7 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code, + tprints("["); unsigned int i; - for (i = 1; i < ARRAY_SIZE(buffer); i++) + for (i = 1; i < size; i++) tprintf("%s%d", i > 1 ? ", " : "", buffer[i]); - tprints("]}"); + tprints("]"); -- -2.28.0 +2.30.0diff --git a/pkg/strace/patch/0011-Avoid-index-ranges.patch b/pkg/strace/patch/0011-Avoid-index-ranges.patch@@ -1,4 +1,4 @@ -From ca8d72a8002c4c6946947603819436687573e2fa Mon Sep 17 00:00:00 2001 +From 81cd93d38da7a3e33d1e34f8272db1f262eda287 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Thu, 30 Jan 2020 22:32:50 -0800 Subject: [PATCH] Avoid index ranges @@ -6,14 +6,14 @@ Subject: [PATCH] Avoid index ranges The change in print_mac.c is not functionally the same, but we ignore this for now. --- - print_mac.c | 4 +--- - util.c | 8 ++++---- + src/print_mac.c | 4 +--- + src/util.c | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) -diff --git a/print_mac.c b/print_mac.c -index c5d5f5c4..a7c54b3e 100644 ---- a/print_mac.c -+++ b/print_mac.c +diff --git a/src/print_mac.c b/src/print_mac.c +index c12a1eca3..dc3794787 100644 +--- a/src/print_mac.c ++++ b/src/print_mac.c @@ -17,8 +17,6 @@ DIAG_PUSH_IGNORE_OVERRIDE_INIT @@ -32,11 +32,11 @@ index c5d5f5c4..a7c54b3e 100644 ? hwaddr_sizes[devtype] : 255; return sprint_mac_addr(hwaddr, MIN(size, sz)); -diff --git a/util.c b/util.c -index b65479a0..40b5a186 100644 ---- a/util.c -+++ b/util.c -@@ -1198,16 +1198,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, +diff --git a/src/util.c b/src/util.c +index 8e12df0f1..6cbb0cd91 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -1201,16 +1201,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, ? 1 + ilog2_klong(len - 1) / HEX_BIT : DUMPSTR_OFFS_MIN_CHARS; kernel_ulong_t i = 0; const unsigned char *src; @@ -58,5 +58,5 @@ index b65479a0..40b5a186 100644 /* Fetching data from tracee. */ -- -2.28.0 +2.30.0diff --git a/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch b/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch@@ -1,19 +1,19 @@ -From 8f8487a1c0e9be10746b255383fc892095174aac Mon Sep 17 00:00:00 2001 +From 55ff71bf1e559974132c313181134f8a24625fcc Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 26 Sep 2020 16:30:33 -0700 Subject: [PATCH] Prevent zero-sized arrays --- - xlat/btrfs_features_compat.h | 3 ++- - xlat/mq_attr_flags.h | 3 ++- - xlat/sigprof_codes.h | 3 ++- - xlat/sock_ipx_options.h | 3 ++- + src/xlat/btrfs_features_compat.h | 3 ++- + src/xlat/mq_attr_flags.h | 3 ++- + src/xlat/sigprof_codes.h | 3 ++- + src/xlat/sock_ipx_options.h | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) -diff --git a/xlat/btrfs_features_compat.h b/xlat/btrfs_features_compat.h -index d74af31..70331b1 100644 ---- a/xlat/btrfs_features_compat.h -+++ b/xlat/btrfs_features_compat.h +diff --git a/src/xlat/btrfs_features_compat.h b/src/xlat/btrfs_features_compat.h +index 44d99a5..f20e7c4 100644 +--- a/src/xlat/btrfs_features_compat.h ++++ b/src/xlat/btrfs_features_compat.h @@ -13,13 +13,14 @@ extern const struct xlat btrfs_features_compat[]; # else @@ -30,10 +30,10 @@ index d74af31..70331b1 100644 .type = XT_NORMAL, .flags_mask = 0 , -diff --git a/xlat/mq_attr_flags.h b/xlat/mq_attr_flags.h -index 9dfbe94..84ec9cd 100644 ---- a/xlat/mq_attr_flags.h -+++ b/xlat/mq_attr_flags.h +diff --git a/src/xlat/mq_attr_flags.h b/src/xlat/mq_attr_flags.h +index c8593a6..3534c0e 100644 +--- a/src/xlat/mq_attr_flags.h ++++ b/src/xlat/mq_attr_flags.h @@ -18,13 +18,14 @@ static const struct xlat_data mq_attr_flags_xdata[] = { #define XLAT_VAL_0 ((unsigned) (O_NONBLOCK)) #define XLAT_STR_0 STRINGIFY(O_NONBLOCK) @@ -50,10 +50,10 @@ index 9dfbe94..84ec9cd 100644 .type = XT_NORMAL, .flags_mask = 0 # ifdef XLAT_VAL_0 -diff --git a/xlat/sigprof_codes.h b/xlat/sigprof_codes.h -index 65614dc..a173d59 100644 ---- a/xlat/sigprof_codes.h -+++ b/xlat/sigprof_codes.h +diff --git a/src/xlat/sigprof_codes.h b/src/xlat/sigprof_codes.h +index 5147a5f..019edf3 100644 +--- a/src/xlat/sigprof_codes.h ++++ b/src/xlat/sigprof_codes.h @@ -18,13 +18,14 @@ static const struct xlat_data sigprof_codes_xdata[] = { #define XLAT_VAL_0 ((unsigned) (PROF_SIG)) #define XLAT_STR_0 STRINGIFY(PROF_SIG) @@ -70,10 +70,10 @@ index 65614dc..a173d59 100644 .type = XT_NORMAL, .flags_mask = 0 # ifdef XLAT_VAL_0 -diff --git a/xlat/sock_ipx_options.h b/xlat/sock_ipx_options.h -index 166d010..527089b 100644 ---- a/xlat/sock_ipx_options.h -+++ b/xlat/sock_ipx_options.h +diff --git a/src/xlat/sock_ipx_options.h b/src/xlat/sock_ipx_options.h +index 653d4dc..2f259ba 100644 +--- a/src/xlat/sock_ipx_options.h ++++ b/src/xlat/sock_ipx_options.h @@ -18,11 +18,12 @@ static const struct xlat_data sock_ipx_options_xdata[] = { #define XLAT_VAL_0 ((unsigned) (IPX_TYPE)) #define XLAT_STR_0 STRINGIFY(IPX_TYPE) @@ -89,5 +89,5 @@ index 166d010..527089b 100644 .flags_mask = 0 # ifdef XLAT_VAL_0 -- -2.28.0 +2.30.0diff --git a/pkg/strace/sha256 b/pkg/strace/sha256@@ -1 +1 @@ -fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c strace-5.10.tar.xz +ffe340b10c145a0f85734271e9cce56457d23f21a7ea5931ab32f8cf4e793879 strace-5.11.tar.xzdiff --git a/pkg/strace/url b/pkg/strace/url@@ -1 +1 @@ -url = "https://github.com/strace/strace/releases/download/v5.10/strace-5.10.tar.xz" +url = "https://github.com/strace/strace/releases/download/v5.11/strace-5.11.tar.xz"diff --git a/pkg/strace/ver b/pkg/strace/ver@@ -1 +1 @@ -5.10 r0 +5.11 r0