Skip to content

Commit 28e1aa4

Browse files
rnpnrrnpnr
committed
strace: bump to 6.12
1 parent f24f509 commit 28e1aa4

9 files changed

Lines changed: 105 additions & 57 deletions

‎pkg/strace/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/src
2-
/strace-6.8.tar.xz
2+
/strace-6.12.tar.xz
33
/tools.ninja

‎pkg/strace/config.h‎

Lines changed: 74 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define ASM_SIGRTMIN 32
88
/* #undef AVR32 */
99
/* #undef BFIN */
10-
#define COPYRIGHT_YEAR "2023"
10+
#define COPYRIGHT_YEAR "2024"
1111
/* #undef CSKY */
1212
#define ENABLE_ARM_OABI 0
1313
/* #undef ENABLE_SECONTEXT */
@@ -91,7 +91,6 @@
9191
#define HAVE_FTRUNCATE 1
9292
#define HAVE_FUTIMENS 1
9393
#define HAVE_GCOV_H 1
94-
/* #undef HAVE_GNU_STUBS */
9594
/* #undef HAVE_GNU_STUBS_32_H */
9695
/* #undef HAVE_GNU_STUBS_X32_H */
9796
#define HAVE_ICONV_H 1
@@ -120,8 +119,8 @@
120119
/* #undef HAVE_M32_STRUCT_STAT64 */
121120
/* #undef HAVE_M32_STRUCT_STAT64_ST_MTIME_NSEC */
122121
/* #undef HAVE_M32_STRUCT_STAT_ST_MTIME_NSEC */
123-
#define HAVE_MEMORY_H 1
124122
#define HAVE_MEMPCPY 1
123+
/* #undef HAVE_MINIX_CONFIG_H */
125124
#define HAVE_MQUEUE_H 1
126125
/* #undef HAVE_MX32_MPERS */
127126
/* #undef HAVE_MX32_SELINUX_RUNTIME */
@@ -161,6 +160,7 @@
161160
#define HAVE_SIG_ATOMIC_T 1
162161
#define HAVE_STATIC_ASSERT 1
163162
#define HAVE_STDINT_H 1
163+
#define HAVE_STDIO_H 1
164164
#define HAVE_STDLIB_H 1
165165
#define HAVE_STPCPY 1
166166
#define HAVE_STRERROR 1
@@ -222,7 +222,7 @@
222222
#define HAVE_STRUCT_IOCB_AIO_RW_FLAGS 1
223223
#define HAVE_STRUCT_KBDIACRSUC 1
224224
#define HAVE_STRUCT_KBDIACRUC 1
225-
#define HAVE_STRUCT_KVM_CPUID2 1
225+
/* #undef HAVE_STRUCT_KVM_CPUID2 */
226226
#define HAVE_STRUCT_KVM_REGS 1
227227
#define HAVE_STRUCT_KVM_SREGS 1
228228
#define HAVE_STRUCT_KVM_USERSPACE_MEMORY_REGION 1
@@ -233,6 +233,9 @@
233233
#define HAVE_STRUCT_SIGCONTEXT 1
234234
#define HAVE_STRUCT_SOCKADDR_ALG_NEW 1
235235
/* #undef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL */
236+
/* #undef HAVE_STRUCT_SOCKADDR_IPX */
237+
/* #undef HAVE_STRUCT_SOCKADDR_IPX_IN_LINUX_IPX_H */
238+
/* #undef HAVE_STRUCT_SOCKADDR_IPX_IN_NETIPX_IPX_H */
236239
/* #undef HAVE_STRUCT_SOCKADDR_L2_L2_BDADDR_TYPE */
237240
#define HAVE_STRUCT_SOCKADDR_STORAGE 1
238241
#define HAVE_STRUCT_SOCKADDR_VM 1
@@ -255,13 +258,13 @@
255258
#define HAVE_STRUCT_TERMIOS2 1
256259
/* #undef HAVE_STRUCT_TERMIOS_C_ISPEED */
257260
/* #undef HAVE_STRUCT_TERMIOS_C_OSPEED */
258-
#define HAVE_STRUCT_USER_DESC 1
259-
#define HAVE_STRUCT_USER_DESC_LM 1
261+
/* #undef HAVE_STRUCT_USER_DESC */
262+
/* #undef HAVE_STRUCT_USER_DESC_LM */
260263
#define HAVE_STRUCT_UTSNAME_DOMAINNAME 1
261264
/* #undef HAVE_STRUCT___AIO_SIGSET */
262265
#define HAVE_STRUCT___KERNEL_SOCK_TIMEVAL 1
263266
#define HAVE_STRUCT___KERNEL_TIMESPEC 1
264-
#define HAVE_STRUCT___OLD_KERNEL_STAT 1
267+
/* #undef HAVE_STRUCT___OLD_KERNEL_STAT */
265268
#define HAVE_STRUCT___PTRACE_SYSCALL_INFO 1
266269
#define HAVE_SYNC_FILE_RANGE 1
267270
#define HAVE_SYS_EVENTFD_H 1
@@ -298,6 +301,7 @@
298301
#define HAVE_UNION_BPF_ATTR_BTF_VALUE_TYPE_ID 1
299302
#define HAVE_UNION_BPF_ATTR_BTF_VMLINUX_VALUE_TYPE_ID 1
300303
/* #undef HAVE_UNION_BPF_ATTR_DUMMY */
304+
#define HAVE_UNION_BPF_ATTR_ENABLE_STATS_TYPE 1
301305
#define HAVE_UNION_BPF_ATTR_EXPECTED_ATTACH_TYPE 1
302306
#define HAVE_UNION_BPF_ATTR_FD_ARRAY 1
303307
#define HAVE_UNION_BPF_ATTR_FILE_FLAGS 1
@@ -311,6 +315,8 @@
311315
#define HAVE_UNION_BPF_ATTR_INNER_MAP_FD 1
312316
#define HAVE_UNION_BPF_ATTR_INSNS 1
313317
#define HAVE_UNION_BPF_ATTR_INSN_CNT 1
318+
#define HAVE_UNION_BPF_ATTR_ITER_CREATE_FLAGS 1
319+
#define HAVE_UNION_BPF_ATTR_ITER_CREATE_LINK_FD 1
314320
#define HAVE_UNION_BPF_ATTR_KERN_VERSION 1
315321
#define HAVE_UNION_BPF_ATTR_KEY 1
316322
#define HAVE_UNION_BPF_ATTR_KEY_SIZE 1
@@ -332,6 +338,7 @@
332338
/* #undef HAVE_UNION_BPF_ATTR_LINK_CREATE_SYMS */
333339
#define HAVE_UNION_BPF_ATTR_LINK_CREATE_TARGET_BTF_ID 1
334340
#define HAVE_UNION_BPF_ATTR_LINK_CREATE_TARGET_FD 1
341+
#define HAVE_UNION_BPF_ATTR_LINK_DETACH_LINK_FD 1
335342
#define HAVE_UNION_BPF_ATTR_LINK_ID 1
336343
#define HAVE_UNION_BPF_ATTR_LINK_UPDATE_FLAGS 1
337344
#define HAVE_UNION_BPF_ATTR_LINK_UPDATE_LINK_FD 1
@@ -354,6 +361,10 @@
354361
#define HAVE_UNION_BPF_ATTR_OPEN_FLAGS 1
355362
/* #undef HAVE_UNION_BPF_ATTR_PAD */
356363
#define HAVE_UNION_BPF_ATTR_PATHNAME 1
364+
#define HAVE_UNION_BPF_ATTR_PATH_FD 1
365+
#define HAVE_UNION_BPF_ATTR_PROG_BIND_MAP_FLAGS 1
366+
#define HAVE_UNION_BPF_ATTR_PROG_BIND_MAP_MAP_FD 1
367+
#define HAVE_UNION_BPF_ATTR_PROG_BIND_MAP_PROG_FD 1
357368
#define HAVE_UNION_BPF_ATTR_PROG_BTF_FD 1
358369
#define HAVE_UNION_BPF_ATTR_PROG_FLAGS 1
359370
#define HAVE_UNION_BPF_ATTR_PROG_ID 1
@@ -366,6 +377,8 @@
366377
#define HAVE_UNION_BPF_ATTR_QUERY_PROG_IDS 1
367378
#define HAVE_UNION_BPF_ATTR_QUERY_QUERY_FLAGS 1
368379
#define HAVE_UNION_BPF_ATTR_QUERY_TARGET_FD 1
380+
#define HAVE_UNION_BPF_ATTR_RAW_TRACEPOINT_COOKIE 1
381+
/* #undef HAVE_UNION_BPF_ATTR_RAW_TRACEPOINT_DUMMY */
369382
#define HAVE_UNION_BPF_ATTR_RAW_TRACEPOINT_NAME 1
370383
#define HAVE_UNION_BPF_ATTR_RAW_TRACEPOINT_PROG_FD 1
371384
#define HAVE_UNION_BPF_ATTR_REPLACE_BPF_FD 1
@@ -395,10 +408,13 @@
395408
#define HAVE_UNION_BPF_ATTR_TEST_PROG_FD 1
396409
#define HAVE_UNION_BPF_ATTR_TEST_REPEAT 1
397410
#define HAVE_UNION_BPF_ATTR_TEST_RETVAL 1
411+
#define HAVE_UNION_BPF_ATTR_TOKEN_CREATE_BPFFS_FD 1
412+
#define HAVE_UNION_BPF_ATTR_TOKEN_CREATE_FLAGS 1
398413
#define HAVE_UNION_BPF_ATTR_VALUE 1
399414
#define HAVE_UNION_BPF_ATTR_VALUE_SIZE 1
400415
#define HAVE_UNISTD_H 1
401416
/* #undef HAVE_USTAT_H */
417+
#define HAVE_WCHAR_H 1
402418
/* #undef HAVE__STATIC_ASSERT */
403419
/* probe HAVE___BUILTIN_POPCOUNT */
404420
#define HAVE___KERNEL_LONG_T 1
@@ -425,10 +441,10 @@
425441
#define PACKAGE "strace"
426442
#define PACKAGE_BUGREPORT "strace-devel@lists.strace.io"
427443
#define PACKAGE_NAME "strace"
428-
#define PACKAGE_STRING "strace 6.4"
444+
#define PACKAGE_STRING "strace 6.12"
429445
#define PACKAGE_TARNAME "strace"
430446
#define PACKAGE_URL "https://strace.io"
431-
#define PACKAGE_VERSION "6.4"
447+
#define PACKAGE_VERSION "6.12"
432448
/* #undef POWERPC */
433449
/* #undef POWERPC64 */
434450
/* #undef POWERPC64LE */
@@ -447,28 +463,73 @@
447463
/* #undef SPARC */
448464
/* #undef SPARC64 */
449465
#define STDC_HEADERS 1
450-
#define STRACE_MANPAGE_DATE "2023-06-11"
466+
#define STRACE_MANPAGE_DATE "2024-06-30"
451467
/* #undef TILE */
452468
/* #undef USE_DEMANGLE */
453469
/* #undef USE_LIBDW */
454470
/* #undef USE_LIBUNWIND */
455471
#ifndef _ALL_SOURCE
456472
# define _ALL_SOURCE 1
457473
#endif
474+
#ifndef _DARWIN_C_SOURCE
475+
# define _DARWIN_C_SOURCE 1
476+
#endif
477+
#ifndef __EXTENSIONS__
478+
# define __EXTENSIONS__ 1
479+
#endif
458480
#ifndef _GNU_SOURCE
459481
# define _GNU_SOURCE 1
460482
#endif
483+
#ifndef _HPUX_ALT_XOPEN_SOCKET_API
484+
# define _HPUX_ALT_XOPEN_SOCKET_API 1
485+
#endif
486+
#ifndef _MINIX
487+
/* # undef _MINIX */
488+
#endif
489+
#ifndef _NETBSD_SOURCE
490+
# define _NETBSD_SOURCE 1
491+
#endif
492+
#ifndef _OPENBSD_SOURCE
493+
# define _OPENBSD_SOURCE 1
494+
#endif
495+
#ifndef _POSIX_SOURCE
496+
/* # undef _POSIX_SOURCE */
497+
#endif
498+
#ifndef _POSIX_1_SOURCE
499+
/* # undef _POSIX_1_SOURCE */
500+
#endif
461501
#ifndef _POSIX_PTHREAD_SEMANTICS
462502
# define _POSIX_PTHREAD_SEMANTICS 1
463503
#endif
504+
#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
505+
# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
506+
#endif
507+
#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
508+
# define __STDC_WANT_IEC_60559_BFP_EXT__ 1
509+
#endif
510+
#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
511+
# define __STDC_WANT_IEC_60559_DFP_EXT__ 1
512+
#endif
513+
#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
514+
# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
515+
#endif
516+
#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
517+
# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
518+
#endif
519+
#ifndef __STDC_WANT_LIB_EXT2__
520+
# define __STDC_WANT_LIB_EXT2__ 1
521+
#endif
522+
#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
523+
# define __STDC_WANT_MATH_SPEC_FUNCS__ 1
524+
#endif
464525
#ifndef _TANDEM_SOURCE
465526
# define _TANDEM_SOURCE 1
466527
#endif
467-
#ifndef __EXTENSIONS__
468-
# define __EXTENSIONS__ 1
528+
#ifndef _XOPEN_SOURCE
529+
/* # undef _XOPEN_SOURCE */
469530
#endif
470531
/* #undef USE_UNWINDER */
471-
#define VERSION "6.4"
532+
#define VERSION "6.12"
472533
#if defined AC_APPLE_UNIVERSAL_BUILD
473534
# if defined __BIG_ENDIAN__
474535
# define WORDS_BIGENDIAN 1
@@ -481,9 +542,6 @@
481542
/* #undef X32 */
482543
#define X86_64 1
483544
/* #undef XTENSA */
484-
/* #undef _MINIX */
485-
/* #undef _POSIX_1_SOURCE */
486-
/* #undef _POSIX_SOURCE */
487545
/* #undef gid_t */
488546
/* #undef typeof */
489547
/* #undef uid_t */

