commit: 55ca04739de3d70662a446196ccca54411b5170d
parent d941bd302cfef3edf5ad92a89c1ea130b5f49c6b
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 9 Dec 2019 00:40:13 -0800
strace: Update to 5.4
Diffstat:
6 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/pkg/strace/.gitignore b/pkg/strace/.gitignore
@@ -1,3 +1,3 @@
/src
-/strace-5.3.tar.xz
+/strace-5.4.tar.xz
/tools.ninja
diff --git a/pkg/strace/config.h b/pkg/strace/config.h
@@ -178,12 +178,14 @@
#define HAVE_ELF_H 1
#define HAVE_FALLOCATE 1
#define HAVE_FANOTIFY_MARK 1
+/* #undef HAVE_FCNTL64 */
#define HAVE_FOPEN64 1
#define HAVE_FORK 1
#define HAVE_FPUTS_UNLOCKED 1
#define HAVE_FSTATAT 1
#define HAVE_FTRUNCATE 1
#define HAVE_FUTIMENS 1
+#define HAVE_GCOV_H 1
/* #undef HAVE_GNU_STUBS */
/* #undef HAVE_GNU_STUBS_32_H */
/* #undef HAVE_GNU_STUBS_X32_H */
@@ -345,6 +347,7 @@
#define HAVE_STRUCT_CRYPTO_REPORT_CIPHER 1
#define HAVE_STRUCT_CRYPTO_REPORT_HASH 1
#define HAVE_STRUCT_CRYPTO_REPORT_RNG 1
+#define HAVE_STRUCT_CRYPTO_USER_ALG 1
#define HAVE_STRUCT_DCBMSG 1
#define HAVE_STRUCT_FIB_RULE_PORT_RANGE 1
#define HAVE_STRUCT_FIB_RULE_UID_RANGE 1
@@ -361,6 +364,8 @@
#define HAVE_STRUCT_IFLA_CACHEINFO 1
#define HAVE_STRUCT_IFLA_PORT_VSI 1
#define HAVE_STRUCT_INPUT_ABSINFO_RESOLUTION 1
+#define HAVE_STRUCT_INPUT_KEYMAP_ENTRY 1
+#define HAVE_STRUCT_INPUT_MASK 1
#define HAVE_STRUCT_IOCB_AIO_FLAGS 1
#define HAVE_STRUCT_IOCB_AIO_RW_FLAGS 1
#define HAVE_STRUCT_KCMP_EPOLL_SLOT 1
@@ -423,11 +428,15 @@
#define HAVE_STRUCT_STATX 1
#define HAVE_STRUCT_STAT_ST_MTIME_NSEC 1
#define HAVE_STRUCT_TC_SIZESPEC 1
-#define HAVE_STRUCT_TIMEX_TAI 1
#define HAVE_STRUCT_UBI_ATTACH_REQ_MAX_BEB_PER1024 1
#define HAVE_STRUCT_USER_DESC 1
#define HAVE_STRUCT_USER_DESC_LM 1
#define HAVE_STRUCT_UTSNAME_DOMAINNAME 1
+#define HAVE_STRUCT_V4L2_CAPABILITY_DEVICE_CAPS 1
+#define HAVE_STRUCT_V4L2_EXT_CONTROL_STRING 1
+#define HAVE_STRUCT_V4L2_FORMAT_FMT_PIX_MP 1
+#define HAVE_STRUCT_V4L2_FORMAT_FMT_SDR 1
+#define HAVE_STRUCT_V4L2_FORMAT_FMT_SLICED 1
#define HAVE_STRUCT_V4L2_SDR_FORMAT_BUFFERSIZE 1
#define HAVE_STRUCT_V4L2_WINDOW_GLOBAL_ALPHA 1
/* #undef HAVE_STRUCT___AIO_SIGSET */
@@ -554,7 +563,7 @@
/* #undef M32_SIZEOF_KERNEL_LONG_T */
/* #undef M32_SIZEOF_LONG */
/* #undef M68K */
-#define MANPAGE_DATE "2019-09-25"
+#define MANPAGE_DATE "2019-10-07"
/* #undef METAG */
/* #undef MICROBLAZE */
/* #undef MIPS */
@@ -565,10 +574,10 @@
#define PACKAGE "strace"
#define PACKAGE_BUGREPORT "strace-devel@lists.strace.io"
#define PACKAGE_NAME "strace"
-#define PACKAGE_STRING "strace 5.3"
+#define PACKAGE_STRING "strace 5.4"
#define PACKAGE_TARNAME "strace"
#define PACKAGE_URL "https://strace.io"
-#define PACKAGE_VERSION "5.3"
+#define PACKAGE_VERSION "5.4"
/* #undef POWERPC */
/* #undef POWERPC64 */
/* #undef POWERPC64LE */
@@ -605,7 +614,7 @@
# define __EXTENSIONS__ 1
#endif
/* #undef USE_UNWINDER */
-#define VERSION "5.3"
+#define VERSION "5.4"
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
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 4d573929d68366371d23f0ed191cb6ad6207051b Mon Sep 17 00:00:00 2001
+From 9683c1affbd5b5a59e995bbb130cbc7b63699231 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,10 +20,10 @@ Subject: [PATCH] Avoid empty initializer lists
13 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/bpf.c b/bpf.c
-index e335bb74..8e3b2f3b 100644
+index 9b6fb488..92c38a16 100644
--- a/bpf.c
+++ b/bpf.c
-@@ -42,7 +42,7 @@ bpf_cmd_decoder(struct tcb *const tcp, \
+@@ -43,7 +43,7 @@ bpf_cmd_decoder(struct tcb *const tcp, \
#define BEGIN_BPF_CMD_DECODER(bpf_cmd) \
static DECL_BPF_CMD_DECODER(decode_ ## bpf_cmd) \
{ \
@@ -32,7 +32,7 @@ index e335bb74..8e3b2f3b 100644
const size_t attr_size = bpf_cmd ## _struct_size; \
const unsigned int len = MIN(size, attr_size); \
memcpy(&attr, data, len); \
-@@ -149,7 +149,7 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len)
+@@ -150,7 +150,7 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len)
if (abbrev(tcp)) {
printaddr(addr);
} else {
@@ -81,10 +81,10 @@ index 3cb54bb3..bc03dae8 100644
return;
tprints(sprintsigmask_n("", mask, len));
diff --git a/strace.c b/strace.c
-index b52a3db3..2dd50005 100644
+index 86ca3c35..810f5f4e 100644
--- a/strace.c
+++ b/strace.c
-@@ -2664,7 +2664,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig)
+@@ -2707,7 +2707,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig)
syscall_entering_finish(tcp, res);
return res;
} else {
@@ -147,10 +147,10 @@ index d7ed269a..eed3e996 100644
const struct itimerval itv = {
.it_interval.tv_usec = 222222,
diff --git a/tests/nanosleep.c b/tests/nanosleep.c
-index c7ebf496..26c2bca7 100644
+index d55b395c..e41b6b1f 100644
--- a/tests/nanosleep.c
+++ b/tests/nanosleep.c
-@@ -34,7 +34,7 @@ main(void)
+@@ -53,7 +53,7 @@ main(void)
.ts = { .tv_sec = 0xc0de2, .tv_nsec = 0xc0de3 },
.pad = { 0xdeadbeef, 0xbadc0ded }
};
@@ -160,10 +160,10 @@ index c7ebf496..26c2bca7 100644
const struct itimerval itv = { .it_value.tv_usec = 111111 };
diff --git a/tests/restart_syscall.c b/tests/restart_syscall.c
-index 9a8f7e3a..10ea7d6f 100644
+index e8f27f1d..5a6922bb 100644
--- a/tests/restart_syscall.c
+++ b/tests/restart_syscall.c
-@@ -24,7 +24,7 @@ main(void)
+@@ -27,7 +27,7 @@ main(void)
*/
error_msg_and_skip("x32 is broken");
#else
@@ -171,7 +171,7 @@ index 9a8f7e3a..10ea7d6f 100644
+ const sigset_t set = {0};
const struct sigaction act = { .sa_handler = SIG_IGN };
const struct itimerval itv = { .it_value.tv_usec = 111111 };
- struct timespec req = { .tv_nsec = 222222222 }, rem;
+ struct timespec req = { .tv_nsec = 222222222 };
diff --git a/tests/setrlimit.c b/tests/setrlimit.c
index 886cf65a..89ed1077 100644
--- a/tests/setrlimit.c
@@ -225,5 +225,5 @@ index 8c87b7c4..c37736b7 100644
assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
--
-2.23.0
+2.24.0
diff --git a/pkg/strace/sha256 b/pkg/strace/sha256
@@ -1 +1 @@
-6c131198749656401fe3efd6b4b16a07ea867e8f530867ceae8930bbc937a047 strace-5.3.tar.xz
+f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741 strace-5.4.tar.xz
diff --git a/pkg/strace/url b/pkg/strace/url
@@ -1 +1 @@
-url = "https://github.com/strace/strace/releases/download/v5.3/strace-5.3.tar.xz"
+url = "https://github.com/strace/strace/releases/download/v5.4/strace-5.4.tar.xz"
diff --git a/pkg/strace/ver b/pkg/strace/ver
@@ -1 +1 @@
-5.3 r0
+5.4 r0
