logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: d636969d7e0566444c0b8c6f3171da9b7a918ce8
parent 1f2c1ea34ea5499e1dc11ea38738c5ebe42d6945
Author: Michael Forney <mforney@mforney.org>
Date:   Fri,  7 Jul 2023 13:20:18 -0700

strace: Update to 6.4

Diffstat:

Mpkg/strace/.gitignore2+-
Mpkg/strace/config.h362++++---------------------------------------------------------------------------
Mpkg/strace/gen.lua4++--
Mpkg/strace/mpers.txt1+
Mpkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch6+++---
Mpkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch120+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
Mpkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch8++++----
Mpkg/strace/patch/0004-Avoid-empty-initializer-lists.patch16++++++++--------
Mpkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch32++++++++++++--------------------
Mpkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch16++++++++--------
Mpkg/strace/patch/0009-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch198++-----------------------------------------------------------------------------
Mpkg/strace/patch/0011-Avoid-index-ranges.patch8++++----
Mpkg/strace/sha2562+-
Mpkg/strace/url2+-
Mpkg/strace/ver2+-
15 files changed, 172 insertions(+), 607 deletions(-)

diff --git a/pkg/strace/.gitignore b/pkg/strace/.gitignore @@ -1,3 +1,3 @@ /src -/strace-5.19.tar.xz +/strace-6.4.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 "2022" +#define COPYRIGHT_YEAR "2023" /* #undef CSKY */ #define ENABLE_ARM_OABI 0 /* #undef ENABLE_SECONTEXT */ @@ -19,319 +19,21 @@ /* #undef HAVE_ASM_SYSMIPS_H */ /* #undef HAVE_BE64TOH */ /* #undef HAVE_BLUETOOTH_BLUETOOTH_H */ -#define HAVE_DECL_CTL_ABI 1 -#define HAVE_DECL_CTL_APPLDATA 0 -#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_INOTIFY 0 -#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_IEEE802154_ADDR_LONG 0 #define HAVE_DECL_IEEE802154_ADDR_NONE 0 #define HAVE_DECL_IEEE802154_ADDR_SHORT 0 -#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_CAP_BSET 0 -#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_JAVA_APPLETVIEWER 0 -#define HAVE_DECL_KERN_JAVA_INTERPRETER 0 -#define HAVE_DECL_KERN_MAXFILE 0 -#define HAVE_DECL_KERN_MAXID 0 -#define HAVE_DECL_KERN_MAXINODE 0 -#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_NFSRADDRS 0 -#define HAVE_DECL_KERN_NFSRNAME 0 -#define HAVE_DECL_KERN_NGROUPS_MAX 1 -#define HAVE_DECL_KERN_NMI_WATCHDOG 1 -#define HAVE_DECL_KERN_NODENAME 1 -#define HAVE_DECL_KERN_NRFILE 0 -#define HAVE_DECL_KERN_NRINODE 0 -#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_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_EVICT_NOCARRIER 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 0 -#define HAVE_DECL_NET_TCP_BIC_BETA 1 -#define HAVE_DECL_NET_TCP_BIC_FAST_CONVERGENCE 0 -#define HAVE_DECL_NET_TCP_BIC_LOW_WINDOW 0 -#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_VEGAS 0 -#define HAVE_DECL_NET_TCP_VEGAS_ALPHA 0 -#define HAVE_DECL_NET_TCP_VEGAS_BETA 0 -#define HAVE_DECL_NET_TCP_VEGAS_GAMMA 0 -#define HAVE_DECL_NET_TCP_WESTWOOD 0 -#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_NFEA_ACTIVITY_NOTIFY 0 #define HAVE_DECL_NFEA_DONT_REFRESH 0 #define HAVE_DECL_NFEA_UNSPEC 0 +#define HAVE_DECL_PTP_PF_EXTTS 0 +#define HAVE_DECL_PTP_PF_NONE 0 +#define HAVE_DECL_PTP_PF_PEROUT 0 +#define HAVE_DECL_PTP_PF_PHYSYNC 0 #define HAVE_DECL_PTRACE_PEEKUSER 1 #define HAVE_DECL_PTRACE_POKEUSER 1 #define HAVE_DECL_P_ALL 1 @@ -350,44 +52,6 @@ #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_VM_BLOCK_DUMP 1 -#define HAVE_DECL_VM_CMM_PAGES 0 -#define HAVE_DECL_VM_CMM_TIMED_PAGES 0 -#define HAVE_DECL_VM_CMM_TIMEOUT 0 -#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_DROP_PAGECACHE 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_MIN_SLAB 1 -#define HAVE_DECL_VM_MIN_UNMAPPED 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_PANIC_ON_OOM 1 -#define HAVE_DECL_VM_PERCPU_PAGELIST_FRACTION 1 -#define HAVE_DECL_VM_SWAPPINESS 1 -#define HAVE_DECL_VM_SWAP_TOKEN_TIMEOUT 1 -#define HAVE_DECL_VM_UNUSED1 1 -#define HAVE_DECL_VM_UNUSED2 1 -#define HAVE_DECL_VM_UNUSED3 1 -#define HAVE_DECL_VM_UNUSED4 1 -#define HAVE_DECL_VM_UNUSED5 1 -#define HAVE_DECL_VM_UNUSED7 1 -#define HAVE_DECL_VM_UNUSED8 1 -#define HAVE_DECL_VM_UNUSED9 1 -#define HAVE_DECL_VM_VDSO_ENABLED 1 -#define HAVE_DECL_VM_VFS_CACHE_PRESSURE 1 -#define HAVE_DECL_VM_ZONE_RECLAIM_MODE 1 #define HAVE_DECL_XFRM_MSG_ACQUIRE 1 #define HAVE_DECL_XFRM_MSG_ALLOCSPI 1 #define HAVE_DECL_XFRM_MSG_DELPOLICY 1 @@ -420,7 +84,7 @@ #define HAVE_FALLOCATE 1 #define HAVE_FANOTIFY_MARK 1 /* #undef HAVE_FCNTL64 */ -#define HAVE_FOPEN64 1 +/* #undef HAVE_FOPEN64 */ #define HAVE_FORK 1 #define HAVE_FPUTS_UNLOCKED 1 #define HAVE_FSTATAT 1 @@ -469,7 +133,7 @@ #define HAVE_NETINET_TCP_H 1 #define HAVE_NETINET_UDP_H 1 /* #undef HAVE_NETIPX_IPX_H */ -#define HAVE_OPEN64 1 +/* #undef HAVE_OPEN64 */ #define HAVE_OPEN_MEMSTREAM 1 #define HAVE_PATHS_H 1 #define HAVE_PREADV 1 @@ -491,6 +155,7 @@ #define HAVE_SIGINFO_T_SI_PKEY 1 #define HAVE_SIGINFO_T_SI_SYSCALL 1 #define HAVE_SIGINFO_T_SI_TIMERID 1 +/* #undef HAVE_SIGINFO_T_SI_TRAPNO */ #define HAVE_SIGINFO_T_SI_UPPER 1 #define HAVE_SIGNALFD 1 #define HAVE_SIG_ATOMIC_T 1 @@ -587,6 +252,9 @@ /* #undef HAVE_STRUCT_STATFS_F_FSID___VAL */ #define HAVE_STRUCT_STAT_ST_MTIME_NSEC 1 #define HAVE_STRUCT_TCP_DIAG_MD5SIG 1 +#define HAVE_STRUCT_TERMIOS2 1 +/* #undef HAVE_STRUCT_TERMIOS_C_ISPEED */ +/* #undef HAVE_STRUCT_TERMIOS_C_OSPEED */ #define HAVE_STRUCT_USER_DESC 1 #define HAVE_STRUCT_USER_DESC_LM 1 #define HAVE_STRUCT_UTSNAME_DOMAINNAME 1 @@ -757,10 +425,10 @@ #define PACKAGE "strace" #define PACKAGE_BUGREPORT "strace-devel@lists.strace.io" #define PACKAGE_NAME "strace" -#define PACKAGE_STRING "strace 5.19" +#define PACKAGE_STRING "strace 6.4" #define PACKAGE_TARNAME "strace" #define PACKAGE_URL "https://strace.io" -#define PACKAGE_VERSION "5.19" +#define PACKAGE_VERSION "6.4" /* #undef POWERPC */ /* #undef POWERPC64 */ /* #undef POWERPC64LE */ @@ -779,7 +447,7 @@ /* #undef SPARC */ /* #undef SPARC64 */ #define STDC_HEADERS 1 -#define STRACE_MANPAGE_DATE "2022-07-19" +#define STRACE_MANPAGE_DATE "2023-06-11" /* #undef TILE */ /* #undef USE_DEMANGLE */ /* #undef USE_LIBDW */ @@ -800,7 +468,7 @@ # define __EXTENSIONS__ 1 #endif /* #undef USE_UNWINDER */ -#define VERSION "5.19" +#define VERSION "6.4" #if defined AC_APPLE_UNIVERSAL_BUILD # if defined __BIG_ENDIAN__ # define WORDS_BIGENDIAN 1 diff --git a/pkg/strace/gen.lua b/pkg/strace/gen.lua @@ -381,8 +381,8 @@ file('bin/strace', '755', '$outdir/strace') build('sed', '$outdir/strace.1', '$srcdir/doc/strace.1.in', { expr={ - [[-e 's,@STRACE_MANPAGE_DATE@,2022-08-12,']], - [[-e 's,@VERSION@,5.19,']], + [[-e 's,@STRACE_MANPAGE_DATE@,2023-06-11,']], + [[-e 's,@VERSION@,6.4,']], [[-e 's,@ENABLE_STACKTRACE_TRUE@,#,']], [[-e 's,@ENABLE_STACKTRACE_FALSE@,,']], [[-e 's,@ENABLE_SECONTEXT_TRUE@,#,']], diff --git a/pkg/strace/mpers.txt b/pkg/strace/mpers.txt @@ -37,6 +37,7 @@ rtc.c sg_io_v3.c sigaltstack.c sock.c +sysctl.c sysinfo.c times.c ustat.c diff --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 524e22352b2a39b5839375c65b4fc9c2282d6c40 Mon Sep 17 00:00:00 2001 +From 14b52959359f69bc5806bbd8d8c44f72d912aa1a 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/src/defs.h b/src/defs.h -index f90763dd5..861b667ff 100644 +index 846a7ae5a..d6b54a633 100644 --- a/src/defs.h +++ b/src/defs.h -@@ -782,7 +782,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *); +@@ -807,7 +807,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *, static inline void pathtrace_select(const char *path) { diff --git a/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch b/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch @@ -1,9 +1,10 @@ -From 8ec1f34a8943d175270cbfde3d3a576512e5d2e6 Mon Sep 17 00:00:00 2001 +From cdecbf8aee12f837e878a568814bb81550412b6b 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 --- + src/bpf.c | 10 +++++----- src/btrfs.c | 12 ++++++------ src/defs.h | 6 +++--- src/fs_0x94_ioctl.c | 2 +- @@ -11,14 +12,65 @@ Subject: [PATCH] Use __typeof__ spelling of typeof src/landlock.c | 4 ++-- src/list.h | 10 +++++----- src/macros.h | 2 +- + src/print_fields.h | 2 +- + src/s390.c | 6 +++--- src/tee.c | 2 +- src/ubi.c | 2 +- tests/btrfs.c | 2 +- tests/fcntl-common.c | 2 +- - 11 files changed, 23 insertions(+), 23 deletions(-) + 14 files changed, 32 insertions(+), 32 deletions(-) +diff --git a/src/bpf.c b/src/bpf.c +index 7bdeb4f65..1e72f3e30 100644 +--- a/src/bpf.c ++++ b/src/bpf.c +@@ -1432,7 +1432,7 @@ BEGIN_BPF_CMD_DECODER(BPF_LINK_CREATE) + tprint_struct_next(); + PRINT_FIELD_U(attr, target_btf_id); + } +- attr_size = offsetofend(typeof(attr), target_btf_id); ++ attr_size = offsetofend(__typeof__(attr), target_btf_id); + break; + + /* TODO: prog type == BPF_PROG_TYPE_TRACING */ +@@ -1448,7 +1448,7 @@ BEGIN_BPF_CMD_DECODER(BPF_LINK_CREATE) + print_iter_info_array_member, 0); + tprint_struct_next(); + PRINT_FIELD_U(attr, iter_info_len); +- attr_size = offsetofend(typeof(attr), iter_info_len); ++ attr_size = offsetofend(__typeof__(attr), iter_info_len); + break; + } + +@@ -1460,7 +1460,7 @@ BEGIN_BPF_CMD_DECODER(BPF_LINK_CREATE) + tprint_struct_begin(); + PRINT_FIELD_X(attr.perf_event, bpf_cookie); + tprint_struct_end(); +- attr_size = offsetofend(typeof(attr), perf_event.bpf_cookie); ++ attr_size = offsetofend(__typeof__(attr), perf_event.bpf_cookie); + break; + + /* TODO: prog type == BPF_PROG_TYPE_KPROBE */ +@@ -1500,7 +1500,7 @@ BEGIN_BPF_CMD_DECODER(BPF_LINK_CREATE) + &buf.cookie, sizeof(buf.cookie), + tfetch_mem, print_xint_array_member, 0); + tprint_struct_end(); +- attr_size = offsetofend(typeof(attr), kprobe_multi.cookies); ++ attr_size = offsetofend(__typeof__(attr), kprobe_multi.cookies); + break; + } + +@@ -1510,7 +1510,7 @@ BEGIN_BPF_CMD_DECODER(BPF_LINK_CREATE) + * can pick up non-zero values in the union at the end + * of the link_create struct. + */ +- attr_size = offsetofend(typeof(attr), flags); ++ attr_size = offsetofend(__typeof__(attr), flags); + } + + print_bpf_link_create_end: diff --git a/src/btrfs.c b/src/btrfs.c -index 349fee657..c641d2408 100644 +index 31ee871b3..76d7a2bec 100644 --- a/src/btrfs.c +++ b/src/btrfs.c @@ -216,7 +216,7 @@ btrfs_print_logical_ino_container(struct tcb *tcp, @@ -48,7 +100,7 @@ index 349fee657..c641d2408 100644 inherit.num_qgroups, &record, sizeof(record), tfetch_mem, print_uint_array_member, 0); } -@@ -1169,7 +1169,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, +@@ -1170,7 +1170,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, PRINT_FIELD_OBJ_PTR(args, key, print_btrfs_ioctl_search_key, entering(tcp), !abbrev(tcp)); @@ -57,7 +109,7 @@ index 349fee657..c641d2408 100644 sizeof(args.buf), args.key.nr_items); tprint_struct_end(); if (entering(tcp)) -@@ -1205,7 +1205,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, +@@ -1206,7 +1206,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, entering(tcp), !abbrev(tcp)); tprint_struct_next(); PRINT_FIELD_U(args, buf_size); @@ -66,7 +118,7 @@ index 349fee657..c641d2408 100644 args.buf_size, args.key.nr_items); tprint_struct_end(); if (entering(tcp)) -@@ -1283,7 +1283,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, +@@ -1284,7 +1284,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl, struct btrfs_ioctl_space_info info; tprint_struct_next(); tprints_field_name("spaces"); @@ -76,10 +128,10 @@ index 349fee657..c641d2408 100644 &info, sizeof(info), tfetch_mem, print_btrfs_ioctl_space_info, 0); diff --git a/src/defs.h b/src/defs.h -index 861b667ff..c44935796 100644 +index d6b54a633..d24b11884 100644 --- a/src/defs.h +++ b/src/defs.h -@@ -1120,7 +1120,7 @@ print_local_array_ex(struct tcb *tcp, +@@ -1145,7 +1145,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, \ @@ -88,7 +140,7 @@ index 861b667ff..c44935796 100644 sizeof((start_addr_)[0]), (print_func_), \ NULL, 0, NULL, NULL) -@@ -1986,8 +1986,8 @@ scno_pers_is_valid(kernel_ulong_t scno, unsigned int pers) +@@ -2027,8 +2027,8 @@ scno_pers_is_valid(kernel_ulong_t scno, unsigned int pers) # define ILOG2_ITER_(val_, ret_, bit_) \ do { \ @@ -190,7 +242,7 @@ index 4de4cb3be..f4ec11f0e 100644 #endif /* !STRACE_LIST_H */ diff --git a/src/macros.h b/src/macros.h -index 659d47191..57a0123b4 100644 +index f22be23c5..184f016b0 100644 --- a/src/macros.h +++ b/src/macros.h @@ -62,7 +62,7 @@ @@ -202,8 +254,52 @@ index 659d47191..57a0123b4 100644 # ifndef offsetofend # define offsetofend(type_, member_) \ +diff --git a/src/print_fields.h b/src/print_fields.h +index eca389e7e..b97e86377 100644 +--- a/src/print_fields.h ++++ b/src/print_fields.h +@@ -774,7 +774,7 @@ tprint_sysret_end(void) + # 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/s390.c b/src/s390.c +index ca71730c4..455144fe7 100644 +--- a/src/s390.c ++++ b/src/s390.c +@@ -505,7 +505,7 @@ static void + print_sthyi_machine(struct tcb *tcp, struct sthyi_machine *hdr, uint16_t size, + bool *dummy) + { +- size_t last_decoded = offsetofend(typeof(*hdr), infmpman); ++ size_t last_decoded = offsetofend(__typeof__(*hdr), infmpman); + int cnt_val, name_val, id_val; + + CHECK_SIZE_EX(hdr, last_decoded, size, "machine structure"); +@@ -611,7 +611,7 @@ static void + print_sthyi_partition(struct tcb *tcp, struct sthyi_partition *hdr, + uint16_t size, bool *mt) + { +- size_t last_decoded = offsetofend(typeof(*hdr), infpabif); ++ size_t last_decoded = offsetofend(__typeof__(*hdr), infpabif); + int cnt_val, wcap_val, acap_val, id_val, lpar_val; + + *mt = false; +@@ -802,7 +802,7 @@ static void + print_sthyi_hypervisor(struct tcb *tcp, struct sthyi_hypervisor *hdr, + uint16_t size, int num, bool mt) + { +- size_t last_decoded = offsetofend(typeof(*hdr), infydifl); ++ size_t last_decoded = offsetofend(__typeof__(*hdr), infydifl); + + CHECK_SIZE_EX(hdr, last_decoded, size, "hypervisor %d structure", num); + diff --git a/src/tee.c b/src/tee.c -index d7e9b15d9..fc735e0da 100644 +index 25f6e76c5..c62566800 100644 --- a/src/tee.c +++ b/src/tee.c @@ -33,7 +33,7 @@ struct tee_ioctl_shm_register_fd_data { @@ -229,7 +325,7 @@ index bd2d2811e..ff9f88cd0 100644 tprint_struct_begin(); PRINT_FIELD_D(*p, vol_id); diff --git a/tests/btrfs.c b/tests/btrfs.c -index 867d93213..12ae01545 100644 +index d8ef87a96..321d3a25c 100644 --- a/tests/btrfs.c +++ b/tests/btrfs.c @@ -876,7 +876,7 @@ btrfs_print_tree_search_buf(struct btrfs_ioctl_search_key *key, diff --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 42f2ce6f4e8cd2e6e1667088da58e237afc2cbb0 Mon Sep 17 00:00:00 2001 +From 0355d08676cdc94354bd35f8d885984938645fb3 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/src/defs.h b/src/defs.h -index 71cec62b4..56b2882b6 100644 +index d24b11884..60b9e3322 100644 --- a/src/defs.h +++ b/src/defs.h -@@ -397,8 +397,12 @@ struct tcb { +@@ -398,8 +398,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 71cec62b4..56b2882b6 100644 # include "xlat.h" -- -2.34.1 +2.37.3 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 1ea9b617255ce7ae228fa6fec171a0d960ab7e96 Mon Sep 17 00:00:00 2001 +From 463e94867f84bcb4dc85e18cb4304edea90d8659 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/src/bpf.c b/src/bpf.c -index 7bdeb4f65..3c6889eb0 100644 +index 1e72f3e30..7a6406687 100644 --- a/src/bpf.c +++ b/src/bpf.c @@ -48,7 +48,7 @@ bpf_cmd_decoder(struct tcb *const tcp, \ @@ -55,7 +55,7 @@ index 512ee715d..340201aa3 100644 print_array(tcp, waiters, nr_futexes, &buf, sizeof(buf), tfetch_mem, print_waiter, &data); diff --git a/src/sched.c b/src/sched.c -index acd4d32cf..d7de19ada 100644 +index 010366871..2dda5b872 100644 --- a/src/sched.c +++ b/src/sched.c @@ -111,7 +111,7 @@ static void @@ -68,7 +68,7 @@ index acd4d32cf..d7de19ada 100644 bool is_set = false; diff --git a/src/signal.c b/src/signal.c -index fc13a6613..f7b6e6e49 100644 +index 98f84d500..8680b10fb 100644 --- a/src/signal.c +++ b/src/signal.c @@ -257,7 +257,7 @@ print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr, @@ -79,12 +79,12 @@ index fc13a6613..f7b6e6e49 100644 + int mask[NSIG_BYTES / sizeof(int)] = {0}; if (umoven_or_printaddr(tcp, addr, len, mask)) return; - tprints(sprintsigmask_n("", mask, len)); + tprints_string(sprintsigmask_n("", mask, len)); diff --git a/src/strace.c b/src/strace.c -index 3f5a00a0a..cea52bb22 100644 +index 5752177b7..9cd4ff461 100644 --- a/src/strace.c +++ b/src/strace.c -@@ -3621,7 +3621,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig) +@@ -3693,7 +3693,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig) syscall_entering_finish(tcp, res); return res; } else { @@ -94,7 +94,7 @@ index 3f5a00a0a..cea52bb22 100644 if (res != 0) { res = syscall_exiting_trace(tcp, &ts, res); diff --git a/tests/btrfs.c b/tests/btrfs.c -index 12ae01545..a821d8057 100644 +index 321d3a25c..442377130 100644 --- a/tests/btrfs.c +++ b/tests/btrfs.c @@ -313,7 +313,7 @@ btrfs_test_subvol_ioctls(void) diff --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 b77a4eb06db5c9ec06dfb8386364a5966bbcb1a8 Mon Sep 17 00:00:00 2001 +From 3b3898e2a370be0489226da973e18176530e267a 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 @@ -6,15 +6,15 @@ Subject: [PATCH] Don't omit second operand to '?' operator --- src/kd_ioctl.c | 2 +- src/open.c | 5 +++-- - src/prctl.c | 9 ++++----- + src/prctl.c | 8 ++++---- src/strace.c | 6 +++--- - 4 files changed, 11 insertions(+), 11 deletions(-) + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/kd_ioctl.c b/src/kd_ioctl.c -index eadc1a457..35a89ffed 100644 +index ada23d536..fddbd38fb 100644 --- a/src/kd_ioctl.c +++ b/src/kd_ioctl.c -@@ -449,7 +449,7 @@ kd_kbd_str_entry(struct tcb *const tcp, const kernel_ulong_t arg, +@@ -457,7 +457,7 @@ kd_kbd_str_entry(struct tcb *const tcp, const kernel_ulong_t arg, if (print_quoted_string((char *) val.kb_string, MIN(max_strlen, @@ -24,7 +24,7 @@ index eadc1a457..35a89ffed 100644 tprint_more_data_follows(); diff --git a/src/open.c b/src/open.c -index d7654d7e8..6c5c4a2a5 100644 +index 6356c5831..df59ea999 100644 --- a/src/open.c +++ b/src/open.c @@ -88,8 +88,9 @@ sprint_open_modes64(uint64_t flags) @@ -40,18 +40,10 @@ index d7654d7e8..6c5c4a2a5 100644 const char * diff --git a/src/prctl.c b/src/prctl.c -index 97f42fe15..c0394782b 100644 +index f6b4dd741..951133a83 100644 --- a/src/prctl.c +++ b/src/prctl.c -@@ -82,7 +82,6 @@ sprint_sve_val(kernel_ulong_t arg, bool aux) - kernel_ulong_t vl = arg & PR_SVE_VL_LEN_MASK; - kernel_ulong_t flags = arg & ~PR_SVE_VL_LEN_MASK; - -- if (!flags && aux) - return NULL; - - const char *flags_str = sprintflags_ex("", pr_sve_vl_flags, flags, '\0', -@@ -91,10 +90,10 @@ sprint_sve_val(kernel_ulong_t arg, bool aux) +@@ -92,10 +92,10 @@ sprint_sve_val(kernel_ulong_t arg, bool aux) if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE) { xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */", @@ -64,7 +56,7 @@ index 97f42fe15..c0394782b 100644 } return out; -@@ -127,10 +126,10 @@ sprint_sme_val(kernel_ulong_t arg, bool aux) +@@ -128,10 +128,10 @@ sprint_sme_val(kernel_ulong_t arg, bool aux) if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE) { xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */", @@ -78,10 +70,10 @@ index 97f42fe15..c0394782b 100644 return out; diff --git a/src/strace.c b/src/strace.c -index cea52bb22..154ee684f 100644 +index 9cd4ff461..4403bd27e 100644 --- a/src/strace.c +++ b/src/strace.c -@@ -2463,7 +2463,7 @@ init(int argc, char *argv[]) +@@ -2494,7 +2494,7 @@ init(int argc, char *argv[]) break; case GETOPT_TS: tflag_long_set = true; @@ -90,7 +82,7 @@ index cea52bb22..154ee684f 100644 error_opt_arg(c, lopt, optarg); break; case 'T': -@@ -2572,10 +2572,10 @@ init(int argc, char *argv[]) +@@ -2614,10 +2614,10 @@ init(int argc, char *argv[]) qualify_kvm(optarg); break; case GETOPT_QUAL_QUIET: diff --git a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch b/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch @@ -1,4 +1,4 @@ -From ecb0b8b820e7777d3270e1ba48583fcf6ef6e9ed Mon Sep 17 00:00:00 2001 +From a98e58cc36d6df5935dbedd9e1c2947262b8b67c 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 @@ -25,10 +25,10 @@ index e4f362787..ad203748b 100644 const size_t c = columns[i]; diff --git a/src/nlattr.c b/src/nlattr.c -index c0563c804..298f6e6da 100644 +index 1fb394d7c..6f2d54979 100644 --- a/src/nlattr.c +++ b/src/nlattr.c -@@ -355,7 +355,7 @@ decode_nla_hwaddr(struct tcb *const tcp, +@@ -357,7 +357,7 @@ decode_nla_hwaddr(struct tcb *const tcp, if (len > MAX_ADDR_LEN) return false; @@ -38,7 +38,7 @@ index c0563c804..298f6e6da 100644 if (!umoven_or_printaddr(tcp, addr, len, buf)) { diff --git a/src/socketutils.c b/src/socketutils.c -index 4994cd6d9..0a3102347 100644 +index d3a3b9283..e0079456f 100644 --- a/src/socketutils.c +++ b/src/socketutils.c @@ -133,7 +133,7 @@ inet_parse_response(const void *const data, const int data_len, @@ -60,7 +60,7 @@ index 4994cd6d9..0a3102347 100644 if (!inet_ntop(diag_msg->idiag_family, diag_msg->id.idiag_dst, dst_buf, text_size)) diff --git a/src/syscall.c b/src/syscall.c -index 92aaee092..159a2a511 100644 +index c636ba37c..687d08bc0 100644 --- a/src/syscall.c +++ b/src/syscall.c @@ -287,7 +287,7 @@ decode_socket_subcall(struct tcb *tcp) @@ -73,10 +73,10 @@ index 92aaee092..159a2a511 100644 if (umoven(tcp, tcp->u_arg[1], nargs * current_wordsize, buf) < 0) return; diff --git a/src/util.c b/src/util.c -index c4c4bc0ef..6e513ede0 100644 +index a63d80678..a3bea5b76 100644 --- a/src/util.c +++ b/src/util.c -@@ -571,8 +571,7 @@ enum sock_proto +@@ -556,8 +556,7 @@ enum sock_proto getfdproto(struct tcb *tcp, int fd) { #ifdef HAVE_SYS_XATTR_H @@ -86,7 +86,7 @@ index c4c4bc0ef..6e513ede0 100644 ssize_t r; char path[sizeof("/proc/%u/fd/%u") + 2 * sizeof(int)*3]; -@@ -580,7 +579,7 @@ getfdproto(struct tcb *tcp, int fd) +@@ -565,7 +564,7 @@ getfdproto(struct tcb *tcp, int fd) return SOCK_PROTO_UNKNOWN; xsprintf(path, "/proc/%u/fd/%u", get_proc_pid(tcp->pid), fd); 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 4facb9769bda85852c9bc8f54b85073314568d04 Mon Sep 17 00:00:00 2001 +From 261761aff67c7169b758c4747b3fe7826161ee6d 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 @@ -13,16 +13,12 @@ Subject: [PATCH] Avoid index ranges and empty initializer lists in syscallent 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 | 18 +++---- - src/linux/sparc/syscallent.h | 4 +- - src/linux/sparc64/syscallent.h | 36 +++++++------- src/linux/xtensa/syscallent.h | 32 ++++++------ - 17 files changed, 168 insertions(+), 168 deletions(-) + 13 files changed, 142 insertions(+), 142 deletions(-) diff --git a/src/linux/alpha/syscallent.h b/src/linux/alpha/syscallent.h index 87cbe59bd..88bc0a5a4 100644 @@ -436,61 +432,6 @@ index 29cc42632..b1274f890 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/src/linux/powerpc/syscallent.h b/src/linux/powerpc/syscallent.h -index c8f954be4..c47134fd5 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" }, - [223] = { 3, 0, SEN(sched_getaffinity), "sched_getaffinity" }, --[224] = { }, -+/* [224] - unused */ - [225] = { 5, 0, SEN(printargs), "tuxcall" }, - [226] = { 4, TD|TN, SEN(sendfile64), "sendfile64" }, - [227] = { 2, TM, SEN(io_setup), "io_setup" }, -diff --git a/src/linux/powerpc64/syscallent.h b/src/linux/powerpc64/syscallent.h -index 64f4c3ad5..6d6b3fa74 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" }, - [191] = { 3, TD, SEN(readahead), "readahead" }, --[192 ... 197] = { }, -+/* [192 ... 197] - unused */ - [198] = { 5, 0, SEN(printargs), "pciconfig_read" }, - [199] = { 5, 0, SEN(printargs), "pciconfig_write" }, - [200] = { 3, 0, SEN(printargs), "pciconfig_iobase" }, - [201] = { 6, 0, SEN(printargs), "multiplexer" }, - [202] = { 3, TD, SEN(getdents64), "getdents64" }, - [203] = { 2, TF, SEN(pivotroot), "pivot_root" }, --[204] = { }, -+/* [204] - unused */ - [205] = { 3, TM, SEN(madvise), "madvise" }, - [206] = { 3, TM, SEN(mincore), "mincore" }, - [207] = { 0, PU|NF, SEN(gettid), "gettid" }, -@@ -226,9 +226,9 @@ - [221] = { 6, 0, SEN(futex_time64), "futex" }, - [222] = { 3, 0, SEN(sched_setaffinity), "sched_setaffinity" }, - [223] = { 3, 0, SEN(sched_getaffinity), "sched_getaffinity" }, --[224] = { }, -+/* [224] - unused */ - [225] = { 5, 0, SEN(printargs), "tuxcall" }, --[226] = { }, -+/* [226] - unused */ - [227] = { 2, TM, SEN(io_setup), "io_setup" }, - [228] = { 1, TM, SEN(io_destroy), "io_destroy" }, - [229] = { 5, 0, SEN(io_getevents_time64), "io_getevents" }, -@@ -256,7 +256,7 @@ - [251] = { 2, TF, SEN(utimes), "utimes" }, - [252] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, - [253] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, --[254] = { }, -+/* [254] - unused */ - [255] = { 1, 0, SEN(printargs), "rtas" }, - [256] = { 5, 0, SEN(printargs), "sys_debug_setcontext" }, - [257] = { 5, 0, SEN(vserver), "vserver" }, diff --git a/src/linux/s390/syscallent.h b/src/linux/s390/syscallent.h index a808c7b5b..8f7a0aca0 100644 --- a/src/linux/s390/syscallent.h @@ -977,139 +918,6 @@ index f33504235..646eb6f4a 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/src/linux/sparc/syscallent.h b/src/linux/sparc/syscallent.h -index 55d10ec5d..e0d74b014 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" }, - [ 51] = { 1, TF, SEN(acct), "acct" }, --[ 52] = { }, -+/* [ 52] - unused */ - [ 53] = { 0, TC|PU|NF, SEN(getgid), "getgid32" }, - [ 54] = { 3, TD, SEN(ioctl), "ioctl" }, - [ 55] = { 4, 0, SEN(reboot), "reboot" }, -@@ -169,7 +169,7 @@ - [161] = { 3, 0, SEN(sched_getaffinity), "sched_get_affinity" }, - [162] = { 2, 0, SEN(printargs), "getdomainname" }, - [163] = { 2, 0, SEN(setdomainname), "setdomainname" }, --[164] = { }, -+/* [164] - unused */ - [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/src/linux/sparc64/syscallent.h b/src/linux/sparc64/syscallent.h -index 9cd51431d..78278a045 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" }, - [ 30] = { 2, TF, SEN(utime), "utime" }, --[ 31 ... 32] = { }, -+/* [ 31 ... 32] - unused */ - [ 33] = { 2, TF, SEN(access), "access" }, - [ 34] = { 1, 0, SEN(nice), "nice" }, --[ 35] = { }, -+/* [ 35] - unused */ - [ 36] = { 0, 0, SEN(sync), "sync" }, - [ 37] = { 2, TS|TP, SEN(kill), "kill" }, - [ 38] = { 2, TF|TST|TSTA, SEN(stat), "stat" }, -@@ -48,7 +48,7 @@ - [ 41] = { 1, TD, SEN(dup), "dup" }, - [ 42] = { 0, TD, SEN(pipe), "pipe" }, - [ 43] = { 1, 0, SEN(times), "times" }, --[ 44] = { }, -+/* [ 44] - unused */ - [ 45] = { 2, TF, SEN(umount2), "umount2" }, - [ 46] = { 1, TC, SEN(setgid), "setgid" }, - [ 47] = { 0, TC|PU|NF, SEN(getgid), "getgid" }, -@@ -57,10 +57,10 @@ - [ 50] = { 0, TC|PU|NF, SEN(getegid), "getegid" }, - [ 51] = { 1, TF, SEN(acct), "acct" }, - [ 52] = { 2, 0, SEN(printargs), "memory_ordering" }, --[ 53] = { }, -+/* [ 53] - unused */ - [ 54] = { 3, TD, SEN(ioctl), "ioctl" }, - [ 55] = { 4, 0, SEN(reboot), "reboot" }, --[ 56] = { }, -+/* [ 56] - unused */ - [ 57] = { 2, TF, SEN(symlink), "symlink" }, - [ 58] = { 3, TF, SEN(readlink), "readlink" }, - [ 59] = { 3, CC|TF|TP|TSD|SE|SI, SEN(execve), "execve" }, -@@ -73,31 +73,31 @@ - [ 66] = { 0, TP, SEN(vfork), "vfork" }, - [ 67] = { 4, TD, SEN(pread), "pread64" }, - [ 68] = { 4, TD, SEN(pwrite), "pwrite64" }, --[ 69 ... 70] = { }, -+/* [ 69 ... 70] */ - [ 71] = { 6, TD|TM|SI, SEN(mmap), "mmap" }, --[ 72] = { }, -+/* [ 72] - unused */ - [ 73] = { 2, TM|SI, SEN(munmap), "munmap" }, - [ 74] = { 3, TM|SI, SEN(mprotect), "mprotect" }, - [ 75] = { 3, TM, SEN(madvise), "madvise" }, - [ 76] = { 0, 0, SEN(vhangup), "vhangup" }, --[ 77] = { }, -+/* [ 77] - unused */ - [ 78] = { 3, TM, SEN(mincore), "mincore" }, - [ 79] = { 2, TC, SEN(getgroups), "getgroups" }, - [ 80] = { 2, TC, SEN(setgroups), "setgroups" }, - [ 81] = { 0, PU|NF, SEN(getpgrp), "getpgrp" }, --[ 82] = { }, -+/* [ 82] - unused */ - [ 83] = { 3, 0, SEN(setitimer), "setitimer" }, --[ 84] = { }, -+/* [ 84] - unused */ - [ 85] = { 2, TF, SEN(swapon), "swapon" }, - [ 86] = { 2, 0, SEN(getitimer), "getitimer" }, --[ 87] = { }, -+/* [ 87] - unused */ - [ 88] = { 2, 0, SEN(sethostname), "sethostname" }, --[ 89] = { }, -+/* [ 89] - unused */ - [ 90] = { 2, TD, SEN(dup2), "dup2" }, --[ 91] = { }, -+/* [ 91] - unused */ - [ 92] = { 3, TD, SEN(fcntl), "fcntl" }, - [ 93] = { 5, TD, SEN(select), "select" }, --[ 94] = { }, -+/* [ 94] - unused */ - [ 95] = { 1, TD, SEN(fsync), "fsync" }, - [ 96] = { 3, 0, SEN(setpriority), "setpriority" }, - [ 97] = { 3, TN, SEN(socket), "socket" }, -@@ -115,10 +115,10 @@ - [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" }, - [114] = { 3, TN, SEN(sendmsg), "sendmsg" }, --[115] = { }, -+/* [115] - unused */ - [116] = { 2, TCL, SEN(gettimeofday), "gettimeofday" }, - [117] = { 2, 0, SEN(getrusage), "getrusage" }, - [118] = { 5, TN, SEN(getsockopt), "getsockopt" }, -@@ -158,7 +158,7 @@ - [152] = { 3, TD|TF, SEN(inotify_add_watch), "inotify_add_watch" }, - [153] = { 3, TD, SEN(poll_time64), "poll" }, - [154] = { 3, TD, SEN(getdents64), "getdents64" }, --[155] = { }, -+/* [155] - unused */ - [156] = { 2, TD, SEN(inotify_rm_watch), "inotify_rm_watch" }, - [157] = { 2, TF|TSF|TSFA, SEN(statfs), "statfs" }, - [158] = { 2, TD|TFSF|TSFA, SEN(fstatfs), "fstatfs" }, -@@ -234,7 +234,7 @@ - [228] = { 1, TC|NF, SEN(setfsuid), "setfsuid" }, - [229] = { 1, TC|NF, SEN(setfsgid), "setfsgid" }, - [230] = { 5, TD, SEN(select), "_newselect" }, --[231] = { }, -+/* [231] - unused */ - [232] = { 6, TD, SEN(splice), "splice" }, - [233] = { 1, 0, SEN(stime), "stime" }, - [234] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, diff --git a/src/linux/xtensa/syscallent.h b/src/linux/xtensa/syscallent.h index 09fed329c..69d58ec6d 100644 --- a/src/linux/xtensa/syscallent.h @@ -1236,5 +1044,5 @@ index 09fed329c..69d58ec6d 100644 [321] = { 6, TD|TF, SEN(fanotify_mark), "fanotify_mark" }, [322] = { 6, 0, SEN(process_vm_readv), "process_vm_readv" }, -- -2.34.1 +2.37.3 diff --git a/pkg/strace/patch/0011-Avoid-index-ranges.patch b/pkg/strace/patch/0011-Avoid-index-ranges.patch @@ -1,4 +1,4 @@ -From 2aed2fd146be2c7b36f1f618accf166c8be109b6 Mon Sep 17 00:00:00 2001 +From d1c93514cb65877134e8f53b189adbcd5a0e1b43 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 @@ -11,7 +11,7 @@ ignore this for now. 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/print_mac.c b/src/print_mac.c -index 38a1f57e8..ebcc708a3 100644 +index cad1013a8..73d7bbe28 100644 --- a/src/print_mac.c +++ b/src/print_mac.c @@ -17,8 +17,6 @@ @@ -33,10 +33,10 @@ index 38a1f57e8..ebcc708a3 100644 return sprint_mac_addr(hwaddr, MIN(size, sz)); diff --git a/src/util.c b/src/util.c -index 6e513ede0..88f25aa83 100644 +index a3bea5b76..21fb9560f 100644 --- a/src/util.c +++ b/src/util.c -@@ -1389,16 +1389,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, +@@ -1477,16 +1477,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; diff --git a/pkg/strace/sha256 b/pkg/strace/sha256 @@ -1 +1 @@ -aa3dc1c8e60e4f6ff3d396514aa247f3c7bf719d8a8dc4dd4fa793be786beca3 strace-5.19.tar.xz +27987dbac57fdfd260c6db4dc8328df35c95c6867c8a3d4371d59cdcf4eb9238 strace-6.4.tar.xz diff --git a/pkg/strace/url b/pkg/strace/url @@ -1 +1 @@ -url = "https://github.com/strace/strace/releases/download/v5.19/strace-5.19.tar.xz" +url = "https://github.com/strace/strace/releases/download/v6.4/strace-6.4.tar.xz" diff --git a/pkg/strace/ver b/pkg/strace/ver @@ -1 +1 @@ -5.19 r0 +6.4 r0