commit 4b12d55
Randy Palamar
·
2024-12-29 15:34:25 +0000 UTC
parent 4eee677
strace: bump to 6.12
9 files changed,
+105,
-57
+1,
-1
1@@ -1,3 +1,3 @@
2 /src
3-/strace-6.8.tar.xz
4+/strace-6.12.tar.xz
5 /tools.ninja
+74,
-16
1@@ -7,7 +7,7 @@
2 #define ASM_SIGRTMIN 32
3 /* #undef AVR32 */
4 /* #undef BFIN */
5-#define COPYRIGHT_YEAR "2023"
6+#define COPYRIGHT_YEAR "2024"
7 /* #undef CSKY */
8 #define ENABLE_ARM_OABI 0
9 /* #undef ENABLE_SECONTEXT */
10@@ -91,7 +91,6 @@
11 #define HAVE_FTRUNCATE 1
12 #define HAVE_FUTIMENS 1
13 #define HAVE_GCOV_H 1
14-/* #undef HAVE_GNU_STUBS */
15 /* #undef HAVE_GNU_STUBS_32_H */
16 /* #undef HAVE_GNU_STUBS_X32_H */
17 #define HAVE_ICONV_H 1
18@@ -120,8 +119,8 @@
19 /* #undef HAVE_M32_STRUCT_STAT64 */
20 /* #undef HAVE_M32_STRUCT_STAT64_ST_MTIME_NSEC */
21 /* #undef HAVE_M32_STRUCT_STAT_ST_MTIME_NSEC */
22-#define HAVE_MEMORY_H 1
23 #define HAVE_MEMPCPY 1
24+/* #undef HAVE_MINIX_CONFIG_H */
25 #define HAVE_MQUEUE_H 1
26 /* #undef HAVE_MX32_MPERS */
27 /* #undef HAVE_MX32_SELINUX_RUNTIME */
28@@ -161,6 +160,7 @@
29 #define HAVE_SIG_ATOMIC_T 1
30 #define HAVE_STATIC_ASSERT 1
31 #define HAVE_STDINT_H 1
32+#define HAVE_STDIO_H 1
33 #define HAVE_STDLIB_H 1
34 #define HAVE_STPCPY 1
35 #define HAVE_STRERROR 1
36@@ -222,7 +222,7 @@
37 #define HAVE_STRUCT_IOCB_AIO_RW_FLAGS 1
38 #define HAVE_STRUCT_KBDIACRSUC 1
39 #define HAVE_STRUCT_KBDIACRUC 1
40-#define HAVE_STRUCT_KVM_CPUID2 1
41+/* #undef HAVE_STRUCT_KVM_CPUID2 */
42 #define HAVE_STRUCT_KVM_REGS 1
43 #define HAVE_STRUCT_KVM_SREGS 1
44 #define HAVE_STRUCT_KVM_USERSPACE_MEMORY_REGION 1
45@@ -233,6 +233,9 @@
46 #define HAVE_STRUCT_SIGCONTEXT 1
47 #define HAVE_STRUCT_SOCKADDR_ALG_NEW 1
48 /* #undef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL */
49+/* #undef HAVE_STRUCT_SOCKADDR_IPX */
50+/* #undef HAVE_STRUCT_SOCKADDR_IPX_IN_LINUX_IPX_H */
51+/* #undef HAVE_STRUCT_SOCKADDR_IPX_IN_NETIPX_IPX_H */
52 /* #undef HAVE_STRUCT_SOCKADDR_L2_L2_BDADDR_TYPE */
53 #define HAVE_STRUCT_SOCKADDR_STORAGE 1
54 #define HAVE_STRUCT_SOCKADDR_VM 1
55@@ -255,13 +258,13 @@
56 #define HAVE_STRUCT_TERMIOS2 1
57 /* #undef HAVE_STRUCT_TERMIOS_C_ISPEED */
58 /* #undef HAVE_STRUCT_TERMIOS_C_OSPEED */
59-#define HAVE_STRUCT_USER_DESC 1
60-#define HAVE_STRUCT_USER_DESC_LM 1
61+/* #undef HAVE_STRUCT_USER_DESC */
62+/* #undef HAVE_STRUCT_USER_DESC_LM */
63 #define HAVE_STRUCT_UTSNAME_DOMAINNAME 1
64 /* #undef HAVE_STRUCT___AIO_SIGSET */
65 #define HAVE_STRUCT___KERNEL_SOCK_TIMEVAL 1
66 #define HAVE_STRUCT___KERNEL_TIMESPEC 1
67-#define HAVE_STRUCT___OLD_KERNEL_STAT 1
68+/* #undef HAVE_STRUCT___OLD_KERNEL_STAT */
69 #define HAVE_STRUCT___PTRACE_SYSCALL_INFO 1
70 #define HAVE_SYNC_FILE_RANGE 1
71 #define HAVE_SYS_EVENTFD_H 1
72@@ -298,6 +301,7 @@
73 #define HAVE_UNION_BPF_ATTR_BTF_VALUE_TYPE_ID 1
74 #define HAVE_UNION_BPF_ATTR_BTF_VMLINUX_VALUE_TYPE_ID 1
75 /* #undef HAVE_UNION_BPF_ATTR_DUMMY */
76+#define HAVE_UNION_BPF_ATTR_ENABLE_STATS_TYPE 1
77 #define HAVE_UNION_BPF_ATTR_EXPECTED_ATTACH_TYPE 1
78 #define HAVE_UNION_BPF_ATTR_FD_ARRAY 1
79 #define HAVE_UNION_BPF_ATTR_FILE_FLAGS 1
80@@ -311,6 +315,8 @@
81 #define HAVE_UNION_BPF_ATTR_INNER_MAP_FD 1
82 #define HAVE_UNION_BPF_ATTR_INSNS 1
83 #define HAVE_UNION_BPF_ATTR_INSN_CNT 1
84+#define HAVE_UNION_BPF_ATTR_ITER_CREATE_FLAGS 1
85+#define HAVE_UNION_BPF_ATTR_ITER_CREATE_LINK_FD 1
86 #define HAVE_UNION_BPF_ATTR_KERN_VERSION 1
87 #define HAVE_UNION_BPF_ATTR_KEY 1
88 #define HAVE_UNION_BPF_ATTR_KEY_SIZE 1
89@@ -332,6 +338,7 @@
90 /* #undef HAVE_UNION_BPF_ATTR_LINK_CREATE_SYMS */
91 #define HAVE_UNION_BPF_ATTR_LINK_CREATE_TARGET_BTF_ID 1
92 #define HAVE_UNION_BPF_ATTR_LINK_CREATE_TARGET_FD 1
93+#define HAVE_UNION_BPF_ATTR_LINK_DETACH_LINK_FD 1
94 #define HAVE_UNION_BPF_ATTR_LINK_ID 1
95 #define HAVE_UNION_BPF_ATTR_LINK_UPDATE_FLAGS 1
96 #define HAVE_UNION_BPF_ATTR_LINK_UPDATE_LINK_FD 1
97@@ -354,6 +361,10 @@
98 #define HAVE_UNION_BPF_ATTR_OPEN_FLAGS 1
99 /* #undef HAVE_UNION_BPF_ATTR_PAD */
100 #define HAVE_UNION_BPF_ATTR_PATHNAME 1
101+#define HAVE_UNION_BPF_ATTR_PATH_FD 1
102+#define HAVE_UNION_BPF_ATTR_PROG_BIND_MAP_FLAGS 1
103+#define HAVE_UNION_BPF_ATTR_PROG_BIND_MAP_MAP_FD 1
104+#define HAVE_UNION_BPF_ATTR_PROG_BIND_MAP_PROG_FD 1
105 #define HAVE_UNION_BPF_ATTR_PROG_BTF_FD 1
106 #define HAVE_UNION_BPF_ATTR_PROG_FLAGS 1
107 #define HAVE_UNION_BPF_ATTR_PROG_ID 1
108@@ -366,6 +377,8 @@
109 #define HAVE_UNION_BPF_ATTR_QUERY_PROG_IDS 1
110 #define HAVE_UNION_BPF_ATTR_QUERY_QUERY_FLAGS 1
111 #define HAVE_UNION_BPF_ATTR_QUERY_TARGET_FD 1
112+#define HAVE_UNION_BPF_ATTR_RAW_TRACEPOINT_COOKIE 1
113+/* #undef HAVE_UNION_BPF_ATTR_RAW_TRACEPOINT_DUMMY */
114 #define HAVE_UNION_BPF_ATTR_RAW_TRACEPOINT_NAME 1
115 #define HAVE_UNION_BPF_ATTR_RAW_TRACEPOINT_PROG_FD 1
116 #define HAVE_UNION_BPF_ATTR_REPLACE_BPF_FD 1
117@@ -395,10 +408,13 @@
118 #define HAVE_UNION_BPF_ATTR_TEST_PROG_FD 1
119 #define HAVE_UNION_BPF_ATTR_TEST_REPEAT 1
120 #define HAVE_UNION_BPF_ATTR_TEST_RETVAL 1
121+#define HAVE_UNION_BPF_ATTR_TOKEN_CREATE_BPFFS_FD 1
122+#define HAVE_UNION_BPF_ATTR_TOKEN_CREATE_FLAGS 1
123 #define HAVE_UNION_BPF_ATTR_VALUE 1
124 #define HAVE_UNION_BPF_ATTR_VALUE_SIZE 1
125 #define HAVE_UNISTD_H 1
126 /* #undef HAVE_USTAT_H */
127+#define HAVE_WCHAR_H 1
128 /* #undef HAVE__STATIC_ASSERT */
129 /* probe HAVE___BUILTIN_POPCOUNT */
130 #define HAVE___KERNEL_LONG_T 1
131@@ -425,10 +441,10 @@
132 #define PACKAGE "strace"
133 #define PACKAGE_BUGREPORT "strace-devel@lists.strace.io"
134 #define PACKAGE_NAME "strace"
135-#define PACKAGE_STRING "strace 6.4"
136+#define PACKAGE_STRING "strace 6.12"
137 #define PACKAGE_TARNAME "strace"
138 #define PACKAGE_URL "https://strace.io"
139-#define PACKAGE_VERSION "6.4"
140+#define PACKAGE_VERSION "6.12"
141 /* #undef POWERPC */
142 /* #undef POWERPC64 */
143 /* #undef POWERPC64LE */
144@@ -447,7 +463,7 @@
145 /* #undef SPARC */
146 /* #undef SPARC64 */
147 #define STDC_HEADERS 1
148-#define STRACE_MANPAGE_DATE "2023-06-11"
149+#define STRACE_MANPAGE_DATE "2024-06-30"
150 /* #undef TILE */
151 /* #undef USE_DEMANGLE */
152 /* #undef USE_LIBDW */
153@@ -455,20 +471,65 @@
154 #ifndef _ALL_SOURCE
155 # define _ALL_SOURCE 1
156 #endif
157+#ifndef _DARWIN_C_SOURCE
158+# define _DARWIN_C_SOURCE 1
159+#endif
160+#ifndef __EXTENSIONS__
161+# define __EXTENSIONS__ 1
162+#endif
163 #ifndef _GNU_SOURCE
164 # define _GNU_SOURCE 1
165 #endif
166+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
167+# define _HPUX_ALT_XOPEN_SOCKET_API 1
168+#endif
169+#ifndef _MINIX
170+/* # undef _MINIX */
171+#endif
172+#ifndef _NETBSD_SOURCE
173+# define _NETBSD_SOURCE 1
174+#endif
175+#ifndef _OPENBSD_SOURCE
176+# define _OPENBSD_SOURCE 1
177+#endif
178+#ifndef _POSIX_SOURCE
179+/* # undef _POSIX_SOURCE */
180+#endif
181+#ifndef _POSIX_1_SOURCE
182+/* # undef _POSIX_1_SOURCE */
183+#endif
184 #ifndef _POSIX_PTHREAD_SEMANTICS
185 # define _POSIX_PTHREAD_SEMANTICS 1
186 #endif
187+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
188+# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
189+#endif
190+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
191+# define __STDC_WANT_IEC_60559_BFP_EXT__ 1
192+#endif
193+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
194+# define __STDC_WANT_IEC_60559_DFP_EXT__ 1
195+#endif
196+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
197+# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
198+#endif
199+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
200+# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
201+#endif
202+#ifndef __STDC_WANT_LIB_EXT2__
203+# define __STDC_WANT_LIB_EXT2__ 1
204+#endif
205+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
206+# define __STDC_WANT_MATH_SPEC_FUNCS__ 1
207+#endif
208 #ifndef _TANDEM_SOURCE
209 # define _TANDEM_SOURCE 1
210 #endif
211-#ifndef __EXTENSIONS__
212-# define __EXTENSIONS__ 1
213+#ifndef _XOPEN_SOURCE
214+/* # undef _XOPEN_SOURCE */
215 #endif
216 /* #undef USE_UNWINDER */
217-#define VERSION "6.4"
218+#define VERSION "6.12"
219 #if defined AC_APPLE_UNIVERSAL_BUILD
220 # if defined __BIG_ENDIAN__
221 # define WORDS_BIGENDIAN 1
222@@ -481,9 +542,6 @@
223 /* #undef X32 */
224 #define X86_64 1
225 /* #undef XTENSA */
226-/* #undef _MINIX */
227-/* #undef _POSIX_1_SOURCE */
228-/* #undef _POSIX_SOURCE */
229 /* #undef gid_t */
230 /* #undef typeof */
231 /* #undef uid_t */
+4,
-0
1@@ -92,6 +92,7 @@ local srcs = paths[[src/(
2 bjm.c
3 block.c
4 bpf.c
5+ bpf_attr_check.c
6 bpf_filter.c
7 bpf_seccomp_filter.c
8 bpf_sock_filter.c
9@@ -115,6 +116,7 @@ local srcs = paths[[src/(
10 dup.c
11 dyxlat.c
12 epoll.c
13+ epoll_ioctl.c
14 error_prints.c
15 evdev.c
16 evdev_mpers.c
17@@ -212,10 +214,12 @@ local srcs = paths[[src/(
18 net.c
19 netlink.c
20 netlink_crypto.c
21+ netlink_generic.c
22 netlink_inet_diag.c
23 netlink_kobject_uevent.c
24 netlink_netfilter.c
25 netlink_netlink_diag.c
26+ netlink_nlctrl.c
27 netlink_packet_diag.c
28 netlink_route.c
29 netlink_selinux.c
1@@ -1,30 +1,16 @@
2-From 586b8d1808d18149a872f0ee1dc8903b9f9e8750 Mon Sep 17 00:00:00 2001
3+From e245f2d71d44d2a858517321a01d3ca71147042f Mon Sep 17 00:00:00 2001
4 From: Michael Forney <mforney@mforney.org>
5 Date: Sun, 7 Jul 2019 21:53:16 -0700
6 Subject: [PATCH] Don't omit second operand to '?' operator
7
8 ---
9- src/kd_ioctl.c | 2 +-
10- src/open.c | 5 +++--
11- src/prctl.c | 8 ++++----
12- src/strace.c | 8 ++++----
13- src/strauss.c | 4 +++-
14- src/util.c | 2 +-
15- 6 files changed, 16 insertions(+), 13 deletions(-)
16+ src/open.c | 5 +++--
17+ src/prctl.c | 8 ++++----
18+ src/strace.c | 8 ++++----
19+ src/strauss.c | 4 +++-
20+ src/util.c | 2 +-
21+ 5 files changed, 15 insertions(+), 12 deletions(-)
22
23-diff --git a/src/kd_ioctl.c b/src/kd_ioctl.c
24-index ada23d536..fddbd38fb 100644
25---- a/src/kd_ioctl.c
26-+++ b/src/kd_ioctl.c
27-@@ -457,7 +457,7 @@ kd_kbd_str_entry(struct tcb *const tcp, const kernel_ulong_t arg,
28-
29- if (print_quoted_string((char *) val.kb_string,
30- MIN(max_strlen,
31-- (unsigned int) ret ?: sizeof(val.kb_string)),
32-+ ret ? (unsigned int) ret : sizeof(val.kb_string)),
33- QUOTE_OMIT_TRAILING_0))
34- tprint_more_data_follows();
35-
36 diff --git a/src/open.c b/src/open.c
37 index 6356c5831..df59ea999 100644
38 --- a/src/open.c
39@@ -42,10 +28,10 @@ index 6356c5831..df59ea999 100644
40
41 const char *
42 diff --git a/src/prctl.c b/src/prctl.c
43-index f6b4dd741..951133a83 100644
44+index dbabb3a18..712715b98 100644
45 --- a/src/prctl.c
46 +++ b/src/prctl.c
47-@@ -92,10 +92,10 @@ sprint_sve_val(kernel_ulong_t arg, bool aux)
48+@@ -98,10 +98,10 @@ sprint_sve_val(kernel_ulong_t arg, bool aux)
49 if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
50 {
51 xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
52@@ -58,7 +44,7 @@ index f6b4dd741..951133a83 100644
53 }
54
55 return out;
56-@@ -128,10 +128,10 @@ sprint_sme_val(kernel_ulong_t arg, bool aux)
57+@@ -134,10 +134,10 @@ sprint_sme_val(kernel_ulong_t arg, bool aux)
58 if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
59 {
60 xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
61@@ -72,10 +58,10 @@ index f6b4dd741..951133a83 100644
62
63 return out;
64 diff --git a/src/strace.c b/src/strace.c
65-index 9c87e34ed..13904f6e1 100644
66+index 1a9d53bc8..9ac16c8c3 100644
67 --- a/src/strace.c
68 +++ b/src/strace.c
69-@@ -2609,7 +2609,7 @@ init(int argc, char *argv[])
70+@@ -2649,7 +2649,7 @@ init(int argc, char *argv[])
71 break;
72 case GETOPT_TS:
73 tflag_long_set = true;
74@@ -84,7 +70,7 @@ index 9c87e34ed..13904f6e1 100644
75 error_opt_arg(c, lopt, optarg);
76 break;
77 case 'T':
78-@@ -2683,7 +2683,7 @@ init(int argc, char *argv[])
79+@@ -2723,7 +2723,7 @@ init(int argc, char *argv[])
80 error_opt_arg(c, lopt, optarg);
81 break;
82 case GETOPT_TIPS:
83@@ -93,7 +79,7 @@ index 9c87e34ed..13904f6e1 100644
84 error_opt_arg(c, lopt, optarg);
85 break;
86 case GETOPT_ARGV0:
87-@@ -2729,10 +2729,10 @@ init(int argc, char *argv[])
88+@@ -2772,10 +2772,10 @@ init(int argc, char *argv[])
89 qualify_kvm(optarg);
90 break;
91 case GETOPT_QUAL_QUIET:
92@@ -131,7 +117,7 @@ index bec85021b..5d49f950a 100644
93 strauss[MIN(3 + i, strauss_lines - 1)]);
94 }
95 diff --git a/src/util.c b/src/util.c
96-index efd390577..5e87559dc 100644
97+index ada3ba76a..a88dd008d 100644
98 --- a/src/util.c
99 +++ b/src/util.c
100 @@ -640,7 +640,7 @@ printsocket(struct tcb *tcp, int fd, const char *path)
1@@ -1,4 +1,4 @@
2-From ab57c5ea74c7a1ced31c07bb62c43fc766811e01 Mon Sep 17 00:00:00 2001
3+From 8c03823959bcb53e16a6555fcc880fe4560cb79f Mon Sep 17 00:00:00 2001
4 From: Michael Forney <mforney@mforney.org>
5 Date: Sun, 7 Jul 2019 21:58:46 -0700
6 Subject: [PATCH] Avoid unnecessary VLAs
7@@ -25,10 +25,10 @@ index 2494a44d6..704e3a8d5 100644
8 const size_t c = columns[i];
9
10 diff --git a/src/nlattr.c b/src/nlattr.c
11-index 1fb394d7c..6f2d54979 100644
12+index 9944afb8c..1252510a5 100644
13 --- a/src/nlattr.c
14 +++ b/src/nlattr.c
15-@@ -357,7 +357,7 @@ decode_nla_hwaddr(struct tcb *const tcp,
16+@@ -310,7 +310,7 @@ DECL_NLA(hwaddr)
17 if (len > MAX_ADDR_LEN)
18 return false;
19
20@@ -60,7 +60,7 @@ index d3a3b9283..e0079456f 100644
21 if (!inet_ntop(diag_msg->idiag_family, diag_msg->id.idiag_dst,
22 dst_buf, text_size))
23 diff --git a/src/syscall.c b/src/syscall.c
24-index 6d9e843fe..44d5e9e0b 100644
25+index 1f4d86dc1..84d448253 100644
26 --- a/src/syscall.c
27 +++ b/src/syscall.c
28 @@ -287,7 +287,7 @@ decode_socket_subcall(struct tcb *tcp)
29@@ -73,7 +73,7 @@ index 6d9e843fe..44d5e9e0b 100644
30 if (umoven(tcp, tcp->u_arg[1], nargs * current_wordsize, buf) < 0)
31 return;
32 diff --git a/src/util.c b/src/util.c
33-index efd390577..c9e0c6212 100644
34+index a88dd008d..eb5896eec 100644
35 --- a/src/util.c
36 +++ b/src/util.c
37 @@ -569,8 +569,7 @@ enum sock_proto
1@@ -1,4 +1,4 @@
2-From b7f05e44f267fde2bc317a54430ec106d5af2808 Mon Sep 17 00:00:00 2001
3+From 0663a21f8a5d9d9ffd8e79bfb0c326365d98e384 Mon Sep 17 00:00:00 2001
4 From: Michael Forney <mforney@mforney.org>
5 Date: Thu, 30 Jan 2020 22:32:50 -0800
6 Subject: [PATCH] Avoid index ranges
7@@ -33,10 +33,10 @@ index cad1013a8..73d7bbe28 100644
8
9 return sprint_mac_addr(hwaddr, MIN(size, sz));
10 diff --git a/src/util.c b/src/util.c
11-index c9e0c6212..875c3ae9c 100644
12+index eb5896eec..e92a25264 100644
13 --- a/src/util.c
14 +++ b/src/util.c
15-@@ -1519,16 +1519,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr,
16+@@ -1660,16 +1660,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr,
17 ? 1 + ilog2_klong(len - 1) / HEX_BIT : DUMPSTR_OFFS_MIN_CHARS;
18 kernel_ulong_t i = 0;
19 const unsigned char *src;
+1,
-1
1@@ -1 +1 @@
2-ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149 strace-6.8.tar.xz
3+c47da93be45b6055f4dc741d7f20efaf50ca10160a5b100c109b294fd9c0bdfe strace-6.12.tar.xz
+1,
-1
1@@ -1 +1 @@
2-url = "https://github.com/strace/strace/releases/download/v6.8/strace-6.8.tar.xz"
3+url = "https://github.com/strace/strace/releases/download/v6.12/strace-6.12.tar.xz"
+1,
-1
1@@ -1 +1 @@
2-6.8 r1
3+6.12 r0