commit: b21079f323caca81fd8245fbe396320f6d210780 parent 1bd3598ce4fd41e984649034df12e6828e1bed0c Author: Michael Forney <mforney@mforney.org> Date: Tue, 2 Jun 2020 01:08:29 -0700 strace: Update to 5.7Diffstat:
16 files changed, 449 insertions(+), 146 deletions(-)diff --git a/pkg/strace/.gitignore b/pkg/strace/.gitignore@@ -1,3 +1,3 @@ /src -/strace-5.6.tar.xz +/strace-5.7.tar.xz /tools.ninjadiff --git a/pkg/strace/config.h b/pkg/strace/config.h@@ -21,101 +21,389 @@ #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_CTL_ABI 1 #define HAVE_DECL_CTL_ARLAN 1 +#define HAVE_DECL_CTL_BUS 1 +#define HAVE_DECL_CTL_CPU 1 +#define HAVE_DECL_CTL_DEBUG 1 +#define HAVE_DECL_CTL_DEV 1 #define HAVE_DECL_CTL_FRV 1 +#define HAVE_DECL_CTL_FS 1 +#define HAVE_DECL_CTL_KERN 1 +#define HAVE_DECL_CTL_NET 1 #define HAVE_DECL_CTL_PM 1 #define HAVE_DECL_CTL_PROC 1 #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_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_KERN_ACCT 1 #define HAVE_DECL_KERN_ACPI_VIDEO_FLAGS 1 #define HAVE_DECL_KERN_BOOTLOADER_TYPE 1 +#define HAVE_DECL_KERN_CADPID 1 #define HAVE_DECL_KERN_COMPAT_LOG 1 +#define HAVE_DECL_KERN_CORE_PATTERN 1 +#define HAVE_DECL_KERN_CORE_USES_PID 1 +#define HAVE_DECL_KERN_CTLALTDEL 1 +#define HAVE_DECL_KERN_DOMAINNAME 1 +#define HAVE_DECL_KERN_HOTPLUG 1 +#define HAVE_DECL_KERN_HPPA_PWRSW 1 +#define HAVE_DECL_KERN_HPPA_UNALIGNED 1 #define HAVE_DECL_KERN_HZ_TIMER 1 #define HAVE_DECL_KERN_IA64_UNALIGNED 1 +#define HAVE_DECL_KERN_IEEE_EMULATION_WARNINGS 1 #define HAVE_DECL_KERN_MAX_LOCK_DEPTH 1 +#define HAVE_DECL_KERN_MAX_THREADS 1 +#define HAVE_DECL_KERN_MODPROBE 1 +#define HAVE_DECL_KERN_MSGMAX 1 +#define HAVE_DECL_KERN_MSGMNB 1 +#define HAVE_DECL_KERN_MSGMNI 1 +#define HAVE_DECL_KERN_MSGPOOL 1 +#define HAVE_DECL_KERN_NAMETRANS 1 #define HAVE_DECL_KERN_NGROUPS_MAX 1 #define HAVE_DECL_KERN_NMI_WATCHDOG 1 +#define HAVE_DECL_KERN_NODENAME 1 +#define HAVE_DECL_KERN_OSRELEASE 1 +#define HAVE_DECL_KERN_OSREV 1 +#define HAVE_DECL_KERN_OSTYPE 1 +#define HAVE_DECL_KERN_OVERFLOWGID 1 +#define HAVE_DECL_KERN_OVERFLOWUID 1 +#define HAVE_DECL_KERN_PANIC 1 #define HAVE_DECL_KERN_PANIC_ON_NMI 1 +#define HAVE_DECL_KERN_PANIC_ON_OOPS 1 #define HAVE_DECL_KERN_PANIC_ON_WARN 1 #define HAVE_DECL_KERN_PANIC_PRINT 1 +#define HAVE_DECL_KERN_PIDMAX 1 +#define HAVE_DECL_KERN_PPC_HTABRECLAIM 1 +#define HAVE_DECL_KERN_PPC_L2CR 1 +#define HAVE_DECL_KERN_PPC_POWERSAVE_NAP 1 +#define HAVE_DECL_KERN_PPC_ZEROPAGED 1 +#define HAVE_DECL_KERN_PRINTK 1 #define HAVE_DECL_KERN_PRINTK_RATELIMIT 1 #define HAVE_DECL_KERN_PRINTK_RATELIMIT_BURST 1 +#define HAVE_DECL_KERN_PROF 1 #define HAVE_DECL_KERN_PTY 1 +#define HAVE_DECL_KERN_RANDOM 1 #define HAVE_DECL_KERN_RANDOMIZE 1 +#define HAVE_DECL_KERN_REALROOTDEV 1 +#define HAVE_DECL_KERN_RTSIGMAX 1 +#define HAVE_DECL_KERN_RTSIGNR 1 +#define HAVE_DECL_KERN_S390_USER_DEBUG_LOGGING 1 +#define HAVE_DECL_KERN_SECUREMASK 1 +#define HAVE_DECL_KERN_SEM 1 #define HAVE_DECL_KERN_SETUID_DUMPABLE 1 +#define HAVE_DECL_KERN_SG_BIG_BUFF 1 +#define HAVE_DECL_KERN_SHMALL 1 +#define HAVE_DECL_KERN_SHMMAX 1 +#define HAVE_DECL_KERN_SHMMNI 1 +#define HAVE_DECL_KERN_SHMPATH 1 +#define HAVE_DECL_KERN_SPARC_REBOOT 1 #define HAVE_DECL_KERN_SPARC_SCONS_PWROFF 1 +#define HAVE_DECL_KERN_SPARC_STOP_A 1 #define HAVE_DECL_KERN_SPIN_RETRY 1 +#define HAVE_DECL_KERN_SYSRQ 1 +#define HAVE_DECL_KERN_TAINTED 1 #define HAVE_DECL_KERN_UNKNOWN_NMI_PANIC 1 +#define HAVE_DECL_KERN_VERSION 1 #define HAVE_DECL_LO_FLAGS_AUTOCLEAR 1 #define HAVE_DECL_LO_FLAGS_DIRECT_IO 1 #define HAVE_DECL_LO_FLAGS_PARTSCAN 1 #define HAVE_DECL_LO_FLAGS_READ_ONLY 1 #define HAVE_DECL_LO_FLAGS_USE_AOPS 0 +#define HAVE_DECL_NET_802 1 +#define HAVE_DECL_NET_ATALK 1 +#define HAVE_DECL_NET_AX25 1 +#define HAVE_DECL_NET_BRIDGE 1 #define HAVE_DECL_NET_CIPSOV4_CACHE_BUCKET_SIZE 1 #define HAVE_DECL_NET_CIPSOV4_CACHE_ENABLE 1 #define HAVE_DECL_NET_CIPSOV4_RBM_OPTFMT 1 #define HAVE_DECL_NET_CIPSOV4_RBM_STRICTVALID 1 +#define HAVE_DECL_NET_CORE 1 #define HAVE_DECL_NET_CORE_AEVENT_ETIME 1 #define HAVE_DECL_NET_CORE_AEVENT_RSEQTH 1 #define HAVE_DECL_NET_CORE_BUDGET 1 #define HAVE_DECL_NET_CORE_DESTROY_DELAY 0 +#define HAVE_DECL_NET_CORE_DEV_WEIGHT 1 +#define HAVE_DECL_NET_CORE_DIVERT_VERSION 1 +#define HAVE_DECL_NET_CORE_FASTROUTE 1 +#define HAVE_DECL_NET_CORE_HOT_LIST_LENGTH 1 +#define HAVE_DECL_NET_CORE_LO_CONG 1 +#define HAVE_DECL_NET_CORE_MAX_BACKLOG 1 +#define HAVE_DECL_NET_CORE_MOD_CONG 1 +#define HAVE_DECL_NET_CORE_MSG_BURST 1 +#define HAVE_DECL_NET_CORE_MSG_COST 1 +#define HAVE_DECL_NET_CORE_NO_CONG 1 +#define HAVE_DECL_NET_CORE_NO_CONG_THRESH 1 +#define HAVE_DECL_NET_CORE_OPTMEM_MAX 1 +#define HAVE_DECL_NET_CORE_RMEM_DEFAULT 1 +#define HAVE_DECL_NET_CORE_RMEM_MAX 1 +#define HAVE_DECL_NET_CORE_SOMAXCONN 1 #define HAVE_DECL_NET_CORE_WARNINGS 1 +#define HAVE_DECL_NET_CORE_WMEM_DEFAULT 1 +#define HAVE_DECL_NET_CORE_WMEM_MAX 1 #define HAVE_DECL_NET_DCCP 1 +#define HAVE_DECL_NET_DECNET 1 +#define HAVE_DECL_NET_ECONET 1 +#define HAVE_DECL_NET_ETHER 1 +#define HAVE_DECL_NET_IPV4 1 +#define HAVE_DECL_NET_IPV4_ALWAYS_DEFRAG 1 +#define HAVE_DECL_NET_IPV4_AUTOCONFIG 1 +#define HAVE_DECL_NET_IPV4_CONF 1 +#define HAVE_DECL_NET_IPV4_CONF_ACCEPT_REDIRECTS 1 +#define HAVE_DECL_NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE 1 +#define HAVE_DECL_NET_IPV4_CONF_ARPFILTER 1 #define HAVE_DECL_NET_IPV4_CONF_ARP_ACCEPT 1 #define HAVE_DECL_NET_IPV4_CONF_ARP_ANNOUNCE 1 #define HAVE_DECL_NET_IPV4_CONF_ARP_IGNORE 1 #define HAVE_DECL_NET_IPV4_CONF_ARP_NOTIFY 1 +#define HAVE_DECL_NET_IPV4_CONF_BOOTP_RELAY 1 #define HAVE_DECL_NET_IPV4_CONF_FORCE_IGMP_VERSION 1 +#define HAVE_DECL_NET_IPV4_CONF_FORWARDING 1 +#define HAVE_DECL_NET_IPV4_CONF_LOG_MARTIANS 1 +#define HAVE_DECL_NET_IPV4_CONF_MC_FORWARDING 1 +#define HAVE_DECL_NET_IPV4_CONF_MEDIUM_ID 1 +#define HAVE_DECL_NET_IPV4_CONF_NOPOLICY 1 +#define HAVE_DECL_NET_IPV4_CONF_NOXFRM 1 #define HAVE_DECL_NET_IPV4_CONF_PROMOTE_SECONDARIES 1 +#define HAVE_DECL_NET_IPV4_CONF_PROXY_ARP 1 +#define HAVE_DECL_NET_IPV4_CONF_RP_FILTER 1 +#define HAVE_DECL_NET_IPV4_CONF_SECURE_REDIRECTS 1 +#define HAVE_DECL_NET_IPV4_CONF_SEND_REDIRECTS 1 +#define HAVE_DECL_NET_IPV4_CONF_SHARED_MEDIA 1 +#define HAVE_DECL_NET_IPV4_CONF_TAG 1 +#define HAVE_DECL_NET_IPV4_DEFAULT_TTL 1 +#define HAVE_DECL_NET_IPV4_DYNADDR 1 +#define HAVE_DECL_NET_IPV4_FIB_HASH 1 +#define HAVE_DECL_NET_IPV4_FORWARD 1 +#define HAVE_DECL_NET_IPV4_ICMP_DESTUNREACH_RATE 1 +#define HAVE_DECL_NET_IPV4_ICMP_ECHOREPLY_RATE 1 +#define HAVE_DECL_NET_IPV4_ICMP_ECHO_IGNORE_ALL 1 +#define HAVE_DECL_NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS 1 #define HAVE_DECL_NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR 1 +#define HAVE_DECL_NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES 1 +#define HAVE_DECL_NET_IPV4_ICMP_PARAMPROB_RATE 1 +#define HAVE_DECL_NET_IPV4_ICMP_RATELIMIT 1 +#define HAVE_DECL_NET_IPV4_ICMP_RATEMASK 1 +#define HAVE_DECL_NET_IPV4_ICMP_SOURCEQUENCH_RATE 1 +#define HAVE_DECL_NET_IPV4_ICMP_TIMEEXCEED_RATE 1 +#define HAVE_DECL_NET_IPV4_IGMP_MAX_MEMBERSHIPS 1 #define HAVE_DECL_NET_IPV4_IGMP_MAX_MSF 1 +#define HAVE_DECL_NET_IPV4_INET_PEER_GC_MAXTIME 1 +#define HAVE_DECL_NET_IPV4_INET_PEER_GC_MINTIME 1 +#define HAVE_DECL_NET_IPV4_INET_PEER_MAXTTL 1 +#define HAVE_DECL_NET_IPV4_INET_PEER_MINTTL 1 +#define HAVE_DECL_NET_IPV4_INET_PEER_THRESHOLD 1 +#define HAVE_DECL_NET_IPV4_IPFRAG_HIGH_THRESH 1 +#define HAVE_DECL_NET_IPV4_IPFRAG_LOW_THRESH 1 #define HAVE_DECL_NET_IPV4_IPFRAG_MAX_DIST 1 +#define HAVE_DECL_NET_IPV4_IPFRAG_SECRET_INTERVAL 1 +#define HAVE_DECL_NET_IPV4_IPFRAG_TIME 1 +#define HAVE_DECL_NET_IPV4_IP_MASQ_DEBUG 1 +#define HAVE_DECL_NET_IPV4_LOCAL_PORT_RANGE 1 +#define HAVE_DECL_NET_IPV4_NEIGH 1 +#define HAVE_DECL_NET_IPV4_NETFILTER 1 +#define HAVE_DECL_NET_IPV4_NONLOCAL_BIND 1 +#define HAVE_DECL_NET_IPV4_NO_PMTU_DISC 1 +#define HAVE_DECL_NET_IPV4_ROUTE 1 +#define HAVE_DECL_NET_IPV4_ROUTE_ERROR_BURST 1 +#define HAVE_DECL_NET_IPV4_ROUTE_ERROR_COST 1 +#define HAVE_DECL_NET_IPV4_ROUTE_FLUSH 1 +#define HAVE_DECL_NET_IPV4_ROUTE_GC_ELASTICITY 1 +#define HAVE_DECL_NET_IPV4_ROUTE_GC_INTERVAL 1 +#define HAVE_DECL_NET_IPV4_ROUTE_GC_MIN_INTERVAL 1 #define HAVE_DECL_NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS 1 +#define HAVE_DECL_NET_IPV4_ROUTE_GC_THRESH 1 +#define HAVE_DECL_NET_IPV4_ROUTE_GC_TIMEOUT 1 +#define HAVE_DECL_NET_IPV4_ROUTE_MAX_DELAY 1 +#define HAVE_DECL_NET_IPV4_ROUTE_MAX_SIZE 1 +#define HAVE_DECL_NET_IPV4_ROUTE_MIN_ADVMSS 1 +#define HAVE_DECL_NET_IPV4_ROUTE_MIN_DELAY 1 +#define HAVE_DECL_NET_IPV4_ROUTE_MIN_PMTU 1 +#define HAVE_DECL_NET_IPV4_ROUTE_MTU_EXPIRES 1 +#define HAVE_DECL_NET_IPV4_ROUTE_REDIRECT_LOAD 1 +#define HAVE_DECL_NET_IPV4_ROUTE_REDIRECT_NUMBER 1 +#define HAVE_DECL_NET_IPV4_ROUTE_REDIRECT_SILENCE 1 +#define HAVE_DECL_NET_IPV4_ROUTE_SECRET_INTERVAL 1 +#define HAVE_DECL_NET_IPV4_TCP_FIN_TIMEOUT 1 +#define HAVE_DECL_NET_IPV4_TCP_KEEPALIVE_INTVL 1 +#define HAVE_DECL_NET_IPV4_TCP_KEEPALIVE_PROBES 1 +#define HAVE_DECL_NET_IPV4_TCP_KEEPALIVE_TIME 1 +#define HAVE_DECL_NET_IPV4_TCP_MAX_KA_PROBES 1 +#define HAVE_DECL_NET_IPV4_TCP_RETRANS_COLLAPSE 1 +#define HAVE_DECL_NET_IPV4_TCP_RETRIES1 1 +#define HAVE_DECL_NET_IPV4_TCP_RETRIES2 1 +#define HAVE_DECL_NET_IPV4_TCP_SACK 1 +#define HAVE_DECL_NET_IPV4_TCP_SYN_RETRIES 1 +#define HAVE_DECL_NET_IPV4_TCP_TIMESTAMPS 1 +#define HAVE_DECL_NET_IPV4_TCP_WINDOW_SCALING 1 #define HAVE_DECL_NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS 1 +#define HAVE_DECL_NET_IPV6 1 +#define HAVE_DECL_NET_IPV6_BINDV6ONLY 1 +#define HAVE_DECL_NET_IPV6_CONF 1 +#define HAVE_DECL_NET_IPV6_ICMP 1 +#define HAVE_DECL_NET_IPV6_IP6FRAG_HIGH_THRESH 1 +#define HAVE_DECL_NET_IPV6_IP6FRAG_LOW_THRESH 1 +#define HAVE_DECL_NET_IPV6_IP6FRAG_SECRET_INTERVAL 1 +#define HAVE_DECL_NET_IPV6_IP6FRAG_TIME 1 #define HAVE_DECL_NET_IPV6_MLD_MAX_MSF 1 +#define HAVE_DECL_NET_IPV6_NEIGH 1 +#define HAVE_DECL_NET_IPV6_ROUTE 1 +#define HAVE_DECL_NET_IPV6_ROUTE_FLUSH 1 +#define HAVE_DECL_NET_IPV6_ROUTE_GC_ELASTICITY 1 +#define HAVE_DECL_NET_IPV6_ROUTE_GC_INTERVAL 1 +#define HAVE_DECL_NET_IPV6_ROUTE_GC_MIN_INTERVAL 1 #define HAVE_DECL_NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS 1 +#define HAVE_DECL_NET_IPV6_ROUTE_GC_THRESH 1 +#define HAVE_DECL_NET_IPV6_ROUTE_GC_TIMEOUT 1 +#define HAVE_DECL_NET_IPV6_ROUTE_MAX_SIZE 1 +#define HAVE_DECL_NET_IPV6_ROUTE_MIN_ADVMSS 1 +#define HAVE_DECL_NET_IPV6_ROUTE_MTU_EXPIRES 1 +#define HAVE_DECL_NET_IPX 1 #define HAVE_DECL_NET_IRDA 1 #define HAVE_DECL_NET_LLC 1 #define HAVE_DECL_NET_NETFILTER 1 +#define HAVE_DECL_NET_NETROM 1 +#define HAVE_DECL_NET_ROSE 1 +#define HAVE_DECL_NET_SCTP 1 #define HAVE_DECL_NET_TCP_ABC 1 +#define HAVE_DECL_NET_TCP_ABORT_ON_OVERFLOW 1 +#define HAVE_DECL_NET_TCP_ADV_WIN_SCALE 1 #define HAVE_DECL_NET_TCP_ALLOWED_CONG_CONTROL 1 +#define HAVE_DECL_NET_TCP_APP_WIN 1 #define HAVE_DECL_NET_TCP_AVAIL_CONG_CONTROL 1 #define HAVE_DECL_NET_TCP_BASE_MSS 1 #define HAVE_DECL_NET_TCP_BIC_BETA 1 #define HAVE_DECL_NET_TCP_CONG_CONTROL 1 #define HAVE_DECL_NET_TCP_DEFAULT_WIN_SCALE 1 #define HAVE_DECL_NET_TCP_DMA_COPYBREAK 1 +#define HAVE_DECL_NET_TCP_DSACK 1 +#define HAVE_DECL_NET_TCP_ECN 1 +#define HAVE_DECL_NET_TCP_FACK 1 +#define HAVE_DECL_NET_TCP_FRTO 1 #define HAVE_DECL_NET_TCP_FRTO_RESPONSE 1 +#define HAVE_DECL_NET_TCP_LOW_LATENCY 1 +#define HAVE_DECL_NET_TCP_MAX_ORPHANS 1 #define HAVE_DECL_NET_TCP_MAX_SSTHRESH 1 +#define HAVE_DECL_NET_TCP_MAX_SYN_BACKLOG 1 +#define HAVE_DECL_NET_TCP_MAX_TW_BUCKETS 1 +#define HAVE_DECL_NET_TCP_MEM 1 #define HAVE_DECL_NET_TCP_MODERATE_RCVBUF 1 #define HAVE_DECL_NET_TCP_MTU_PROBING 1 #define HAVE_DECL_NET_TCP_NO_METRICS_SAVE 1 +#define HAVE_DECL_NET_TCP_ORPHAN_RETRIES 1 +#define HAVE_DECL_NET_TCP_REORDERING 1 +#define HAVE_DECL_NET_TCP_RFC1337 1 +#define HAVE_DECL_NET_TCP_RMEM 1 #define HAVE_DECL_NET_TCP_SLOW_START_AFTER_IDLE 1 +#define HAVE_DECL_NET_TCP_STDURG 1 +#define HAVE_DECL_NET_TCP_SYNACK_RETRIES 1 +#define HAVE_DECL_NET_TCP_SYNCOOKIES 1 +#define HAVE_DECL_NET_TCP_SYN_TAILDROP 1 #define HAVE_DECL_NET_TCP_TSO_WIN_DIVISOR 1 +#define HAVE_DECL_NET_TCP_TW_RECYCLE 1 +#define HAVE_DECL_NET_TCP_TW_REUSE 1 +#define HAVE_DECL_NET_TCP_WMEM 1 +#define HAVE_DECL_NET_TR 1 +#define HAVE_DECL_NET_UNIX 1 +#define HAVE_DECL_NET_UNIX_DELETE_DELAY 1 +#define HAVE_DECL_NET_UNIX_DESTROY_DELAY 1 +#define HAVE_DECL_NET_UNIX_MAX_DGRAM_QLEN 1 +#define HAVE_DECL_NET_X25 1 #define HAVE_DECL_PTRACE_PEEKUSER 1 #define HAVE_DECL_PTRACE_POKEUSER 1 #define HAVE_DECL_P_ALL 1 -#define HAVE_DECL_P_CID 0 -#define HAVE_DECL_P_GID 0 -#define HAVE_DECL_P_LWPID 0 #define HAVE_DECL_P_PGID 1 #define HAVE_DECL_P_PID 1 -#define HAVE_DECL_P_PPID 0 -#define HAVE_DECL_P_SID 0 -#define HAVE_DECL_P_UID 0 +#define HAVE_DECL_P_PIDFD 1 #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_HW_STATS 1 +#define HAVE_DECL_TCA_ACT_INDEX 1 +#define HAVE_DECL_TCA_ACT_KIND 1 +#define HAVE_DECL_TCA_ACT_OPTIONS 1 #define HAVE_DECL_TCA_ACT_PAD 1 +#define HAVE_DECL_TCA_ACT_STATS 1 +#define HAVE_DECL_TCA_ACT_UNSPEC 1 +#define HAVE_DECL_TCA_ACT_USED_HW_STATS 1 +#define HAVE_DECL_TCA_STAB_BASE 1 #define HAVE_DECL_TCA_STAB_DATA 1 +#define HAVE_DECL_TCA_STAB_UNSPEC 1 +#define HAVE_DECL_TCA_STATS_APP 1 +#define HAVE_DECL_TCA_STATS_BASIC 1 +#define HAVE_DECL_TCA_STATS_BASIC_HW 1 +#define HAVE_DECL_TCA_STATS_PAD 1 #define HAVE_DECL_TCA_STATS_PKT64 1 +#define HAVE_DECL_TCA_STATS_QUEUE 1 +#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 @@ -130,8 +418,13 @@ #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 @@ -159,9 +452,6 @@ #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_FRMIVAL_TYPE_CONTINUOUS 1 -#define HAVE_DECL_V4L2_FRMIVAL_TYPE_DISCRETE 1 -#define HAVE_DECL_V4L2_FRMIVAL_TYPE_STEPWISE 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 @@ -169,20 +459,36 @@ #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_PRIORITY_BACKGROUND 1 -#define HAVE_DECL_V4L2_PRIORITY_INTERACTIVE 1 -#define HAVE_DECL_V4L2_PRIORITY_RECORD 1 -#define HAVE_DECL_V4L2_PRIORITY_UNSET 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 +#define HAVE_DECL_VM_DIRTY_RATIO 1 +#define HAVE_DECL_VM_DIRTY_WB_CS 1 #define HAVE_DECL_VM_HUGETLB_GROUP 1 +#define HAVE_DECL_VM_HUGETLB_PAGES 1 #define HAVE_DECL_VM_LAPTOP_MODE 1 #define HAVE_DECL_VM_LEGACY_VA_LAYOUT 1 +#define HAVE_DECL_VM_LOWMEM_RESERVE_RATIO 1 #define HAVE_DECL_VM_MAX_MAP_COUNT 1 +#define HAVE_DECL_VM_MIN_FREE_KBYTES 1 +#define HAVE_DECL_VM_NR_PDFLUSH_THREADS 1 +#define HAVE_DECL_VM_OVERCOMMIT_MEMORY 1 +#define HAVE_DECL_VM_OVERCOMMIT_RATIO 1 +#define HAVE_DECL_VM_PAGEBUF 1 +#define HAVE_DECL_VM_PAGE_CLUSTER 1 +#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 */ @@ -295,8 +601,6 @@ #define HAVE_STRINGS_H 1 #define HAVE_STRING_H 1 #define HAVE_STRNDUP 1 -#define HAVE_STROPTS_H 1 -#define HAVE_STRSIGNAL 1 #define HAVE_STRUCT_BLK_USER_TRACE_SETUP 1 #define HAVE_STRUCT_BPF_INSN 1 #define HAVE_STRUCT_BPF_MAP_INFO 1 @@ -355,7 +659,7 @@ #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 -#define HAVE_STRUCT_CLONE_ARGS_SET_TID_SIZE 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 @@ -460,20 +764,6 @@ #define HAVE_STRUCT_RTNL_LINK_STATS_RX_NOHANDLER 1 #define HAVE_STRUCT_RTVIA 1 #define HAVE_STRUCT_RTVIA_RTVIA_ADDR 1 -/* #undef HAVE_STRUCT_RUSAGE___RU_IDRSS_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_INBLOCK_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_ISRSS_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_IXRSS_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_MAJFLT_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_MAXRSS_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_MINFLT_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_MSGRCV_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_MSGSND_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_NIVCSW_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_NSIGNALS_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_NSWAP_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_NVCSW_WORD */ -/* #undef HAVE_STRUCT_RUSAGE___RU_OUBLOCK_WORD */ #define HAVE_STRUCT_SIGCONTEXT 1 /* #undef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL */ /* #undef HAVE_STRUCT_SOCKADDR_L2_L2_BDADDR_TYPE */ @@ -548,7 +838,6 @@ #define HAVE_STRUCT___OLD_KERNEL_STAT 1 #define HAVE_STRUCT___PTRACE_SYSCALL_INFO 1 #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 @@ -602,6 +891,14 @@ #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_LINK_CREATE_ATTACH_TYPE 1 +#define HAVE_UNION_BPF_ATTR_LINK_CREATE_FLAGS 1 +#define HAVE_UNION_BPF_ATTR_LINK_CREATE_PROG_FD 1 +#define HAVE_UNION_BPF_ATTR_LINK_CREATE_TARGET_FD 1 +#define HAVE_UNION_BPF_ATTR_LINK_UPDATE_FLAGS 1 +#define HAVE_UNION_BPF_ATTR_LINK_UPDATE_LINK_FD 1 +#define HAVE_UNION_BPF_ATTR_LINK_UPDATE_NEW_PROG_FD 1 +#define HAVE_UNION_BPF_ATTR_LINK_UPDATE_OLD_PROG_FD 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 @@ -659,7 +956,6 @@ #define HAVE_UNION_BPF_ATTR_VALUE_SIZE 1 #define HAVE_UNISTD_H 1 /* #undef HAVE_USTAT_H */ -#define HAVE_UTIMENSAT 1 /* #undef HAVE__STATIC_ASSERT */ /* probe HAVE___BUILTIN_POPCOUNT */ #define HAVE___KERNEL_LONG_T 1 @@ -674,7 +970,7 @@ /* #undef M32_SIZEOF_LONG */ /* #undef M32_SIZEOF_STRUCT_MSQID64_DS */ /* #undef M68K */ -#define MANPAGE_DATE "2020-04-06" +#define MANPAGE_DATE "2020-04-24" /* #undef METAG */ /* #undef MICROBLAZE */ /* #undef MIPS */ @@ -686,10 +982,10 @@ #define PACKAGE "strace" #define PACKAGE_BUGREPORT "strace-devel@lists.strace.io" #define PACKAGE_NAME "strace" -#define PACKAGE_STRING "strace 5.6" +#define PACKAGE_STRING "strace 5.7" #define PACKAGE_TARNAME "strace" #define PACKAGE_URL "https://strace.io" -#define PACKAGE_VERSION "5.6" +#define PACKAGE_VERSION "5.7" /* #undef POWERPC */ /* #undef POWERPC64 */ /* #undef POWERPC64LE */ @@ -727,7 +1023,7 @@ # define __EXTENSIONS__ 1 #endif /* #undef USE_UNWINDER */ -#define VERSION "5.6" +#define VERSION "5.7" #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@@ -81,22 +81,6 @@ build('awk', '$outdir/sen.h', {syscalls, '|', '$dir/sen.awk'}, { expr='-f $dir/sen.awk', }) -local libsrcs = { - 'fetch_indirect_syscall_args.c', - 'fstatfs.c', - 'fstatfs64.c', - 'getpagesize.c', - 'ipc.c', - 'mmap_cache.c', - 'sigreturn.c', - 'socketcall.c', - 'statfs.c', - 'statfs64.c', - 'sync_file_range.c', - 'sync_file_range2.c', - 'upeek.c', - 'upoke.c', -} local srcs = { 'access.c', 'affinity.c', @@ -122,7 +106,9 @@ local srcs = { 'desc.c', 'dirent.c', 'dirent64.c', + 'dirent_types.c', 'dm.c', + 'dup.c', 'dyxlat.c', 'epoll.c', 'error_prints.c', @@ -136,6 +122,7 @@ local srcs = { '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', @@ -154,11 +141,14 @@ local srcs = { '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', 'getrandom.c', 'hdio.c', 'hostname.c', @@ -170,6 +160,7 @@ local srcs = { 'ioperm.c', 'iopl.c', 'ioprio.c', + 'ipc.c', 'ipc_msg.c', 'ipc_msgctl.c', 'ipc_sem.c', @@ -189,6 +180,7 @@ local srcs = { 'membarrier.c', 'memfd_create.c', 'mknod.c', + 'mmap_cache.c', 'mmap_notify.c', 'mmsghdr.c', 'mount.c', @@ -241,7 +233,6 @@ local srcs = { 'print_statfs.c', 'print_struct_stat.c', 'print_time.c', - 'print_timespec.c', 'print_timespec32.c', 'print_timespec64.c', 'print_timeval.c', @@ -290,18 +281,23 @@ local srcs = { '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', - 'strace.c', 'string_to_uint.c', 'swapon.c', + 'sync_file_range.c', + 'sync_file_range2.c', 'syscall.c', 'sysctl.c', 'sysinfo.c', @@ -318,6 +314,8 @@ local srcs = { 'umask.c', 'umount.c', 'uname.c', + 'upeek.c', + 'upoke.c', 'userfaultfd.c', 'ustat.c', 'util.c', @@ -327,11 +325,12 @@ local srcs = { 'wait.c', 'watchdog_ioctl.c', 'xattr.c', + 'xgetdents.c', 'xlat.c', 'xmalloc.c', } -build('sed', '$outdir/sys_func.h', expand{'$srcdir/', {libsrcs, srcs}}, { +build('sed', '$outdir/sys_func.h', expand{'$srcdir/', srcs}, { expr=[[-n 's/^SYS_FUNC(.*/extern &;/p']], }) @@ -349,8 +348,8 @@ pkg.deps = { 'pkg/linux-headers/headers', } -lib('libstrace.a', libsrcs, {'$outdir/printers.h'}) -exe('strace', {srcs, 'libstrace.a'}) +lib('libstrace.a', srcs, {'$outdir/printers.h'}) +exe('strace', {'strace.c', 'libstrace.a'}) file('bin/strace', '755', '$outdir/strace') man{'strace.1'}diff --git a/pkg/strace/mpers.txt b/pkg/strace/mpers.txt@@ -25,7 +25,6 @@ print_msgbuf.c print_sg_req_info.c print_sigevent.c print_time.c -print_timespec.c print_timeval.c printrusage.c printsiginfo.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,4 +1,4 @@ -From 16cb24454fc4a2aa3971507c96a7c985fe39a041 Mon Sep 17 00:00:00 2001 +From 31b94597cb3fea4043007cc54103067d5053f15c 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 @@ -8,10 +8,10 @@ Subject: [PATCH] Don't return expression in void function 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defs.h b/defs.h -index 0968bc35..961b84fe 100644 +index 3aa07fb8..22fc852d 100644 --- a/defs.h +++ b/defs.h -@@ -676,7 +676,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *); +@@ -679,7 +679,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *); static inline void pathtrace_select(const char *path) { @@ -21,5 +21,5 @@ index 0968bc35..961b84fe 100644 static inline bool -- -2.26.0 +2.26.2diff --git a/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch b/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch@@ -1,4 +1,4 @@ -From 964be74d11182e20b6fe60df1b9c8649314a1840 Mon Sep 17 00:00:00 2001 +From 0e52d3415b494f37166d31c523ce0609880c4825 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 @@ -54,10 +54,10 @@ index dc5eff1a..693b1b7d 100644 &info, sizeof(info), tfetch_mem, print_btrfs_ioctl_space_info, 0); diff --git a/file_ioctl.c b/file_ioctl.c -index 27ba4c82..d09bdce3 100644 +index 94cb71f8..eed79727 100644 --- a/file_ioctl.c +++ b/file_ioctl.c -@@ -163,7 +163,7 @@ file_ioctl(struct tcb *const tcp, const unsigned int code, +@@ -164,7 +164,7 @@ file_ioctl(struct tcb *const tcp, const unsigned int code, if (abbrev(tcp) && args.dest_count > count) limit = &count; @@ -66,7 +66,7 @@ index 27ba4c82..d09bdce3 100644 args.dest_count, &info, sizeof(info), tfetch_mem, print_file_dedupe_range_info, limit); -@@ -211,7 +211,7 @@ file_ioctl(struct tcb *const tcp, const unsigned int code, +@@ -212,7 +212,7 @@ file_ioctl(struct tcb *const tcp, const unsigned int code, struct fiemap_extent fe; tprints(", fm_extents="); print_array(tcp, @@ -131,7 +131,7 @@ index ddaf33ca..bf747a4b 100644 #endif /* !STRACE_LIST_H */ diff --git a/tests/btrfs.c b/tests/btrfs.c -index f631310d..c94926d1 100644 +index 2a474dc4..2423f65e 100644 --- a/tests/btrfs.c +++ b/tests/btrfs.c @@ -954,7 +954,7 @@ btrfs_print_tree_search_buf(struct btrfs_ioctl_search_key *key, @@ -144,7 +144,7 @@ index f631310d..c94926d1 100644 printf(", "); printf("{transid=%" PRI__u64 ", objectid=", diff --git a/tests/fcntl-common.c b/tests/fcntl-common.c -index b2125171..0b0242c8 100644 +index 27694326..46667e4e 100644 --- a/tests/fcntl-common.c +++ b/tests/fcntl-common.c @@ -20,7 +20,7 @@ @@ -157,10 +157,10 @@ index b2125171..0b0242c8 100644 # define TYPEOF_FLOCK_OFF_T off_t #endif diff --git a/util.c b/util.c -index 0d9de2f6..5874e86d 100644 +index 59696b58..6eda524d 100644 --- a/util.c +++ b/util.c -@@ -1116,8 +1116,8 @@ dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ulong_t addr, +@@ -1122,8 +1122,8 @@ dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ulong_t addr, #define ILOG2_ITER_(val_, ret_, bit_) \ do { \ @@ -172,5 +172,5 @@ index 0d9de2f6..5874e86d 100644 (val_) >>= shift_; \ (ret_) |= shift_; \ -- -2.26.0 +2.26.2diff --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 f5d882b698b4051c1b48ee9c194a4dee7625c9a8 Mon Sep 17 00:00:00 2001 +From fe31c8756a4aa79c573e2adb700d6e99230dad25 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 @@ -10,10 +10,10 @@ operator without evaluating the macro argument multiple times. 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/defs.h b/defs.h -index 12c5b92f..fb0a7ef1 100644 +index 22fc852d..1cd30658 100644 --- a/defs.h +++ b/defs.h -@@ -363,8 +363,12 @@ struct tcb { +@@ -366,8 +366,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 12c5b92f..fb0a7ef1 100644 # include "xlat.h" -- -2.23.0 +2.26.2diff --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 6785ecc1baea8f396b6a90a62cee94522a9744cc Mon Sep 17 00:00:00 2001 +From 21b9f7852ec9daf1a356c3b588b8053bed5b8383 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 0a47766e..a2bebb82 100644 +index 469f809a..cad5ab05 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 19f25be5..f46b25d4 100644 +index 311e4d62..2a4e6001 100644 --- a/strace.c +++ b/strace.c -@@ -3205,7 +3205,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig) +@@ -3359,7 +3359,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig) syscall_entering_finish(tcp, res); return res; } else { @@ -94,7 +94,7 @@ index 19f25be5..f46b25d4 100644 if (res != 0) { res = syscall_exiting_trace(tcp, &ts, res); diff --git a/tests/btrfs.c b/tests/btrfs.c -index c94926d1..dedb8754 100644 +index 2423f65e..3b5ade66 100644 --- a/tests/btrfs.c +++ b/tests/btrfs.c @@ -382,7 +382,7 @@ btrfs_test_subvol_ioctls(void) @@ -199,10 +199,10 @@ index 2c4dae19..59bc2dd0 100644 .sigev_notify = 0xdefaced, .sigev_signo = 0xfacefeed, diff --git a/tests/wait4.c b/tests/wait4.c -index 29b0cadd..89faf508 100644 +index ea40577a..d25bd87a 100644 --- a/tests/wait4.c +++ b/tests/wait4.c -@@ -68,7 +68,7 @@ sprint_rusage(const struct rusage *const ru) +@@ -72,7 +72,7 @@ sprint_rusage(const struct rusage *const ru) static pid_t do_wait4(pid_t pid, int *wstatus, int options, struct rusage *ru) { @@ -212,12 +212,12 @@ index 29b0cadd..89faf508 100644 assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0); diff --git a/tests/waitid.c b/tests/waitid.c -index f6738e18..d9ce1105 100644 +index c58df5e2..730c58d7 100644 --- a/tests/waitid.c +++ b/tests/waitid.c -@@ -202,7 +202,7 @@ do_waitid(const unsigned int idtype, +@@ -130,7 +130,7 @@ do_waitid(const unsigned int idtype, const unsigned int options, - const struct rusage *const rusage) + const kernel_rusage_t *const rusage) { - sigset_t mask = {}; + sigset_t mask = {0}; @@ -225,5 +225,5 @@ index f6738e18..d9ce1105 100644 assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0); -- -2.26.0 +2.26.2diff --git a/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch b/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch@@ -1,4 +1,4 @@ -From 1e79756600fe0550411083a8315cfe78e52a65c7 Mon Sep 17 00:00:00 2001 +From 1626ee384c34018d4d0f2c887cfdca05bccec2ff 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 *` @@ -7,8 +7,8 @@ Subject: [PATCH] Avoid pointer arithmetic on `void *` netlink_smc_diag.c | 4 ++-- print_timespec.h | 6 ++++-- sockaddr.c | 2 +- - ucopy.c | 6 +++--- - 4 files changed, 10 insertions(+), 8 deletions(-) + ucopy.c | 8 ++++---- + 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/netlink_smc_diag.c b/netlink_smc_diag.c index 16815fde..09a748a8 100644 @@ -72,10 +72,19 @@ index b6b9aa7d..948fa517 100644 tprints("sa_data="); diff --git a/ucopy.c b/ucopy.c -index 21f55e28..cee9f2e0 100644 +index 59af8641..3ff59781 100644 --- a/ucopy.c +++ b/ucopy.c -@@ -183,7 +183,7 @@ umoven_peekdata(const int pid, kernel_ulong_t addr, unsigned int len, +@@ -165,7 +165,7 @@ vm_read_mem(const pid_t pid, void *laddr, + break; + + len = next_len; +- laddr += copy_len; ++ laddr = (char *)laddr + copy_len; + page_start += page_size; + taddr = page_start; + } +@@ -227,7 +227,7 @@ umoven_peekdata(const int pid, kernel_ulong_t addr, unsigned int len, memcpy(laddr, &u.x[residue], m); residue = 0; addr += sizeof(long); @@ -84,7 +93,7 @@ index 21f55e28..cee9f2e0 100644 nread += m; len -= m; } -@@ -280,10 +280,10 @@ umovestr_peekdata(const int pid, kernel_ulong_t addr, unsigned int len, +@@ -324,10 +324,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') @@ -98,5 +107,5 @@ index 21f55e28..cee9f2e0 100644 len -= m; } -- -2.25.1 +2.27.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,4 +1,4 @@ -From 7ba3679ddf2c76b6ec0a86ee84e316d2ed06cf7b Mon Sep 17 00:00:00 2001 +From dc7f55485c8562999b5bc2ae713a3aec0c90bce8 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 @@ -39,10 +39,10 @@ index b904fa34..1366a89e 100644 return out; } diff --git a/strace.c b/strace.c -index f46b25d4..7b03bc27 100644 +index 2a4e6001..352c8282 100644 --- a/strace.c +++ b/strace.c -@@ -2097,7 +2097,7 @@ init(int argc, char *argv[]) +@@ -2235,7 +2235,7 @@ init(int argc, char *argv[]) break; case GETOPT_TS: tflag_long_set = true; @@ -51,7 +51,7 @@ index f46b25d4..7b03bc27 100644 error_opt_arg(c, lopt, optarg); break; case 'T': -@@ -2194,10 +2194,10 @@ init(int argc, char *argv[]) +@@ -2332,10 +2332,10 @@ init(int argc, char *argv[]) qualify_kvm(optarg); break; case GETOPT_QUAL_QUIET: @@ -65,5 +65,5 @@ index f46b25d4..7b03bc27 100644 default: error_msg_and_help(NULL); -- -2.26.0 +2.26.2diff --git a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch b/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch@@ -1,4 +1,4 @@ -From 7ffe2fa8fa0a4d5dea1c0755a74d9cba5522a361 Mon Sep 17 00:00:00 2001 +From 87f14954600cd3bb13c82b1bb992a89bff545f9c 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 @@ -26,10 +26,10 @@ index a397eba2..89682ae9 100644 const size_t c = columns[i]; diff --git a/desc.c b/desc.c -index 92e6fe16..8f705d70 100644 +index 32fc1882..f15b04e1 100644 --- a/desc.c +++ b/desc.c -@@ -206,11 +206,11 @@ SYS_FUNC(select) +@@ -175,11 +175,11 @@ SYS_FUNC(select) static int umove_kulong_array_or_printaddr(struct tcb *const tcp, const kernel_ulong_t addr, @@ -43,7 +43,7 @@ index 92e6fe16..8f705d70 100644 int r = umove_or_printaddr(tcp, addr, &ptr32); if (!r) { size_t i; -@@ -231,10 +231,11 @@ do_pselect6(struct tcb *const tcp, const print_obj_by_addr_fn print_ts, +@@ -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]; @@ -92,7 +92,7 @@ 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 fd7a3d84..d8a37a07 100644 +index 022cab5b..37097d92 100644 --- a/syscall.c +++ b/syscall.c @@ -295,7 +295,7 @@ decode_socket_subcall(struct tcb *tcp) @@ -105,7 +105,7 @@ index fd7a3d84..d8a37a07 100644 if (umoven(tcp, tcp->u_arg[1], nargs * current_wordsize, buf) < 0) return; diff --git a/util.c b/util.c -index 5874e86d..522e772e 100644 +index 6eda524d..c15e6514 100644 --- a/util.c +++ b/util.c @@ -481,8 +481,7 @@ enum sock_proto @@ -128,5 +128,5 @@ index 5874e86d..522e772e 100644 return SOCK_PROTO_UNKNOWN; else { -- -2.26.0 +2.26.2diff --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 81f20af07b260c251a55f95d39da1b2acdc6e21d Mon Sep 17 00:00:00 2001 +From 0c68c7de0bfd8a1ebab376b0952f5a1a2c47643a 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 @@ -25,7 +25,7 @@ Subject: [PATCH] Avoid index ranges and empty initializer lists in syscallent 17 files changed, 173 insertions(+), 167 deletions(-) diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h -index ee8a8f9e..9e124d94 100644 +index b0d680b6..54a03ddc 100644 --- a/linux/alpha/syscallent.h +++ b/linux/alpha/syscallent.h @@ -60,7 +60,7 @@ @@ -38,14 +38,14 @@ index ee8a8f9e..9e124d94 100644 [ 55] = { 5, 0, SEN(printargs), "osf_reboot" }, /* not implemented */ [ 56] = { 5, 0, SEN(printargs), "osf_revoke" }, /* not implemented */ @@ -126,7 +126,7 @@ - [116] = { 2, 0, SEN(osf_gettimeofday), "osf_gettimeofday" }, + [116] = { 2, TCL, SEN(osf_gettimeofday), "osf_gettimeofday" }, [117] = { 2, 0, SEN(osf_getrusage), "osf_getrusage" }, [118] = { 5, TN, SEN(getsockopt), "getsockopt" }, -[119] = { }, +/* [119] - unused */ [120] = { 3, TD, SEN(readv), "readv" }, [121] = { 3, TD, SEN(writev), "writev" }, - [122] = { 2, 0, SEN(osf_settimeofday), "osf_settimeofday" }, + [122] = { 2, TCL, SEN(osf_settimeofday), "osf_settimeofday" }, @@ -158,31 +158,31 @@ [148] = { 4, TF, SEN(quotactl), "quotactl" }, [149] = { 5, 0, SEN(printargs), "osf_oldquota" }, /* not implemented */ @@ -89,7 +89,7 @@ index ee8a8f9e..9e124d94 100644 @@ -205,7 +205,7 @@ [218] = { 5, 0, SEN(printargs), "osf_signal" }, /* not implemented */ [219] = { 5, 0, SEN(printargs), "osf_utc_gettime" }, /* not implemented */ - [220] = { 5, 0, SEN(printargs), "osf_utc_adjtime" }, /* not implemented */ + [220] = { 5, TCL, SEN(printargs), "osf_utc_adjtime" }, /* not implemented */ -[221] = { }, +/* [221] - unused */ [222] = { 5, 0, SEN(printargs), "osf_security" }, /* not implemented */ @@ -150,7 +150,7 @@ index ee8a8f9e..9e124d94 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 b7947a5f..5e417da0 100644 +index e9eee9f8..57612683 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -433,7 +433,7 @@ @@ -163,7 +163,7 @@ index b7947a5f..5e417da0 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 239cc0cd..94376cb7 100644 +index 0b24353a..15a97080 100644 --- a/linux/avr32/syscallent.h +++ b/linux/avr32/syscallent.h @@ -228,7 +228,7 @@ @@ -185,7 +185,7 @@ index 239cc0cd..94376cb7 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 db1b9281..8c734b95 100644 +index 4deafe0b..398efac3 100644 --- a/linux/bfin/syscallent.h +++ b/linux/bfin/syscallent.h @@ -229,7 +229,7 @@ @@ -198,7 +198,7 @@ index db1b9281..8c734b95 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 71af311c..0a3c8b86 100644 +index 04278701..93321dd4 100644 --- a/linux/i386/syscallent.h +++ b/linux/i386/syscallent.h @@ -229,7 +229,7 @@ @@ -229,7 +229,7 @@ index 71af311c..0a3c8b86 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 e1f60abc..8755e917 100644 +index 315dbb6c..d3084ca5 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -225,7 +225,7 @@ @@ -242,7 +242,7 @@ index e1f60abc..8755e917 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 c934ffbe..fc42e467 100644 +index c17aad12..a75ecafa 100644 --- a/linux/microblaze/syscallent.h +++ b/linux/microblaze/syscallent.h @@ -229,7 +229,7 @@ @@ -273,7 +273,7 @@ index c934ffbe..fc42e467 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 97d64500..dfd7e7ca 100644 +index 918f1107..2c0e8143 100644 --- a/linux/mips/syscallent-compat.h +++ b/linux/mips/syscallent-compat.h @@ -69,13 +69,13 @@ @@ -305,7 +305,7 @@ index 97d64500..dfd7e7ca 100644 [ 108] = { 0, 0, SEN(printargs), "svr4_sigsendset" }, @@ -140,13 +140,13 @@ [ 137] = { 0, 0, SEN(printargs), "svr4_sysconf" }, - [ 138] = { 0, 0, SEN(printargs), "svr4_adjtime" }, + [ 138] = { 0, TCL, SEN(printargs), "svr4_adjtime" }, [ 139] = { 0, 0, SEN(printargs), "svr4_sysinfo" }, -[ 140] = { }, +/* [ 140] - unused */ @@ -356,14 +356,14 @@ index 97d64500..dfd7e7ca 100644 [2065] = { 0, TM|SI, SEN(printargs), "bsd43_mremap" }, [2066] = { 0, 0, SEN(printargs), "bsd43_vfork" }, @@ -460,7 +460,7 @@ - [2116] = { 0, 0, SEN(printargs), "bsd43_gettimeofday" }, + [2116] = { 0, TCL, SEN(printargs), "bsd43_gettimeofday" }, [2117] = { 0, 0, SEN(printargs), "bsd43_getrusage" }, [2118] = { 0, 0, SEN(printargs), "bsd43_getsockopt" }, -[2119] = { }, +/* [2119] - unused */ [2120] = { 0, 0, SEN(printargs), "bsd43_readv" }, [2121] = { 0, 0, SEN(printargs), "bsd43_writev" }, - [2122] = { 0, 0, SEN(printargs), "bsd43_settimeofday" }, + [2122] = { 0, TCL, SEN(printargs), "bsd43_settimeofday" }, @@ -496,8 +496,8 @@ [2152] = { 0, 0, SEN(printargs), "bsd43_cacheflush" }, [2153] = { 0, 0, SEN(printargs), "bsd43_cachectl" }, @@ -437,7 +437,7 @@ index 97d64500..dfd7e7ca 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 2a5031d5..911f6f8a 100644 +index 6958edae..8330a2dc 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -231,7 +231,7 @@ @@ -450,7 +450,7 @@ index 2a5031d5..911f6f8a 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 51763504..b49d5b4f 100644 +index 608caedf..b86cb12a 100644 --- a/linux/powerpc64/syscallent.h +++ b/linux/powerpc64/syscallent.h @@ -199,14 +199,14 @@ @@ -492,7 +492,7 @@ index 51763504..b49d5b4f 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 384cdadf..21edf749 100644 +index c61ad77b..3ae6e1e7 100644 --- a/linux/s390/syscallent.h +++ b/linux/s390/syscallent.h @@ -26,8 +26,8 @@ @@ -564,7 +564,7 @@ index 384cdadf..21edf749 100644 [ 71] = { 2, TC, SEN(setregid16), "setregid" }, [ 72] = { 3, TS, SEN(sigsuspend), "sigsuspend" }, @@ -91,9 +91,9 @@ - [ 79] = { 2, 0, SEN(settimeofday), "settimeofday" }, + [ 79] = { 2, TCL, SEN(settimeofday), "settimeofday" }, [ 80] = { 2, TC, SEN(getgroups16), "getgroups" }, [ 81] = { 2, TC, SEN(setgroups16), "setgroups" }, -[ 82] = { }, @@ -604,7 +604,7 @@ index 384cdadf..21edf749 100644 [122] = { 1, 0, SEN(uname), "uname" }, -[123] = { }, +/* [123] - unused */ - [124] = { 1, 0, SEN(adjtimex32), "adjtimex" }, + [124] = { 1, TCL, SEN(adjtimex32), "adjtimex" }, [125] = { 3, TM|SI, SEN(mprotect), "mprotect" }, [126] = { 3, TS, SEN(sigprocmask), "sigprocmask" }, @@ -175,7 +175,7 @@ @@ -626,7 +626,7 @@ index 384cdadf..21edf749 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 4a70b399..0497b2f9 100644 +index c4937579..8ce485fa 100644 --- a/linux/s390x/syscallent.h +++ b/linux/s390x/syscallent.h @@ -21,29 +21,29 @@ @@ -715,8 +715,8 @@ index 4a70b399..0497b2f9 100644 -[ 76] = { }, +/* [ 76] - unused */ [ 77] = { 2, 0, SEN(getrusage), "getrusage" }, - [ 78] = { 2, 0, SEN(gettimeofday), "gettimeofday" }, - [ 79] = { 2, 0, SEN(settimeofday), "settimeofday" }, + [ 78] = { 2, TCL, SEN(gettimeofday), "gettimeofday" }, + [ 79] = { 2, TCL, SEN(settimeofday), "settimeofday" }, -[ 80 ... 82] = { }, +/* [ 80 ... 82] - unused */ [ 83] = { 2, TF, SEN(symlink), "symlink" }, @@ -762,7 +762,7 @@ index 4a70b399..0497b2f9 100644 [122] = { 1, 0, SEN(uname), "uname" }, -[123] = { }, +/* [123] - unused */ - [124] = { 1, 0, SEN(adjtimex64), "adjtimex" }, + [124] = { 1, TCL, SEN(adjtimex64), "adjtimex" }, [125] = { 3, TM|SI, SEN(mprotect), "mprotect" }, [126] = { 3, TS, SEN(sigprocmask), "sigprocmask" }, @@ -141,7 +141,7 @@ @@ -828,7 +828,7 @@ index 4a70b399..0497b2f9 100644 [244] = { 1, TM, SEN(io_destroy), "io_destroy" }, [245] = { 5, 0, SEN(io_getevents_time64), "io_getevents" }, @@ -257,7 +257,7 @@ - [261] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, + [261] = { 2, TCL, SEN(clock_getres_time64), "clock_getres" }, [262] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [263] = { 5, 0, SEN(vserver), "vserver" }, -[264] = { }, @@ -837,7 +837,7 @@ index 4a70b399..0497b2f9 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 9841df06..02316993 100644 +index 61eb7283..6dc45919 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -197,7 +197,7 @@ @@ -894,11 +894,11 @@ index 9841df06..02316993 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 9a48cf0e..7607ceb7 100644 +index f681635c..d19dafa8 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -89,7 +89,7 @@ - [ 79] = { 2, 0, SEN(settimeofday), "settimeofday" }, + [ 79] = { 2, TCL, SEN(settimeofday), "settimeofday" }, [ 80] = { 2, TC, SEN(getgroups16), "getgroups" }, [ 81] = { 2, TC, SEN(setgroups16), "setgroups" }, -[ 82] = { }, @@ -985,7 +985,7 @@ index 9a48cf0e..7607ceb7 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 b5603041..83a53e06 100644 +index 3417e7fc..5e89f4e4 100644 --- a/linux/sparc/syscallent.h +++ b/linux/sparc/syscallent.h @@ -57,7 +57,7 @@ @@ -1007,7 +1007,7 @@ index b5603041..83a53e06 100644 [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 e498afeb..edc9384a 100644 +index dd77685c..732dca82 100644 --- a/linux/sparc64/syscallent.h +++ b/linux/sparc64/syscallent.h @@ -36,10 +36,10 @@ @@ -1096,7 +1096,7 @@ index e498afeb..edc9384a 100644 [114] = { 3, TN, SEN(sendmsg), "sendmsg" }, -[115] = { }, +/* [115] - unused */ - [116] = { 2, 0, SEN(gettimeofday), "gettimeofday" }, + [116] = { 2, TCL, SEN(gettimeofday), "gettimeofday" }, [117] = { 2, 0, SEN(getrusage), "getrusage" }, [118] = { 5, TN, SEN(getsockopt), "getsockopt" }, @@ -158,7 +158,7 @@ @@ -1118,7 +1118,7 @@ index e498afeb..edc9384a 100644 [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 d4823484..571dd0eb 100644 +index 385630a9..7653c940 100644 --- a/linux/xtensa/syscallent.h +++ b/linux/xtensa/syscallent.h @@ -7,7 +7,7 @@ @@ -1243,5 +1243,5 @@ index d4823484..571dd0eb 100644 [321] = { 6, TD|TF, SEN(fanotify_mark), "fanotify_mark" }, [322] = { 6, 0, SEN(process_vm_readv), "process_vm_readv" }, -- -2.26.0 +2.26.2diff --git a/pkg/strace/patch/0011-Avoid-index-ranges.patch b/pkg/strace/patch/0011-Avoid-index-ranges.patch@@ -1,4 +1,4 @@ -From 72af628108986893f2212f17f081ecc475764e9c Mon Sep 17 00:00:00 2001 +From db02e7c4bbee683d647235294fc9ba7110dfa798 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 @@ -33,10 +33,10 @@ index c5d5f5c4..a7c54b3e 100644 return sprint_mac_addr(hwaddr, MIN(size, sz)); diff --git a/util.c b/util.c -index 522e772e..295b2bb9 100644 +index c15e6514..f61d82b6 100644 --- a/util.c +++ b/util.c -@@ -1241,16 +1241,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, +@@ -1247,16 +1247,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 522e772e..295b2bb9 100644 /* Fetching data from tracee. */ -- -2.26.0 +2.26.2diff --git a/pkg/strace/sha256 b/pkg/strace/sha256@@ -1 +1 @@ -189968eeae06ed9e20166ec55a830943c84374676a457c9fe010edc7541f1b01 strace-5.6.tar.xz +b284b59f9bcd95b9728cea5bd5c0edc5ebe360af73dc76fbf6334f11c777ccd8 strace-5.7.tar.xzdiff --git a/pkg/strace/url b/pkg/strace/url@@ -1 +1 @@ -url = "https://github.com/strace/strace/releases/download/v5.6/strace-5.6.tar.xz" +url = "https://github.com/strace/strace/releases/download/v5.7/strace-5.7.tar.xz"diff --git a/pkg/strace/ver b/pkg/strace/ver@@ -1 +1 @@ -5.6 r0 +5.7 r0