commit 0bae160
hovercats
·
2025-02-02 21:25:51 +0000 UTC
parent 2ba44d5
strace: sync with upstream
3 files changed,
+7,
-8
+4,
-4
1@@ -222,7 +222,7 @@
2 #define HAVE_STRUCT_IOCB_AIO_RW_FLAGS 1
3 #define HAVE_STRUCT_KBDIACRSUC 1
4 #define HAVE_STRUCT_KBDIACRUC 1
5-/* #undef HAVE_STRUCT_KVM_CPUID2 */
6+#define HAVE_STRUCT_KVM_CPUID2 1
7 #define HAVE_STRUCT_KVM_REGS 1
8 #define HAVE_STRUCT_KVM_SREGS 1
9 #define HAVE_STRUCT_KVM_USERSPACE_MEMORY_REGION 1
10@@ -258,13 +258,13 @@
11 #define HAVE_STRUCT_TERMIOS2 1
12 /* #undef HAVE_STRUCT_TERMIOS_C_ISPEED */
13 /* #undef HAVE_STRUCT_TERMIOS_C_OSPEED */
14-/* #undef HAVE_STRUCT_USER_DESC */
15-/* #undef HAVE_STRUCT_USER_DESC_LM */
16+#define HAVE_STRUCT_USER_DESC 1
17+#define HAVE_STRUCT_USER_DESC_LM 1
18 #define HAVE_STRUCT_UTSNAME_DOMAINNAME 1
19 /* #undef HAVE_STRUCT___AIO_SIGSET */
20 #define HAVE_STRUCT___KERNEL_SOCK_TIMEVAL 1
21 #define HAVE_STRUCT___KERNEL_TIMESPEC 1
22-/* #undef HAVE_STRUCT___OLD_KERNEL_STAT */
23+#define HAVE_STRUCT___OLD_KERNEL_STAT 1
24 #define HAVE_STRUCT___PTRACE_SYSCALL_INFO 1
25 #define HAVE_SYNC_FILE_RANGE 1
26 #define HAVE_SYS_EVENTFD_H 1
+2,
-3
1@@ -92,7 +92,6 @@ 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@@ -391,8 +390,8 @@ file('bin/strace', '755', '$outdir/strace')
10
11 build('sed', '$outdir/strace.1', '$srcdir/doc/strace.1.in', {
12 expr={
13- [[-e 's,@STRACE_MANPAGE_DATE@,2024-03-13,']],
14- [[-e 's,@VERSION@,6.8,']],
15+ [[-e 's,@STRACE_MANPAGE_DATE@,2024-06-30,']],
16+ [[-e 's,@VERSION@,6.12,']],
17 [[-e 's,@ENABLE_STACKTRACE_TRUE@,#,']],
18 [[-e 's,@ENABLE_STACKTRACE_FALSE@,,']],
19 [[-e 's,@ENABLE_SECONTEXT_TRUE@,#,']],
+1,
-1
1@@ -1 +1 @@
2-6.12 r0
3+6.12 r1