logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 711d9f752135ac5b7fa3575fdd6574af4b1d10d6
parent ba1bac44865aa4afa748d862bdeda89928c4e135
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 20 Feb 2020 17:16:51 -0800

strace: Update to 5.5

Diffstat:

Mpkg/strace/.gitignore2+-
Mpkg/strace/config.h126+++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
Mpkg/strace/patch/0004-Avoid-empty-initializer-lists.patch16++++++++--------
Mpkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch35+++++++++++++++++++++++++++++++----
Mpkg/strace/patch/0009-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch139+++++++++++++++++++++++++++++++++++++++++--------------------------------------
Mpkg/strace/patch/0010-Use-alloca-when-VLAs-aren-t-available.patch10+++++-----
Mpkg/strace/sha2562+-
Mpkg/strace/url2+-
Mpkg/strace/ver2+-
9 files changed, 205 insertions(+), 129 deletions(-)

diff --git a/pkg/strace/.gitignore b/pkg/strace/.gitignore @@ -1,3 +1,3 @@ /src -/strace-5.4.tar.xz +/strace-5.5.tar.xz /tools.ninja diff --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 "2019" +#define COPYRIGHT_YEAR "2020" /* #undef CSKY */ #define ENABLE_ARM_OABI 0 /* #undef ENABLE_STACKTRACE */ @@ -41,7 +41,7 @@ #define HAVE_DECL_KERN_NMI_WATCHDOG 1 #define HAVE_DECL_KERN_PANIC_ON_NMI 1 #define HAVE_DECL_KERN_PANIC_ON_WARN 1 -#define HAVE_DECL_KERN_PANIC_PRINT 0 +#define HAVE_DECL_KERN_PANIC_PRINT 1 #define HAVE_DECL_KERN_PRINTK_RATELIMIT 1 #define HAVE_DECL_KERN_PRINTK_RATELIMIT_BURST 1 #define HAVE_DECL_KERN_PTY 1 @@ -108,7 +108,11 @@ #define HAVE_DECL_P_SID 0 #define HAVE_DECL_P_UID 0 #define HAVE_DECL_SYS_ERRLIST 0 +#define HAVE_DECL_TCA_ACT_COOKIE 1 +#define HAVE_DECL_TCA_ACT_FLAGS 1 +#define HAVE_DECL_TCA_ACT_PAD 1 #define HAVE_DECL_TCA_STAB_DATA 1 +#define HAVE_DECL_TCA_STATS_PKT64 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 @@ -129,6 +133,7 @@ #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 @@ -138,6 +143,9 @@ #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 @@ -206,18 +214,18 @@ #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 -/* #undef HAVE_LINUX_IO_URING_H */ +#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_MEMFD_H 1 #define HAVE_LINUX_MMTIMER_H 1 -/* #undef HAVE_LINUX_MOUNT_H */ +#define HAVE_LINUX_MOUNT_H 1 #define HAVE_LINUX_MQUEUE_H 1 -#define HAVE_LINUX_MSG_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 @@ -237,11 +245,10 @@ #define HAVE_LINUX_NSFS_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_SEM_H 1 -#define HAVE_LINUX_SHM_H 1 #define HAVE_LINUX_USERFAULTFD_H 1 #define HAVE_LINUX_UTSNAME_H 1 /* #undef HAVE_M32_MPERS */ @@ -301,53 +308,61 @@ #define HAVE_STRUCT_BPF_MAP_INFO_TYPE 1 #define HAVE_STRUCT_BPF_MAP_INFO_VALUE_SIZE 1 #define HAVE_STRUCT_BPF_PROG_INFO 1 -/* #undef HAVE_STRUCT_BPF_PROG_INFO_BTF_ID */ +#define HAVE_STRUCT_BPF_PROG_INFO_BTF_ID 1 #define HAVE_STRUCT_BPF_PROG_INFO_CREATED_BY_UID 1 -/* #undef HAVE_STRUCT_BPF_PROG_INFO_FUNC_INFO */ -/* #undef HAVE_STRUCT_BPF_PROG_INFO_FUNC_INFO_REC_SIZE */ +#define HAVE_STRUCT_BPF_PROG_INFO_FUNC_INFO 1 +#define HAVE_STRUCT_BPF_PROG_INFO_FUNC_INFO_REC_SIZE 1 #define HAVE_STRUCT_BPF_PROG_INFO_ID 1 #define HAVE_STRUCT_BPF_PROG_INFO_IFINDEX 1 #define HAVE_STRUCT_BPF_PROG_INFO_JITED_FUNC_LENS 1 #define HAVE_STRUCT_BPF_PROG_INFO_JITED_KSYMS 1 -/* #undef HAVE_STRUCT_BPF_PROG_INFO_JITED_LINE_INFO */ -/* #undef HAVE_STRUCT_BPF_PROG_INFO_JITED_LINE_INFO_REC_SIZE */ +#define HAVE_STRUCT_BPF_PROG_INFO_JITED_LINE_INFO 1 +#define HAVE_STRUCT_BPF_PROG_INFO_JITED_LINE_INFO_REC_SIZE 1 #define HAVE_STRUCT_BPF_PROG_INFO_JITED_PROG_INSNS 1 #define HAVE_STRUCT_BPF_PROG_INFO_JITED_PROG_LEN 1 -/* #undef HAVE_STRUCT_BPF_PROG_INFO_LINE_INFO */ -/* #undef HAVE_STRUCT_BPF_PROG_INFO_LINE_INFO_REC_SIZE */ +#define HAVE_STRUCT_BPF_PROG_INFO_LINE_INFO 1 +#define HAVE_STRUCT_BPF_PROG_INFO_LINE_INFO_REC_SIZE 1 #define HAVE_STRUCT_BPF_PROG_INFO_LOAD_TIME 1 #define HAVE_STRUCT_BPF_PROG_INFO_MAP_IDS 1 #define HAVE_STRUCT_BPF_PROG_INFO_NAME 1 -/* #undef HAVE_STRUCT_BPF_PROG_INFO_NR_FUNC_INFO */ +#define HAVE_STRUCT_BPF_PROG_INFO_NR_FUNC_INFO 1 #define HAVE_STRUCT_BPF_PROG_INFO_NR_JITED_FUNC_LENS 1 #define HAVE_STRUCT_BPF_PROG_INFO_NR_JITED_KSYMS 1 -/* #undef HAVE_STRUCT_BPF_PROG_INFO_NR_JITED_LINE_INFO */ -/* #undef HAVE_STRUCT_BPF_PROG_INFO_NR_LINE_INFO */ +#define HAVE_STRUCT_BPF_PROG_INFO_NR_JITED_LINE_INFO 1 +#define HAVE_STRUCT_BPF_PROG_INFO_NR_LINE_INFO 1 #define HAVE_STRUCT_BPF_PROG_INFO_NR_MAP_IDS 1 -/* #undef HAVE_STRUCT_BPF_PROG_INFO_NR_PROG_TAGS */ -/* #undef HAVE_STRUCT_BPF_PROG_INFO_PROG_TAGS */ -/* #undef HAVE_STRUCT_BPF_PROG_INFO_RUN_CNT */ -/* #undef HAVE_STRUCT_BPF_PROG_INFO_RUN_TIME_NS */ +#define HAVE_STRUCT_BPF_PROG_INFO_NR_PROG_TAGS 1 +#define HAVE_STRUCT_BPF_PROG_INFO_PROG_TAGS 1 +#define HAVE_STRUCT_BPF_PROG_INFO_RUN_CNT 1 +#define HAVE_STRUCT_BPF_PROG_INFO_RUN_TIME_NS 1 #define HAVE_STRUCT_BPF_PROG_INFO_TAG 1 #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_FLAGS 1 #define HAVE_STRUCT_BTRFS_IOCTL_SEARCH_ARGS_V2_BUF_SIZE 1 -/* #undef HAVE_STRUCT_CLONE_ARGS */ +#define HAVE_STRUCT_CLONE_ARGS_SET_TID_SIZE 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 @@ -361,15 +376,33 @@ /* #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_RESV 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 +/* #undef HAVE_STRUCT_IO_URING_PARAMS_WQ_FD */ #define HAVE_STRUCT_KCMP_EPOLL_SLOT 1 #define HAVE_STRUCT_KEYCTL_KDF_PARAMS 1 +#define HAVE_STRUCT_KEYCTL_PKEY_PARAMS 1 +#define HAVE_STRUCT_KEYCTL_PKEY_QUERY 1 #define HAVE_STRUCT_KVM_CPUID2 1 #define HAVE_STRUCT_KVM_REGS 1 #define HAVE_STRUCT_KVM_SREGS 1 @@ -377,9 +410,11 @@ #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_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 #define HAVE_STRUCT_PERF_EVENT_ATTR_BRANCH_SAMPLE_TYPE 1 @@ -404,12 +439,16 @@ #define HAVE_STRUCT_PERF_EVENT_ATTR_WRITE_BACKWARD 1 #define HAVE_STRUCT_PTP_SYS_OFFSET 1 /* #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 */ @@ -443,25 +482,25 @@ /* #undef HAVE_STRUCT___KERNEL_FLOCK */ /* #undef HAVE_STRUCT___KERNEL_FLOCK64 */ /* #undef HAVE_STRUCT___KERNEL_F_OWNER_EX */ -/* #undef HAVE_STRUCT___KERNEL_SOCK_TIMEVAL */ -/* #undef HAVE_STRUCT___KERNEL_TIMESPEC */ +#define HAVE_STRUCT___KERNEL_SOCK_TIMEVAL 1 +#define HAVE_STRUCT___KERNEL_TIMESPEC 1 #define HAVE_STRUCT___OLD_KERNEL_STAT 1 +/* #undef HAVE_STRUCT___PTRACE_SYSCALL_INFO */ #define HAVE_SYNC_FILE_RANGE 1 /* #undef HAVE_SYS_CONF_H */ #define HAVE_SYS_EVENTFD_H 1 #define HAVE_SYS_FANOTIFY_H 1 #define HAVE_SYS_IPC_H 1 -#define HAVE_SYS_MSG_H 1 #define HAVE_SYS_QUOTA_H 1 -#define HAVE_SYS_SEM_H 1 -#define HAVE_SYS_SHM_H 1 #define HAVE_SYS_SIGNALFD_H 1 #define HAVE_SYS_STAT_H 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_XATTR_H 1 #define HAVE_TYPEOF 1 #define HAVE_UNION_BPF_ATTR_ATTACH_BPF_FD 1 +#define HAVE_UNION_BPF_ATTR_ATTACH_BTF_ID 1 #define HAVE_UNION_BPF_ATTR_ATTACH_FLAGS 1 +#define HAVE_UNION_BPF_ATTR_ATTACH_PROG_FD 1 #define HAVE_UNION_BPF_ATTR_ATTACH_TYPE 1 #define HAVE_UNION_BPF_ATTR_BPF_FD 1 #define HAVE_UNION_BPF_ATTR_BTF 1 @@ -477,9 +516,9 @@ #define HAVE_UNION_BPF_ATTR_EXPECTED_ATTACH_TYPE 1 #define HAVE_UNION_BPF_ATTR_FILE_FLAGS 1 #define HAVE_UNION_BPF_ATTR_FLAGS 1 -/* #undef HAVE_UNION_BPF_ATTR_FUNC_INFO */ -/* #undef HAVE_UNION_BPF_ATTR_FUNC_INFO_CNT */ -/* #undef HAVE_UNION_BPF_ATTR_FUNC_INFO_REC_SIZE */ +#define HAVE_UNION_BPF_ATTR_FUNC_INFO 1 +#define HAVE_UNION_BPF_ATTR_FUNC_INFO_CNT 1 +#define HAVE_UNION_BPF_ATTR_FUNC_INFO_REC_SIZE 1 #define HAVE_UNION_BPF_ATTR_INFO_BPF_FD 1 #define HAVE_UNION_BPF_ATTR_INFO_INFO 1 #define HAVE_UNION_BPF_ATTR_INFO_INFO_LEN 1 @@ -490,9 +529,9 @@ #define HAVE_UNION_BPF_ATTR_KEY 1 #define HAVE_UNION_BPF_ATTR_KEY_SIZE 1 #define HAVE_UNION_BPF_ATTR_LICENSE 1 -/* #undef HAVE_UNION_BPF_ATTR_LINE_INFO */ -/* #undef HAVE_UNION_BPF_ATTR_LINE_INFO_CNT */ -/* #undef HAVE_UNION_BPF_ATTR_LINE_INFO_REC_SIZE */ +#define HAVE_UNION_BPF_ATTR_LINE_INFO 1 +#define HAVE_UNION_BPF_ATTR_LINE_INFO_CNT 1 +#define HAVE_UNION_BPF_ATTR_LINE_INFO_REC_SIZE 1 #define HAVE_UNION_BPF_ATTR_LOG_BUF 1 #define HAVE_UNION_BPF_ATTR_LOG_LEVEL 1 #define HAVE_UNION_BPF_ATTR_LOG_SIZE 1 @@ -508,7 +547,7 @@ #define HAVE_UNION_BPF_ATTR_NUMA_NODE 1 #define HAVE_UNION_BPF_ATTR_OPEN_FLAGS 1 #define HAVE_UNION_BPF_ATTR_PATHNAME 1 -/* #undef HAVE_UNION_BPF_ATTR_PROG_BTF_FD */ +#define HAVE_UNION_BPF_ATTR_PROG_BTF_FD 1 #define HAVE_UNION_BPF_ATTR_PROG_FLAGS 1 #define HAVE_UNION_BPF_ATTR_PROG_ID 1 #define HAVE_UNION_BPF_ATTR_PROG_IFINDEX 1 @@ -533,10 +572,10 @@ #define HAVE_UNION_BPF_ATTR_TASK_FD_QUERY_PROBE_ADDR 1 #define HAVE_UNION_BPF_ATTR_TASK_FD_QUERY_PROBE_OFFSET 1 #define HAVE_UNION_BPF_ATTR_TASK_FD_QUERY_PROG_ID 1 -/* #undef HAVE_UNION_BPF_ATTR_TEST_CTX_IN */ -/* #undef HAVE_UNION_BPF_ATTR_TEST_CTX_OUT */ -/* #undef HAVE_UNION_BPF_ATTR_TEST_CTX_SIZE_IN */ -/* #undef HAVE_UNION_BPF_ATTR_TEST_CTX_SIZE_OUT */ +#define HAVE_UNION_BPF_ATTR_TEST_CTX_IN 1 +#define HAVE_UNION_BPF_ATTR_TEST_CTX_OUT 1 +#define HAVE_UNION_BPF_ATTR_TEST_CTX_SIZE_IN 1 +#define HAVE_UNION_BPF_ATTR_TEST_CTX_SIZE_OUT 1 #define HAVE_UNION_BPF_ATTR_TEST_DATA_IN 1 #define HAVE_UNION_BPF_ATTR_TEST_DATA_OUT 1 #define HAVE_UNION_BPF_ATTR_TEST_DATA_SIZE_IN 1 @@ -562,22 +601,24 @@ /* #undef LINUX_MIPSO32 */ /* #undef M32_SIZEOF_KERNEL_LONG_T */ /* #undef M32_SIZEOF_LONG */ +/* #undef M32_SIZEOF_STRUCT_MSQID64_DS */ /* #undef M68K */ -#define MANPAGE_DATE "2019-10-07" +#define MANPAGE_DATE "2020-02-04" /* #undef METAG */ /* #undef MICROBLAZE */ /* #undef MIPS */ /* #undef MX32_SIZEOF_KERNEL_LONG_T */ /* #undef MX32_SIZEOF_LONG */ +/* #undef MX32_SIZEOF_STRUCT_MSQID64_DS */ /* #undef NIOS2 */ /* #undef OR1K */ #define PACKAGE "strace" #define PACKAGE_BUGREPORT "strace-devel@lists.strace.io" #define PACKAGE_NAME "strace" -#define PACKAGE_STRING "strace 5.4" +#define PACKAGE_STRING "strace 5.5" #define PACKAGE_TARNAME "strace" #define PACKAGE_URL "https://strace.io" -#define PACKAGE_VERSION "5.4" +#define PACKAGE_VERSION "5.5" /* #undef POWERPC */ /* #undef POWERPC64 */ /* #undef POWERPC64LE */ @@ -591,6 +632,7 @@ #define SIZEOF_LONG_LONG 8 #define SIZEOF_OFF_T 8 #define SIZEOF_STRUCT_I64_I32 16 +#define SIZEOF_STRUCT_MSQID64_DS 120 /* #undef SPARC */ /* #undef SPARC64 */ #define STDC_HEADERS 1 @@ -614,7 +656,7 @@ # define __EXTENSIONS__ 1 #endif /* #undef USE_UNWINDER */ -#define VERSION "5.4" +#define VERSION "5.5" #if defined AC_APPLE_UNIVERSAL_BUILD # if defined __BIG_ENDIAN__ # define WORDS_BIGENDIAN 1 diff --git a/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch b/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch @@ -1,4 +1,4 @@ -From 9683c1affbd5b5a59e995bbb130cbc7b63699231 Mon Sep 17 00:00:00 2001 +From 9d1dae59f853865a5c1f00e4b6eacbef0a8b2476 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 @@ -20,7 +20,7 @@ Subject: [PATCH] Avoid empty initializer lists 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bpf.c b/bpf.c -index 9b6fb488..92c38a16 100644 +index b42cf29d..5befe454 100644 --- a/bpf.c +++ b/bpf.c @@ -43,7 +43,7 @@ bpf_cmd_decoder(struct tcb *const tcp, \ @@ -81,10 +81,10 @@ index 3cb54bb3..bc03dae8 100644 return; tprints(sprintsigmask_n("", mask, len)); diff --git a/strace.c b/strace.c -index 86ca3c35..810f5f4e 100644 +index e8bbf0ed..8ef16338 100644 --- a/strace.c +++ b/strace.c -@@ -2707,7 +2707,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig) +@@ -2837,7 +2837,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig) syscall_entering_finish(tcp, res); return res; } else { @@ -160,10 +160,10 @@ 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 e8f27f1d..5a6922bb 100644 +index a42d3b9b..3e48b1c1 100644 --- a/tests/restart_syscall.c +++ b/tests/restart_syscall.c -@@ -27,7 +27,7 @@ main(void) +@@ -26,7 +26,7 @@ main(void) */ error_msg_and_skip("x32 is broken"); #else @@ -171,7 +171,7 @@ index e8f27f1d..5a6922bb 100644 + const sigset_t set = {0}; const struct sigaction act = { .sa_handler = SIG_IGN }; const struct itimerval itv = { .it_value.tv_usec = 111111 }; - struct timespec req = { .tv_nsec = 222222222 }; + const struct timespec req = { .tv_nsec = 222222222 }; diff --git a/tests/setrlimit.c b/tests/setrlimit.c index 886cf65a..89ed1077 100644 --- a/tests/setrlimit.c @@ -225,5 +225,5 @@ index 8c87b7c4..c37736b7 100644 assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0); -- -2.24.0 +2.25.0 diff --git a/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch b/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch @@ -1,13 +1,14 @@ -From 7ac1f99173c3a5c994bfe4c063d38da4a086002c Mon Sep 17 00:00:00 2001 +From 1e79756600fe0550411083a8315cfe78e52a65c7 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 | 6 +++--- - 3 files changed, 6 insertions(+), 6 deletions(-) + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/netlink_smc_diag.c b/netlink_smc_diag.c index 16815fde..09a748a8 100644 @@ -31,8 +32,34 @@ index 16815fde..09a748a8 100644 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 +@@ -67,6 +67,8 @@ bool + PRINT_TIMESPEC_ARRAY_DATA_SIZE(const void *arg, const unsigned int nmemb, + const size_t size) + { ++ const char *ts = arg; ++ + if (nmemb > size / sizeof(TIMESPEC_T)) { + tprints("?"); + return false; +@@ -74,10 +76,10 @@ PRINT_TIMESPEC_ARRAY_DATA_SIZE(const void *arg, const unsigned int nmemb, + + tprints("["); + +- for (unsigned int i = 0; i < nmemb; i++, arg += sizeof(TIMESPEC_T)) { ++ for (unsigned int i = 0; i < nmemb; i++, ts += sizeof(TIMESPEC_T)) { + if (i) + tprints(", "); +- print_unaligned_timespec_t(arg); ++ print_unaligned_timespec_t(ts); + } + + tprints("]"); diff --git a/sockaddr.c b/sockaddr.c -index c67d60e9..0e6360f0 100644 +index b6b9aa7d..948fa517 100644 --- a/sockaddr.c +++ b/sockaddr.c @@ -475,7 +475,7 @@ print_sockaddr_data_ll(const void *const buf, const int addrlen) @@ -71,5 +98,5 @@ index 21f55e28..cee9f2e0 100644 len -= m; } -- -2.23.0 +2.25.1 diff --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,4 +1,4 @@ -From 6d750a8288a0ea05210e07614b5c535777b4631f Mon Sep 17 00:00:00 2001 +From 7b74b40431f95aeb4b6d6d75e7e3bcd84f04dd54 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 @@ -18,14 +18,14 @@ Subject: [PATCH] Avoid index ranges and empty initializer lists in syscallent linux/s390/syscallent.h | 42 +++++++++--------- linux/s390x/syscallent.h | 78 +++++++++++++++++----------------- linux/sh/syscallent.h | 12 +++--- - linux/sh64/syscallent.h | 18 ++++---- + linux/sh64/syscallent.h | 22 ++++++---- linux/sparc/syscallent.h | 6 +-- linux/sparc64/syscallent.h | 38 ++++++++--------- linux/xtensa/syscallent.h | 32 +++++++------- - 17 files changed, 170 insertions(+), 170 deletions(-) + 17 files changed, 175 insertions(+), 169 deletions(-) diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h -index b4026cc1..1bd0e60e 100644 +index ee8a8f9e..9e124d94 100644 --- a/linux/alpha/syscallent.h +++ b/linux/alpha/syscallent.h @@ -60,7 +60,7 @@ @@ -150,7 +150,7 @@ index b4026cc1..1bd0e60e 100644 [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 5c5c1254..144402bf 100644 +index b7947a5f..5e417da0 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -433,7 +433,7 @@ @@ -163,7 +163,7 @@ index 5c5c1254..144402bf 100644 [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 eb764b20..9a9ac4a3 100644 +index 239cc0cd..94376cb7 100644 --- a/linux/avr32/syscallent.h +++ b/linux/avr32/syscallent.h @@ -228,7 +228,7 @@ @@ -185,7 +185,7 @@ index eb764b20..9a9ac4a3 100644 [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 aabdb974..7b1d8b29 100644 +index db1b9281..8c734b95 100644 --- a/linux/bfin/syscallent.h +++ b/linux/bfin/syscallent.h @@ -229,7 +229,7 @@ @@ -198,7 +198,7 @@ index aabdb974..7b1d8b29 100644 [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 e2a62985..1e71b22a 100644 +index 71af311c..0a3c8b86 100644 --- a/linux/i386/syscallent.h +++ b/linux/i386/syscallent.h @@ -229,7 +229,7 @@ @@ -229,12 +229,12 @@ index e2a62985..1e71b22a 100644 [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 72c56c0b..c457a639 100644 +index e1f60abc..8755e917 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -225,7 +225,7 @@ - [215] = { 1, NF, SEN(setfsuid), "setfsuid32" }, - [216] = { 1, NF, SEN(setfsgid), "setfsgid32" }, + [215] = { 1, TC|NF, SEN(setfsuid), "setfsuid32" }, + [216] = { 1, TC|NF, SEN(setfsgid), "setfsgid32" }, [217] = { 2, TF, SEN(pivotroot), "pivot_root" }, -[218 ... 219] = { }, +/* [218 ... 219] - unused */ @@ -242,7 +242,7 @@ index 72c56c0b..c457a639 100644 [221] = { 0, PU|NF, SEN(gettid), "gettid" }, [222] = { 2, TS, SEN(kill), "tkill" }, diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h -index 40c19ce9..558f78df 100644 +index c934ffbe..fc42e467 100644 --- a/linux/microblaze/syscallent.h +++ b/linux/microblaze/syscallent.h @@ -229,7 +229,7 @@ @@ -273,7 +273,7 @@ index 40c19ce9..558f78df 100644 [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 fce44a27..297bfb90 100644 +index 690cc823..26faaabd 100644 --- a/linux/mips/syscallent-compat.h +++ b/linux/mips/syscallent-compat.h @@ -69,13 +69,13 @@ @@ -309,7 +309,7 @@ index fce44a27..297bfb90 100644 [ 139] = { 0, 0, SEN(printargs), "svr4_sysinfo" }, -[ 140] = { }, +/* [ 140] - unused */ - [ 141] = { 0, 0, SEN(printargs), "svr4_seteuid" }, + [ 141] = { 0, TC, SEN(printargs), "svr4_seteuid" }, [ 142] = { 0, 0, SEN(printargs), "svr4_PYRAMID_statis" }, [ 143] = { 0, 0, SEN(printargs), "svr4_PYRAMID_tuning" }, [ 144] = { 0, 0, SEN(printargs), "svr4_PYRAMID_forcerr" }, @@ -336,8 +336,8 @@ index fce44a27..297bfb90 100644 [1071] = { 0, 0, SEN(printargs), "sysv_unadvfs" }, [1072] = { 0, 0, SEN(printargs), "sysv_rmount" }, @@ -390,8 +390,8 @@ - [2046] = { 0, 0, SEN(printargs), "bsd43_setgid" }, - [2047] = { 0, 0, SEN(printargs), "bsd43_getgid" }, + [2046] = { 0, TC, SEN(printargs), "bsd43_setgid" }, + [2047] = { 0, TC, SEN(printargs), "bsd43_getgid" }, [2048] = { 0, 0, SEN(printargs), "bsd43_ssig" }, -[2049] = { }, -[2050] = { }, @@ -437,7 +437,7 @@ index fce44a27..297bfb90 100644 [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 104a6e23..3ca5bef5 100644 +index 2a5031d5..911f6f8a 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -231,7 +231,7 @@ @@ -450,7 +450,7 @@ index 104a6e23..3ca5bef5 100644 [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 06c223a5..9672b4f9 100644 +index 51763504..b49d5b4f 100644 --- a/linux/powerpc64/syscallent.h +++ b/linux/powerpc64/syscallent.h @@ -199,14 +199,14 @@ @@ -492,7 +492,7 @@ index 06c223a5..9672b4f9 100644 [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 826a3c62..16f94b07 100644 +index 384cdadf..21edf749 100644 --- a/linux/s390/syscallent.h +++ b/linux/s390/syscallent.h @@ -26,8 +26,8 @@ @@ -532,10 +532,10 @@ index 826a3c62..16f94b07 100644 -[ 44] = { }, +/* [ 44] - unused */ [ 45] = { 1, TM|SI, SEN(brk), "brk" }, - [ 46] = { 1, 0, SEN(setgid16), "setgid" }, - [ 47] = { 0, PU|NF, SEN(getgid16), "getgid" }, + [ 46] = { 1, TC, SEN(setgid16), "setgid" }, + [ 47] = { 0, TC|PU|NF, SEN(getgid16), "getgid" }, @@ -62,13 +62,13 @@ - [ 50] = { 0, PU|NF, SEN(getegid16), "getegid" }, + [ 50] = { 0, TC|PU|NF, SEN(getegid16), "getegid" }, [ 51] = { 1, TF, SEN(acct), "acct" }, [ 52] = { 2, TF, SEN(umount2), "umount2" }, -[ 53] = { }, @@ -560,13 +560,13 @@ index 826a3c62..16f94b07 100644 -[ 69] = { }, +/* [ 68] - unused */ +/* [ 69] - unused */ - [ 70] = { 2, 0, SEN(setreuid16), "setreuid" }, - [ 71] = { 2, 0, SEN(setregid16), "setregid" }, + [ 70] = { 2, TC, SEN(setreuid16), "setreuid" }, + [ 71] = { 2, TC, SEN(setregid16), "setregid" }, [ 72] = { 3, TS, SEN(sigsuspend), "sigsuspend" }, @@ -91,9 +91,9 @@ [ 79] = { 2, 0, SEN(settimeofday), "settimeofday" }, - [ 80] = { 2, 0, SEN(getgroups16), "getgroups" }, - [ 81] = { 2, 0, SEN(setgroups16), "setgroups" }, + [ 80] = { 2, TC, SEN(getgroups16), "getgroups" }, + [ 81] = { 2, TC, SEN(setgroups16), "setgroups" }, -[ 82] = { }, +/* [ 82] - unused */ [ 83] = { 2, TF, SEN(symlink), "symlink" }, @@ -609,8 +609,8 @@ index 826a3c62..16f94b07 100644 [126] = { 3, TS, SEN(sigprocmask), "sigprocmask" }, @@ -175,7 +175,7 @@ [163] = { 5, TM|SI, SEN(mremap), "mremap" }, - [164] = { 3, 0, SEN(setresuid16), "setresuid" }, - [165] = { 3, 0, SEN(getresuid16), "getresuid" }, + [164] = { 3, TC, SEN(setresuid16), "setresuid" }, + [165] = { 3, TC, SEN(getresuid16), "getresuid" }, -[166] = { }, +/* [166] - unused */ [167] = { 5, 0, SEN(query_module), "query_module" }, @@ -626,7 +626,7 @@ index 826a3c62..16f94b07 100644 [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 7c35e7f9..f672a60a 100644 +index 4a70b399..0497b2f9 100644 --- a/linux/s390x/syscallent.h +++ b/linux/s390x/syscallent.h @@ -21,29 +21,29 @@ @@ -785,7 +785,7 @@ index 7c35e7f9..f672a60a 100644 [169] = { 3, 0, SEN(nfsservctl), "nfsservctl" }, -[170 ... 171] = { }, +/* [170 ... 171] - unused */ - [172] = { 5, 0, SEN(prctl), "prctl" }, + [172] = { 5, TC, SEN(prctl), "prctl" }, [173] = { 0, TS, SEN(rt_sigreturn), "rt_sigreturn" }, [174] = { 4, TS, SEN(rt_sigaction), "rt_sigaction" }, @@ -180,7 +180,7 @@ @@ -795,8 +795,8 @@ index 7c35e7f9..f672a60a 100644 -[182] = { }, +/* [182] - unused */ [183] = { 2, TF, SEN(getcwd), "getcwd" }, - [184] = { 2, 0, SEN(capget), "capget" }, - [185] = { 2, 0, SEN(capset), "capset" }, + [184] = { 2, TC, SEN(capget), "capget" }, + [185] = { 2, TC, SEN(capset), "capset" }, @@ -190,7 +190,7 @@ [189] = { 5, TN, SEN(putpmsg), "putpmsg" }, [190] = { 0, TP, SEN(vfork), "vfork" }, @@ -804,8 +804,8 @@ index 7c35e7f9..f672a60a 100644 -[196 ... 197] = { }, +/* [196 ... 197] - unused */ [198] = { 3, TF, SEN(chown), "lchown" }, - [199] = { 0, PU|NF, SEN(getuid), "getuid" }, - [200] = { 0, PU|NF, SEN(getgid), "getgid" }, + [199] = { 0, TC|PU|NF, SEN(getuid), "getuid" }, + [200] = { 0, TC|PU|NF, SEN(getgid), "getgid" }, @@ -214,9 +214,9 @@ [218] = { 3, TM, SEN(mincore), "mincore" }, [219] = { 3, TM, SEN(madvise), "madvise" }, @@ -837,11 +837,11 @@ index 7c35e7f9..f672a60a 100644 [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 5ed56927..609781bd 100644 +index 9841df06..02316993 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -197,7 +197,7 @@ - [185] = { 2, 0, SEN(capset), "capset" }, + [185] = { 2, TC, SEN(capset), "capset" }, [186] = { 2, TS, SEN(sigaltstack), "sigaltstack" }, [187] = { 4, TD|TN, SEN(sendfile), "sendfile" }, -[188 ... 189] = { }, @@ -894,13 +894,13 @@ index 5ed56927..609781bd 100644 [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 12b8ffc0..39ac05a8 100644 +index 9a48cf0e..7607ceb7 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -89,7 +89,7 @@ [ 79] = { 2, 0, SEN(settimeofday), "settimeofday" }, - [ 80] = { 2, 0, SEN(getgroups16), "getgroups" }, - [ 81] = { 2, 0, SEN(setgroups16), "setgroups" }, + [ 80] = { 2, TC, SEN(getgroups16), "getgroups" }, + [ 81] = { 2, TC, SEN(setgroups16), "setgroups" }, -[ 82] = { }, +/* [ 82] - unused */ [ 83] = { 2, TF, SEN(symlink), "symlink" }, @@ -915,17 +915,24 @@ index 12b8ffc0..39ac05a8 100644 [114] = { 4, TP, SEN(wait4), "wait4" }, [115] = { 1, TF, SEN(swapoff), "swapoff" }, [116] = { 1, 0, SEN(sysinfo), "sysinfo" }, -@@ -173,7 +173,7 @@ +@@ -171,9 +171,15 @@ + [161] = { 2, 0, SEN(sched_rr_get_interval_time64),"sched_rr_get_interval"}, + [162] = { 2, 0, SEN(nanosleep_time64), "nanosleep" }, [163] = { 5, TM|SI, SEN(mremap), "mremap" }, - [164] = { 3, 0, SEN(setresuid16), "setresuid" }, - [165] = { 3, 0, SEN(getresuid16), "getresuid" }, --[166] = { }, ++<<<<<<< HEAD + [164] = { 3, TC, SEN(setresuid16), "setresuid" }, + [165] = { 3, TC, SEN(getresuid16), "getresuid" }, + [166] = { }, ++======= ++[164] = { 3, 0, SEN(setresuid16), "setresuid" }, ++[165] = { 3, 0, SEN(getresuid16), "getresuid" }, +/* [166] - unused */ ++>>>>>>> c63898a0... Avoid index ranges and empty initializer lists in syscallent arrays [167] = { 5, 0, SEN(query_module), "query_module" }, [168] = { 3, TD, SEN(poll_time64), "poll" }, [169] = { 3, 0, SEN(nfsservctl), "nfsservctl" }, -@@ -195,7 +195,7 @@ - [185] = { 2, 0, SEN(capset), "capset" }, +@@ -195,7 +201,7 @@ + [185] = { 2, TC, SEN(capset), "capset" }, [186] = { 2, TS, SEN(sigaltstack), "sigaltstack" }, [187] = { 4, TD|TN, SEN(sendfile), "sendfile" }, -[188 ... 189] = { }, @@ -933,7 +940,7 @@ index 12b8ffc0..39ac05a8 100644 [190] = { 0, TP, SEN(vfork), "vfork" }, [191] = { 2, 0, SEN(getrlimit), "ugetrlimit" }, [192] = { 6, TD|TM|SI, SEN(mmap_4koff), "mmap2" }, -@@ -256,7 +256,7 @@ +@@ -256,7 +262,7 @@ [247] = { 3, TI, SEN(shmctl), "shmctl" }, [248] = { 3, TD, SEN(getdents64), "getdents64" }, [249] = { 3, TD, SEN(fcntl64), "fcntl64" }, @@ -942,7 +949,7 @@ index 12b8ffc0..39ac05a8 100644 [252] = { 0, PU|NF, SEN(gettid), "gettid" }, [253] = { 3, TD, SEN(readahead), "readahead" }, [254] = { 5, TF, SEN(setxattr), "setxattr" }, -@@ -276,14 +276,14 @@ +@@ -276,14 +282,14 @@ [268] = { 6, 0, SEN(futex_time64), "futex" }, [269] = { 3, 0, SEN(sched_setaffinity), "sched_setaffinity" }, [270] = { 3, 0, SEN(sched_getaffinity), "sched_getaffinity" }, @@ -959,7 +966,7 @@ index 12b8ffc0..39ac05a8 100644 [280] = { 1, TP|SE, SEN(exit), "exit_group" }, [281] = { 3, 0, SEN(lookup_dcookie), "lookup_dcookie" }, [282] = { 1, TD, SEN(epoll_create), "epoll_create" }, -@@ -305,7 +305,7 @@ +@@ -305,7 +311,7 @@ [298] = { 3, TS, SEN(tgkill), "tgkill" }, [299] = { 2, TF, SEN(utimes), "utimes" }, [300] = { 4, TD, SEN(fadvise64_64), "fadvise64_64" }, @@ -968,7 +975,7 @@ index 12b8ffc0..39ac05a8 100644 [302] = { 6, TM, SEN(mbind), "mbind" }, [303] = { 5, TM, SEN(get_mempolicy), "get_mempolicy" }, [304] = { 3, TM, SEN(set_mempolicy), "set_mempolicy" }, -@@ -325,7 +325,7 @@ +@@ -325,7 +331,7 @@ [318] = { 0, TD, SEN(inotify_init), "inotify_init" }, [319] = { 3, TD|TF, SEN(inotify_add_watch), "inotify_add_watch" }, [320] = { 2, TD, SEN(inotify_rm_watch), "inotify_rm_watch" }, @@ -978,16 +985,16 @@ index 12b8ffc0..39ac05a8 100644 [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 a10fbc03..af9c0cba 100644 +index 6acce0c8..99513f92 100644 --- a/linux/sparc/syscallent.h +++ b/linux/sparc/syscallent.h @@ -57,7 +57,7 @@ - [ 49] = { 0, PU|NF, SEN(geteuid16), "geteuid" }, - [ 50] = { 0, PU|NF, SEN(getegid16), "getegid" }, + [ 49] = { 0, TC|PU|NF, SEN(geteuid16), "geteuid" }, + [ 50] = { 0, TC|PU|NF, SEN(getegid16), "getegid" }, [ 51] = { 1, TF, SEN(acct), "acct" }, -[ 52] = { }, +/* [ 52] - unused */ - [ 53] = { 0, PU|NF, SEN(getgid), "getgid32" }, + [ 53] = { 0, TC|PU|NF, SEN(getgid), "getgid32" }, [ 54] = { 3, TD, SEN(ioctl), "ioctl" }, [ 55] = { 4, 0, SEN(reboot), "reboot" }, @@ -169,7 +169,7 @@ @@ -1009,7 +1016,7 @@ index a10fbc03..af9c0cba 100644 [269] = { 1, TM, SEN(io_destroy), "io_destroy" }, [270] = { 3, 0, SEN(io_submit), "io_submit" }, diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h -index 41046df9..35cb764c 100644 +index e7f25646..e00b1098 100644 --- a/linux/sparc64/syscallent.h +++ b/linux/sparc64/syscallent.h @@ -36,10 +36,10 @@ @@ -1032,10 +1039,10 @@ index 41046df9..35cb764c 100644 -[ 44] = { }, +/* [ 44] - unused */ [ 45] = { 2, TF, SEN(umount2), "umount2" }, - [ 46] = { 1, 0, SEN(setgid), "setgid" }, - [ 47] = { 0, PU|NF, SEN(getgid), "getgid" }, + [ 46] = { 1, TC, SEN(setgid), "setgid" }, + [ 47] = { 0, TC|PU|NF, SEN(getgid), "getgid" }, @@ -57,10 +57,10 @@ - [ 50] = { 0, PU|NF, SEN(getegid), "getegid" }, + [ 50] = { 0, TC|PU|NF, SEN(getegid), "getegid" }, [ 51] = { 1, TF, SEN(acct), "acct" }, [ 52] = { 2, 0, SEN(printargs), "memory_ordering" }, -[ 53] = { }, @@ -1063,8 +1070,8 @@ index 41046df9..35cb764c 100644 -[ 77] = { }, +/* [ 77] - unused */ [ 78] = { 3, TM, SEN(mincore), "mincore" }, - [ 79] = { 2, 0, SEN(getgroups), "getgroups" }, - [ 80] = { 2, 0, SEN(setgroups), "setgroups" }, + [ 79] = { 2, TC, SEN(getgroups), "getgroups" }, + [ 80] = { 2, TC, SEN(setgroups), "setgroups" }, [ 81] = { 0, PU|NF, SEN(getpgrp), "getpgrp" }, -[ 82] = { }, +/* [ 82] - unused */ @@ -1089,9 +1096,9 @@ index 41046df9..35cb764c 100644 [ 96] = { 3, 0, SEN(setpriority), "setpriority" }, [ 97] = { 3, TN, SEN(socket), "socket" }, @@ -115,10 +115,10 @@ - [109] = { 3, 0, SEN(getresuid), "getresuid" }, - [110] = { 3, 0, SEN(setresgid), "setresgid" }, - [111] = { 3, 0, SEN(getresgid), "getresgid" }, + [109] = { 3, TC, SEN(getresuid), "getresuid" }, + [110] = { 3, TC, SEN(setresgid), "setresgid" }, + [111] = { 3, TC, SEN(getresgid), "getresgid" }, -[112] = { }, +/* [112] - unused */ [113] = { 3, TN, SEN(recvmsg), "recvmsg" }, @@ -1111,8 +1118,8 @@ index 41046df9..35cb764c 100644 [157] = { 2, TF|TSF|TSFA, SEN(statfs), "statfs" }, [158] = { 2, TD|TFSF|TSFA, SEN(fstatfs), "fstatfs" }, @@ -234,7 +234,7 @@ - [228] = { 1, NF, SEN(setfsuid), "setfsuid" }, - [229] = { 1, NF, SEN(setfsgid), "setfsgid" }, + [228] = { 1, TC|NF, SEN(setfsuid), "setfsuid" }, + [229] = { 1, TC|NF, SEN(setfsgid), "setfsgid" }, [230] = { 5, TD, SEN(select), "_newselect" }, -[231] = { }, +/* [231] - unused */ @@ -1129,7 +1136,7 @@ index 41046df9..35cb764c 100644 [269] = { 1, TM, SEN(io_destroy), "io_destroy" }, [270] = { 3, 0, SEN(io_submit), "io_submit" }, diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h -index 3e1a4ac1..b84f5601 100644 +index d4823484..571dd0eb 100644 --- a/linux/xtensa/syscallent.h +++ b/linux/xtensa/syscallent.h @@ -7,7 +7,7 @@ @@ -1254,5 +1261,5 @@ index 3e1a4ac1..b84f5601 100644 [321] = { 6, TD|TF, SEN(fanotify_mark), "fanotify_mark" }, [322] = { 6, 0, SEN(process_vm_readv), "process_vm_readv" }, -- -2.23.0 +2.25.0 diff --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,4 +1,4 @@ -From 6d1a94be837a58a3151e6063537ad75a77541738 Mon Sep 17 00:00:00 2001 +From d611486eb337e97b15886059a1b55319bd02d3e1 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 @@ -8,10 +8,10 @@ Subject: [PATCH] Use alloca when VLAs aren't available 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/evdev.c b/evdev.c -index 72addff6..bc6257ad 100644 +index 573f18f4..27eb8a38 100644 --- a/evdev.c +++ b/evdev.c -@@ -237,9 +237,13 @@ decode_bitset(struct tcb *const tcp, const kernel_ulong_t arg, +@@ -198,9 +198,13 @@ decode_bitset(struct tcb *const tcp, const kernel_ulong_t arg, return RVAL_IOCTL_DECODED; } @@ -26,7 +26,7 @@ index 72addff6..bc6257ad 100644 return RVAL_IOCTL_DECODED; if (xlat_verbose(xlat_verbosity) != XLAT_STYLE_RAW) { -@@ -296,9 +300,13 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code, +@@ -255,9 +259,13 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code, return RVAL_IOCTL_DECODED; } @@ -41,7 +41,7 @@ index 72addff6..bc6257ad 100644 return RVAL_IOCTL_DECODED; tprints("{code="); -@@ -307,7 +315,7 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code, +@@ -266,7 +274,7 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code, tprints(", values=["); unsigned int i; diff --git a/pkg/strace/sha256 b/pkg/strace/sha256 @@ -1 +1 @@ -f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741 strace-5.4.tar.xz +9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff strace-5.5.tar.xz diff --git a/pkg/strace/url b/pkg/strace/url @@ -1 +1 @@ -url = "https://github.com/strace/strace/releases/download/v5.4/strace-5.4.tar.xz" +url = "https://github.com/strace/strace/releases/download/v5.5/strace-5.5.tar.xz" diff --git a/pkg/strace/ver b/pkg/strace/ver @@ -1 +1 @@ -5.4 r1 +5.5 r0