‎pkg/strace/gen.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ local srcs = paths[[src/(
9292
bjm.c
9393
block.c
9494
bpf.c
95+
bpf_attr_check.c
9596
bpf_filter.c
9697
bpf_seccomp_filter.c
9798
bpf_sock_filter.c
@@ -115,6 +116,7 @@ local srcs = paths[[src/(
115116
dup.c
116117
dyxlat.c
117118
epoll.c
119+
epoll_ioctl.c
118120
error_prints.c
119121
evdev.c
120122
evdev_mpers.c
@@ -212,10 +214,12 @@ local srcs = paths[[src/(
212214
net.c
213215
netlink.c
214216
netlink_crypto.c
217+
netlink_generic.c
215218
netlink_inet_diag.c
216219
netlink_kobject_uevent.c
217220
netlink_netfilter.c
218221
netlink_netlink_diag.c
222+
netlink_nlctrl.c
219223
netlink_packet_diag.c
220224
netlink_route.c
221225
netlink_selinux.c

‎pkg/strace/patch/0005-Don-t-omit-second-operand-to-operator.patch‎

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
1-
From 586b8d1808d18149a872f0ee1dc8903b9f9e8750 Mon Sep 17 00:00:00 2001
1+
From e245f2d71d44d2a858517321a01d3ca71147042f Mon Sep 17 00:00:00 2001
22
From: Michael Forney <mforney@mforney.org>
33
Date: Sun, 7 Jul 2019 21:53:16 -0700
44
Subject: [PATCH] Don't omit second operand to '?' operator
55

66
---
7-
src/kd_ioctl.c | 2 +-
8-
src/open.c | 5 +++--
9-
src/prctl.c | 8 ++++----
10-
src/strace.c | 8 ++++----
11-
src/strauss.c | 4 +++-
12-
src/util.c | 2 +-
13-
6 files changed, 16 insertions(+), 13 deletions(-)
7+
src/open.c | 5 +++--
8+
src/prctl.c | 8 ++++----
9+
src/strace.c | 8 ++++----
10+
src/strauss.c | 4 +++-
11+
src/util.c | 2 +-
12+
5 files changed, 15 insertions(+), 12 deletions(-)
1413

15-
diff --git a/src/kd_ioctl.c b/src/kd_ioctl.c
16-
index ada23d536..fddbd38fb 100644
17-
--- a/src/kd_ioctl.c
18-
+++ b/src/kd_ioctl.c
19-
@@ -457,7 +457,7 @@ kd_kbd_str_entry(struct tcb *const tcp, const kernel_ulong_t arg,
20-
21-
if (print_quoted_string((char *) val.kb_string,
22-
MIN(max_strlen,
23-
- (unsigned int) ret ?: sizeof(val.kb_string)),
24-
+ ret ? (unsigned int) ret : sizeof(val.kb_string)),
25-
QUOTE_OMIT_TRAILING_0))
26-
tprint_more_data_follows();
27-
2814
diff --git a/src/open.c b/src/open.c
2915
index 6356c5831..df59ea999 100644
3016
--- a/src/open.c
@@ -42,10 +28,10 @@ index 6356c5831..df59ea999 100644
4228

4329
const char *
4430
diff --git a/src/prctl.c b/src/prctl.c
45-
index f6b4dd741..951133a83 100644
31+
index dbabb3a18..712715b98 100644
4632
--- a/src/prctl.c
4733
+++ b/src/prctl.c
48-
@@ -92,10 +92,10 @@ sprint_sve_val(kernel_ulong_t arg, bool aux)
34+
@@ -98,10 +98,10 @@ sprint_sve_val(kernel_ulong_t arg, bool aux)
4935
if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
5036
{
5137
xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
@@ -58,7 +44,7 @@ index f6b4dd741..951133a83 100644
5844
}
5945

6046
return out;
61-
@@ -128,10 +128,10 @@ sprint_sme_val(kernel_ulong_t arg, bool aux)
47+
@@ -134,10 +134,10 @@ sprint_sme_val(kernel_ulong_t arg, bool aux)
6248
if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
6349
{
6450
xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
@@ -72,10 +58,10 @@ index f6b4dd741..951133a83 100644
7258

7359
return out;
7460
diff --git a/src/strace.c b/src/strace.c
75-
index 9c87e34ed..13904f6e1 100644
61+
index 1a9d53bc8..9ac16c8c3 100644
7662
--- a/src/strace.c
7763
+++ b/src/strace.c
78-
@@ -2609,7 +2609,7 @@ init(int argc, char *argv[])
64+
@@ -2649,7 +2649,7 @@ init(int argc, char *argv[])
7965
break;
8066
case GETOPT_TS:
8167
tflag_long_set = true;
@@ -84,7 +70,7 @@ index 9c87e34ed..13904f6e1 100644
8470
error_opt_arg(c, lopt, optarg);
8571
break;
8672
case 'T':
87-
@@ -2683,7 +2683,7 @@ init(int argc, char *argv[])
73+
@@ -2723,7 +2723,7 @@ init(int argc, char *argv[])
8874
error_opt_arg(c, lopt, optarg);
8975
break;
9076
case GETOPT_TIPS:
@@ -93,7 +79,7 @@ index 9c87e34ed..13904f6e1 100644
9379
error_opt_arg(c, lopt, optarg);
9480
break;
9581
case GETOPT_ARGV0:
96-
@@ -2729,10 +2729,10 @@ init(int argc, char *argv[])
82+
@@ -2772,10 +2772,10 @@ init(int argc, char *argv[])
9783
qualify_kvm(optarg);
9884
break;
9985
case GETOPT_QUAL_QUIET:
@@ -131,7 +117,7 @@ index bec85021b..5d49f950a 100644
131117
strauss[MIN(3 + i, strauss_lines - 1)]);
132118
}
133119
diff --git a/src/util.c b/src/util.c
134-
index efd390577..5e87559dc 100644
120+
index ada3ba76a..a88dd008d 100644
135121
--- a/src/util.c
136122
+++ b/src/util.c
137123
@@ -640,7 +640,7 @@ printsocket(struct tcb *tcp, int fd, const char *path)

0 commit comments

Comments
 (0)