commit: 1922b41331483d73127906adbcadcd5dbd1ef1ad
parent 48c1df9cebdd9646e3da1feacefae50896cec71f
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 14 Dec 2020 14:56:31 -0800
strace: Update to 5.10
Diffstat:
7 files changed, 60 insertions(+), 101 deletions(-)
diff --git a/pkg/strace/.gitignore b/pkg/strace/.gitignore
@@ -1,3 +1,3 @@
/src
-/strace-5.9.tar.xz
+/strace-5.10.tar.xz
/tools.ninja
diff --git a/pkg/strace/config.h b/pkg/strace/config.h
@@ -18,11 +18,12 @@
/* #undef HAVE_ASM_SYSMIPS_H */
/* #undef HAVE_BE64TOH */
/* #undef HAVE_BLUETOOTH_BLUETOOTH_H */
+/* #undef HAVE_BROKEN_CC */
#define HAVE_DECL_BTRFS_COMPRESS_LZO 0
#define HAVE_DECL_BTRFS_COMPRESS_NONE 0
#define HAVE_DECL_BTRFS_COMPRESS_ZLIB 0
#define HAVE_DECL_BTRFS_COMPRESS_ZSTD 0
-#define HAVE_DECL_CLOSE_RANGE_UNSHARE 0
+#define HAVE_DECL_CLOSE_RANGE_UNSHARE 1
#define HAVE_DECL_CTL_ABI 1
#define HAVE_DECL_CTL_ARLAN 1
#define HAVE_DECL_CTL_BUS 1
@@ -83,7 +84,7 @@
#define HAVE_DECL_IFLA_PROP_LIST 1
#define HAVE_DECL_IFLA_PROTINFO 1
#define HAVE_DECL_IFLA_PROTO_DOWN 1
-#define HAVE_DECL_IFLA_PROTO_DOWN_REASON 0
+#define HAVE_DECL_IFLA_PROTO_DOWN_REASON 1
#define HAVE_DECL_IFLA_QDISC 1
#define HAVE_DECL_IFLA_STATS 1
#define HAVE_DECL_IFLA_STATS64 1
@@ -103,6 +104,53 @@
#define HAVE_DECL_IFLA_XDP_PROG_ID 1
#define HAVE_DECL_IFLA_XDP_SKB_PROG_ID 1
#define HAVE_DECL_IFLA_XDP_UNSPEC 1
+#define HAVE_DECL_IORING_OP_ACCEPT 1
+#define HAVE_DECL_IORING_OP_ASYNC_CANCEL 1
+#define HAVE_DECL_IORING_OP_CLOSE 1
+#define HAVE_DECL_IORING_OP_CONNECT 1
+#define HAVE_DECL_IORING_OP_EPOLL_CTL 1
+#define HAVE_DECL_IORING_OP_FADVISE 1
+#define HAVE_DECL_IORING_OP_FALLOCATE 1
+#define HAVE_DECL_IORING_OP_FILES_UPDATE 1
+#define HAVE_DECL_IORING_OP_FSYNC 1
+#define HAVE_DECL_IORING_OP_LINK_TIMEOUT 1
+#define HAVE_DECL_IORING_OP_MADVISE 1
+#define HAVE_DECL_IORING_OP_NOP 1
+#define HAVE_DECL_IORING_OP_OPENAT 1
+#define HAVE_DECL_IORING_OP_OPENAT2 1
+#define HAVE_DECL_IORING_OP_POLL_ADD 1
+#define HAVE_DECL_IORING_OP_POLL_REMOVE 1
+#define HAVE_DECL_IORING_OP_PROVIDE_BUFFERS 1
+#define HAVE_DECL_IORING_OP_READ 1
+#define HAVE_DECL_IORING_OP_READV 1
+#define HAVE_DECL_IORING_OP_READ_FIXED 1
+#define HAVE_DECL_IORING_OP_RECV 1
+#define HAVE_DECL_IORING_OP_RECVMSG 1
+#define HAVE_DECL_IORING_OP_REMOVE_BUFFERS 1
+#define HAVE_DECL_IORING_OP_SEND 1
+#define HAVE_DECL_IORING_OP_SENDMSG 1
+#define HAVE_DECL_IORING_OP_SPLICE 1
+#define HAVE_DECL_IORING_OP_STATX 1
+#define HAVE_DECL_IORING_OP_SYNC_FILE_RANGE 1
+#define HAVE_DECL_IORING_OP_TEE 1
+#define HAVE_DECL_IORING_OP_TIMEOUT 1
+#define HAVE_DECL_IORING_OP_TIMEOUT_REMOVE 1
+#define HAVE_DECL_IORING_OP_WRITE 1
+#define HAVE_DECL_IORING_OP_WRITEV 1
+#define HAVE_DECL_IORING_OP_WRITE_FIXED 1
+#define HAVE_DECL_IORING_REGISTER_BUFFERS 1
+#define HAVE_DECL_IORING_REGISTER_ENABLE_RINGS 1
+#define HAVE_DECL_IORING_REGISTER_EVENTFD 1
+#define HAVE_DECL_IORING_REGISTER_EVENTFD_ASYNC 1
+#define HAVE_DECL_IORING_REGISTER_FILES 1
+#define HAVE_DECL_IORING_REGISTER_FILES_UPDATE 1
+#define HAVE_DECL_IORING_REGISTER_PERSONALITY 1
+#define HAVE_DECL_IORING_REGISTER_PROBE 1
+#define HAVE_DECL_IORING_REGISTER_RESTRICTIONS 1
+#define HAVE_DECL_IORING_UNREGISTER_BUFFERS 1
+#define HAVE_DECL_IORING_UNREGISTER_EVENTFD 1
+#define HAVE_DECL_IORING_UNREGISTER_FILES 1
+#define HAVE_DECL_IORING_UNREGISTER_PERSONALITY 1
#define HAVE_DECL_KERN_ACCT 1
#define HAVE_DECL_KERN_ACPI_VIDEO_FLAGS 1
#define HAVE_DECL_KERN_BOOTLOADER_TYPE 1
@@ -517,7 +565,7 @@
#define HAVE_LINUX_BPF_H 1
#define HAVE_LINUX_BSG_H 1
#define HAVE_LINUX_BTRFS_H 1
-/* #undef HAVE_LINUX_CLOSE_RANGE_H */
+#define HAVE_LINUX_CLOSE_RANGE_H 1
#define HAVE_LINUX_CRYPTOUSER_H 1
#define HAVE_LINUX_DM_IOCTL_H 1
#define HAVE_LINUX_DQBLK_XFS_H 1
@@ -1000,7 +1048,7 @@
/* #undef M32_SIZEOF_LONG */
/* #undef M32_SIZEOF_STRUCT_MSQID64_DS */
/* #undef M68K */
-#define MANPAGE_DATE "2020-09-23"
+#define MANPAGE_DATE "2020-11-29"
/* #undef METAG */
/* #undef MICROBLAZE */
/* #undef MIPS */
@@ -1012,10 +1060,10 @@
#define PACKAGE "strace"
#define PACKAGE_BUGREPORT "strace-devel@lists.strace.io"
#define PACKAGE_NAME "strace"
-#define PACKAGE_STRING "strace 5.9"
+#define PACKAGE_STRING "strace 5.10"
#define PACKAGE_TARNAME "strace"
#define PACKAGE_URL "https://strace.io"
-#define PACKAGE_VERSION "5.9"
+#define PACKAGE_VERSION "5.10"
/* #undef POWERPC */
/* #undef POWERPC64 */
/* #undef POWERPC64LE */
@@ -1053,7 +1101,7 @@
# define __EXTENSIONS__ 1
#endif
/* #undef USE_UNWINDER */
-#define VERSION "5.9"
+#define VERSION "5.10"
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
diff --git a/pkg/strace/mpers.txt b/pkg/strace/mpers.txt
@@ -14,6 +14,7 @@ fetch_struct_statfs.c
fetch_struct_xfs_quotastat.c
hdio.c
ipc_msgctl.c
+ipc_semctl.c
ipc_shmctl.c
loop.c
mtd.c
diff --git a/pkg/strace/patch/1002-xlat-remove-IPPROTO_MAX.patch b/pkg/strace/patch/1002-xlat-remove-IPPROTO_MAX.patch
@@ -1,90 +0,0 @@
-From 9f4d1aa7bcac503ec834e1a608671ef1615db3e8 Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Sat, 28 Nov 2020 08:00:00 +0000
-Subject: [PATCH] xlat: remove IPPROTO_MAX
-
-* xlat/inet_protocols.in (IPPROTO_MAX): Remove.
-
-Reported-by: Khem Raj <raj.khem@gmail.com>
-Suggested-by: Eugene Syromiatnikov <esyr@redhat.com>
-Resolves: https://github.com/strace/strace/issues/164
----
- xlat/inet_protocols.h | 22 ++--------------------
- xlat/inet_protocols.in | 1 -
- 2 files changed, 2 insertions(+), 21 deletions(-)
-
-diff --git a/xlat/inet_protocols.h b/xlat/inet_protocols.h
-index ea152ca..dd6cc8a 100644
---- a/xlat/inet_protocols.h
-+++ b/xlat/inet_protocols.h
-@@ -234,13 +234,6 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define IPPROTO_RAW 255
- #endif
--#if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX)
--DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((IPPROTO_MAX) == (256), "IPPROTO_MAX != 256");
--DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
--#else
--# define IPPROTO_MAX 256
--#endif
- #if defined(IPPROTO_MPTCP) || (defined(HAVE_DECL_IPPROTO_MPTCP) && HAVE_DECL_IPPROTO_MPTCP)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
- static_assert((IPPROTO_MPTCP) == (262), "IPPROTO_MPTCP != 262");
-@@ -353,12 +346,9 @@ static const struct xlat_data inet_protocols_xdata[] = {
- XLAT(IPPROTO_RAW),
- #define XLAT_VAL_32 ((unsigned) (IPPROTO_RAW))
- #define XLAT_STR_32 STRINGIFY(IPPROTO_RAW)
-- XLAT(IPPROTO_MAX),
-- #define XLAT_VAL_33 ((unsigned) (IPPROTO_MAX))
-- #define XLAT_STR_33 STRINGIFY(IPPROTO_MAX)
- XLAT(IPPROTO_MPTCP),
-- #define XLAT_VAL_34 ((unsigned) (IPPROTO_MPTCP))
-- #define XLAT_STR_34 STRINGIFY(IPPROTO_MPTCP)
-+ #define XLAT_VAL_33 ((unsigned) (IPPROTO_MPTCP))
-+ #define XLAT_STR_33 STRINGIFY(IPPROTO_MPTCP)
- };
- const struct xlat inet_protocols[1] = { {
- .data = inet_protocols_xdata,
-@@ -466,9 +456,6 @@ const struct xlat inet_protocols[1] = { {
- # endif
- # ifdef XLAT_VAL_33
- | XLAT_VAL_33
--# endif
--# ifdef XLAT_VAL_34
-- | XLAT_VAL_34
- # endif
- ,
- .flags_strsz = 0
-@@ -573,9 +560,6 @@ const struct xlat inet_protocols[1] = { {
- # endif
- # ifdef XLAT_STR_33
- + sizeof(XLAT_STR_33)
--# endif
--# ifdef XLAT_STR_34
-- + sizeof(XLAT_STR_34)
- # endif
- ,
- } };
-@@ -648,8 +632,6 @@ const struct xlat inet_protocols[1] = { {
- # undef XLAT_VAL_32
- # undef XLAT_STR_33
- # undef XLAT_VAL_33
--# undef XLAT_STR_34
--# undef XLAT_VAL_34
- # endif /* !IN_MPERS */
-
- #endif /* !XLAT_MACROS_ONLY */
-diff --git a/xlat/inet_protocols.in b/xlat/inet_protocols.in
-index c37508f..89aa56a 100644
---- a/xlat/inet_protocols.in
-+++ b/xlat/inet_protocols.in
-@@ -32,5 +32,4 @@ IPPROTO_UDPLITE 136
- IPPROTO_MPLS 137
- IPPROTO_ETHERNET 143
- IPPROTO_RAW 255
--IPPROTO_MAX 256
- IPPROTO_MPTCP 262
---
-2.29.2
-
diff --git a/pkg/strace/sha256 b/pkg/strace/sha256
@@ -1 +1 @@
-39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9 strace-5.9.tar.xz
+fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c strace-5.10.tar.xz
diff --git a/pkg/strace/url b/pkg/strace/url
@@ -1 +1 @@
-url = "https://github.com/strace/strace/releases/download/v5.9/strace-5.9.tar.xz"
+url = "https://github.com/strace/strace/releases/download/v5.10/strace-5.10.tar.xz"
diff --git a/pkg/strace/ver b/pkg/strace/ver
@@ -1 +1 @@
-5.9 r1
+5.10 r0
