[gentoo-commits] repo/gentoo:master commit in: dev-util/strace/, dev-util/strace/files/
commit: 00ddaae3501f0afd1880ea10d29b17143fb2b858
Author: Sam James gentoo org>
AuthorDate: Mon Aug 28 20:46:51 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 28 20:48:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00ddaae3
dev-util/strace: fix build w/ linux-headers-6.5
Closes: https://bugs.gentoo.org/913170
Signed-off-by: Sam James gentoo.org>
.../files/strace-6.4-linux-headers-6.5.patch | 160 +
dev-util/strace/strace-6.4-r1.ebuild | 110 ++
2 files changed, 270 insertions(+)
diff --git a/dev-util/strace/files/strace-6.4-linux-headers-6.5.patch
b/dev-util/strace/files/strace-6.4-linux-headers-6.5.patch
new file mode 100644
index ..2814dee76258
--- /dev/null
+++ b/dev-util/strace/files/strace-6.4-linux-headers-6.5.patch
@@ -0,0 +1,160 @@
+https://bugs.gentoo.org/913170
+https://github.com/strace/strace/issues/262
+https://github.com/strace/strace/commit/a8cec18845220cc82e45014ffdcab449ad664584
+https://github.com/strace/strace/commit/e0da3633669fcb829dd8d902d15443a755bd10fb
+
+From a8cec18845220cc82e45014ffdcab449ad664584 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin"
+Date: Tue, 4 Jul 2023 08:00:00 +
+Subject: [PATCH] ptp: add max_phase_adj field and update rsv field of struct
+ ptp_clock_caps
+
+* bundled/linux/include/uapi/linux/ptp_clock.h (struct ptp_clock_caps):
+Add max_phase_adj field and update rsv field following the change
+introduced by Linux kernel commit v6.5-rc1~163^2~65^2~4.
+* src/ptp.c (ptp_ioctl): Likewise.
+* tests/ioctl_ptp.c (test_no_device): Update expected output.
+--- a/bundled/linux/include/uapi/linux/ptp_clock.h
b/bundled/linux/include/uapi/linux/ptp_clock.h
+@@ -95,7 +95,8 @@ struct ptp_clock_caps {
+ int cross_timestamping;
+ /* Whether the clock supports adjust phase */
+ int adjust_phase;
+- int rsv[12]; /* Reserved for future use. */
++ int max_phase_adj; /* Maximum phase adjustment in nanoseconds. */
++ int rsv[11]; /* Reserved for future use. */
+ };
+
+ struct ptp_extts_request {
+--- a/src/ptp.c
b/src/ptp.c
+@@ -78,7 +78,7 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code,
+ case PTP_CLOCK_GETCAPS:
+ case PTP_CLOCK_GETCAPS2: {
+ struct ptp_clock_caps caps;
+- CHECK_TYPE_SIZE(caps.rsv, sizeof(unsigned int) * 12);
++ CHECK_TYPE_SIZE(caps.rsv, sizeof(unsigned int) * 11);
+ CHECK_IOCTL_SIZE(PTP_CLOCK_GETCAPS, 80);
+ CHECK_IOCTL_SIZE(PTP_CLOCK_GETCAPS2, 80);
+
+@@ -106,6 +106,8 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code,
+ PRINT_FIELD_D(caps, cross_timestamping);
+ tprint_struct_next();
+ PRINT_FIELD_D(caps, adjust_phase);
++ tprint_struct_next();
++ PRINT_FIELD_D(caps, max_phase_adj);
+ PRINT_RSV(caps, rsv);
+ tprint_struct_end();
+ break;
+--- a/tests/ioctl_ptp.c
b/tests/ioctl_ptp.c
+@@ -151,7 +151,7 @@ test_no_device(void)
+ if (rc >= 0) {
+ printf("{max_adj=0, n_alarm=0, n_ext_ts=0, n_per_out=0"
+ ", pps=0, n_pins=0, cross_timestamping=0"
+- ", adjust_phase=0}");
++ ", adjust_phase=0, max_phase_adj=0}");
+ } else {
+ printf("%p", caps);
+ }
+@@ -166,7 +166,8 @@ test_no_device(void)
+ ", pps=-2136948508, n_pins=-2136948507"
+ ", cross_timestamping=-2136948506"
+ ", adjust_phase=-2136948505"
+- ", rsv=[0x80a0c0e8, 0x80a0c0e9, 0x80a0c0ea"
++ ", max_phase_adj=-2136948504"
++ ", rsv=[0x80a0c0e9, 0x80a0c0ea"
+ ", 0x80a0c0eb, 0x80a0c0ec, 0x80a0c0ed"
+ ", 0x80a0c0ee, 0x80a0c0ef, 0x80a0c0f0"
+ ", 0x80a0c0f1, 0x80a0c0f2, 0x80a0c0f3]}");
+
+From e0da3633669fcb829dd8d902d15443a755bd10fb Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin"
+Date: Mon, 3 Jul 2023 08:00:00 +
+Subject: [PATCH] io_uring: rename resv2 fields of io_[cs]qring_offsets to
+ user_addr
+
+* bundled/linux/include/uapi/linux/io_uring.h (struct io_sqring_offsets,
+struct io_cqring_offsets): Rename resv2 to user_addr following
+the change introduced by Linux kernel commit v6.5-rc1~235^2~32.
+* src/io_uring.c (print_io_sqring_offsets, print_io_cqring_offsets):
+Likewise.
+* tests/io_uring_setup.c (main): Update expected output.
+--- a/bundled/linux/include/uapi/linux/io_uring.h
b/bundled/linux/include/uapi/linux/io_uring.h
+@@ -406,7 +406,7 @@ struct io_sqring_offsets {
+ __u32 dropped;
+ __u32 array;
+ __u32 resv1;
+- __u64 resv2;
++ __u64 user_addr;
[gentoo-commits] repo/gentoo:master commit in: dev-util/strace/, dev-util/strace/files/
commit: 015a28c2ee717ad6385c03cffc938195cedfea5e
Author: Sam James gentoo org>
AuthorDate: Sun Apr 17 17:00:14 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 17 17:05:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=015a28c2
dev-util/strace: drop 5.12-r1, 5.14-r1, 5.16
Signed-off-by: Sam James gentoo.org>
dev-util/strace/Manifest | 3 -
.../files/strace-5.12-detect-ipx-presence.patch| 141 -
dev-util/strace/strace-5.12-r1.ebuild | 108
dev-util/strace/strace-5.14-r1.ebuild | 108
dev-util/strace/strace-5.16.ebuild | 108
5 files changed, 468 deletions(-)
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index fd62d64d49c1..3e33e7550c15 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,5 +1,2 @@
-DIST strace-5.12.tar.xz 2009060 BLAKE2B
9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591
SHA512
289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
-DIST strace-5.14.tar.xz 2067020 BLAKE2B
479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f
SHA512
3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
DIST strace-5.15.tar.xz 2248664 BLAKE2B
fff08e49552ad1208b658f91e37c540cc7315ac255aba2e69db5bfeb942114b865f1114a45663481f1ab967db45d187bdbcf70ffe80449169df0c37ff82a1a94
SHA512
67251792ad0fb7f44013c3ae5e5b757106223c9d123d349e31de7565e0f2bfdc6bbd46a9c269e58508bd288ee70f104f8e2185f2203bd91431c5c776db0d9384
-DIST strace-5.16.tar.xz 2265944 BLAKE2B
0c0fb133e8642c30a8c706ba23c2d0976ff4e6662a1d07c6cd3cb70aaa980020d54220fe0baddcb70e3c3eb24bc2a8733e4b52ef4e99da5c11ed852c192a5c21
SHA512
db5993ece5600d928a42dedd2d5c8efec5b9195becb5fe6913f58f4e2f486d80f1700d63d1e67b591d4e6b13d19c4fcc0c52a4d0fa57c5a5a2ea73c4edd0f817
DIST strace-5.17.tar.xz 2281220 BLAKE2B
27e7dc19302c58144b0a7d8de41f717760b8e3cde4ab56892045727597bbfc894bf8f137aee476548c2d16d1e9c8005f931f31a5d2f8bfc4ce5565c2aa01f1ec
SHA512
1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44
diff --git a/dev-util/strace/files/strace-5.12-detect-ipx-presence.patch
b/dev-util/strace/files/strace-5.12-detect-ipx-presence.patch
deleted file mode 100644
index 37bab4399329..
--- a/dev-util/strace/files/strace-5.12-detect-ipx-presence.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From: Eugene Syromyatnikov
-Date: Wed, 3 Nov 2021 00:48:59 +0100
-Subject: [PATCH] Avoid relying on presence of ipx.h
-
-After Linux has broken UAPI in commit v5.15-rc1~157^2~207, it is well
-possible that neither kernel nor libc (such as musl, for example)
-provides an IPX-related header. Avoid relying on its presence
-in the strace's code and conditionalise the relevant checks in the tests.
-
-* configure.ac (AC_CHECK_HEADERS): Add linux/ipx.h.
-* src/net.c: Remove / includes.
-* src/sockaddr.c: Likewise.
-(IPX_NODE_LEN): New macro constant.
-(struct sockaddr_ipx): New type definition.
-* src/xlat/sock_ipx_options.in (IPX_TYPE): Provide a fallback value.
-* tests/net-sockaddr.c [!HAVE_LINUX_IPX_H]: Do not include
-.
-[!HAVE_LINUX_IPX_H && HAVE_NETIPX_IPX_H]: Include .
-[!(HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H)] (check_ipx): Do not
-define.
-(main) [!(HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H)]: Do not call
-check_ipx.
-
-Closes: https://github.com/strace/strace/issues/201
-
-diff --git a/configure.ac b/configure.ac
-index 2771c0f82..3c7fcb91e 100644
a/configure.ac
-+++ b/configure.ac
-@@ -423,6 +423,7 @@ AC_CHECK_HEADERS(m4_normalize([
- elf.h
- gcov.h
- iconv.h
-+ linux/ipx.h
- mqueue.h
- netinet/sctp.h
- netipx/ipx.h
-diff --git a/src/net.c b/src/net.c
-index b23911a97..bbc52e15f 100644
a/src/net.c
-+++ b/src/net.c
-@@ -28,11 +28,6 @@
- #include
- #include
- #include
--#ifdef HAVE_NETIPX_IPX_H
--# include
--#else
--# include
--#endif
-
- #include
- #include "netlink.h"
-diff --git a/src/sockaddr.c b/src/sockaddr.c
-index 8b2b0afaf..e1dc09b71 100644
a/src/sockaddr.c
-+++ b/src/sockaddr.c
-@@ -24,12 +24,6 @@
- #include
- #include
-
--#ifdef HAVE_NETIPX_IPX_H
--# include
--#else
--# include
--#endif
--
- #include "xlat/addrfams.h"
- #include "xlat/arp_hardware_types.h"
- #include "xlat/ethernet_protocols.h"
-@@ -45,6 +39,16 @@
- const size_t arp_hardware_types_size = ARRAY_SIZE(arp_hardware_types) - 1;
- const size_t ethernet_protocols_size = ARRAY_SIZE(ethernet_protocols) - 1;
-
-+#define IPX_NODE_LEN 6
-+struct sockaddr_ipx {
-+ uint16_t sipx_family;
-+ uint16_t
[gentoo-commits] repo/gentoo:master commit in: dev-util/strace/, dev-util/strace/files/
commit: d9a41c493b001b333100acef303e424df49319df
Author: Lars Wendler gentoo org>
AuthorDate: Thu Feb 18 09:14:14 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Feb 18 09:14:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a41c49
dev-util/strace: Removed old
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler gentoo.org>
dev-util/strace/Manifest | 2 -
.../files/strace-5.4-fix-LTO-CFLAGS-handling.patch | 24 -
dev-util/strace/strace-5.4.ebuild | 101
dev-util/strace/strace-5.9.ebuild | 104 -
4 files changed, 231 deletions(-)
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 0c5e09b2c42..4c3b36db20d 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,5 +1,3 @@
DIST strace-5.10.tar.xz 1859688 BLAKE2B
45c40854c9af95395cb274fbfddc3d0084e77cc403ffe104f72ce7592800452776f5c19d03649cdd6705bccc7a0859364e470bdd5344f64af54b798fab50475e
SHA512
1baa41b6d52f2e40e42a22850beee1ae278fafe712796694631898f06a7540d8f2c3fa70807e0062734f0976ebbd0824457c733ccda248f017c218387366ed48
DIST strace-5.11.tar.xz 1926632 BLAKE2B
df47612c0928466f8b5788c4a7dc74208fe76c6967d3219b0eb753131fba315e715626c2cd1ed56d3e8ba0eb9a338589a8cbd6205fe876123ac26fdf0fab8d31
SHA512
688bec8d620c7ca701561ed7479e42687cc30737f944b82201731d827775cd2864787ecca7c93ba149b06d5d654d9f6bd109a977f8138bab34339cd5930828f0
-DIST strace-5.4.tar.xz 1599396 BLAKE2B
0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970
SHA512
4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
DIST strace-5.8.tar.xz 1813640 BLAKE2B
315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715
SHA512
633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
-DIST strace-5.9.tar.xz 1847036 BLAKE2B
92d6b5e1a7821086b4e0e535d5db7849158e58ac0604fb9bb667e106b72b1ce17dfadd3960efcf553d7c7dec4622db36833aa5cdd4bc924f8b54ec6168ed82dd
SHA512
f28d5dcceccb44557b39ed6f295f3250662804dc3ad79959bfadffcecc9b736e532c7c90dc89ebf9d07eb3e02a5ace231605851148ca09d41c8c60dc1ff68206
diff --git a/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch
b/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch
deleted file mode 100644
index 0f277962b95..000
--- a/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Based on 52ac53e96143f6aac52738f6e385f75203a68a7b
-[PATCH] configure.ac: do not copy CFLAGS to CFLAGS_FOR_{M32,MX32}
-
a/configure.ac
-+++ b/configure.ac
-@@ -984,11 +984,14 @@ AS_IF([test x$arch = xaarch64],
-])
- ])
-
--# Setting default compiler variables for personalities
-+# Set default compiler variables for personalities.
- m4_foreach([pers], [M32, MX32], dnl
-- [m4_foreach([var], [CC, CPP, CFLAGS, CPPFLAGS], dnl
-- [[: ${]var[_FOR_]pers[=$]var[}]
-- AC_SUBST(var[_FOR_]pers)])])
-+ [m4_foreach([var], [CC, CPP, CPPFLAGS], dnl
-+ [[: ${]var[_FOR_]pers[=$]var[}]
-+ AC_SUBST(var[_FOR_]pers)]) dnl
-+ m4_foreach([var], [CFLAGS], dnl
-+ [[: ${]var[_FOR_]pers[=][}]
-+ AC_SUBST(var[_FOR_]pers)])])
-
- st_MPERS([m32], [aarch64|powerpc64|s390x|sparc64|tile|x32|x86_64])
- st_MPERS([mx32], [x86_64])
diff --git a/dev-util/strace/strace-5.4.ebuild
b/dev-util/strace/strace-5.4.ebuild
deleted file mode 100644
index 49b3e03d04c..000
--- a/dev-util/strace/strace-5.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs autotools
-
-if [[ ${PV} == "" ]] ; then
- EGIT_REPO_URI="https://github.com/strace/strace.git;
- inherit git-r3 autotools
-else
-
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/;
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind elfutils"
-
-REQUIRED_USE="?? ( unwind elfutils )"
-
-LIB_DEPEND="
- unwind? ( sys-libs/libunwind[static-libs(+)] )
- elfutils? ( dev-libs/elfutils[static-libs(+)] )
-"
-# strace only uses the header from libaio to decode structs
-DEPEND="
- static? ( ${LIB_DEPEND} )
- aio? ( >=dev-libs/libaio-0.3.106 )
- sys-kernel/linux-headers
-"
-RDEPEND="
- !static? (
[gentoo-commits] repo/gentoo:master commit in: dev-util/strace/, dev-util/strace/files/
commit: 943946b119a14f044dc1af8f7b90535f782bff4e
Author: Mike Gilbert gentoo org>
AuthorDate: Sat May 2 20:31:15 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sat May 2 20:31:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943946b1
dev-util/strace: respect AR variable
Closes: https://bugs.gentoo.org/720712
Signed-off-by: Mike Gilbert gentoo.org>
dev-util/strace/files/strace-5.6-AR.patch | 27 +++
dev-util/strace/strace-5.6.ebuild | 3 ++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/dev-util/strace/files/strace-5.6-AR.patch
b/dev-util/strace/files/strace-5.6-AR.patch
new file mode 100644
index 000..ac8cc31e1d7
--- /dev/null
+++ b/dev-util/strace/files/strace-5.6-AR.patch
@@ -0,0 +1,27 @@
+From 0b0dccc7f198ce93f9b5faa3613b1630bffb338f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Sat, 2 May 2020 16:25:21 -0400
+Subject: [PATCH] configure: check AR variable for 'ar' tool
+
+Without this, automake always hardcodes 'AR = ar' in Makefile.in
+
+Bug: https://bugs.gentoo.org/720712
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 6aabc2c8..7d6dde67 100644
+--- a/configure.ac
b/configure.ac
+@@ -36,6 +36,7 @@ AC_PROG_CC_STDC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AC_CHECK_TOOL([AR], [ar])
+
+ AC_USE_SYSTEM_EXTENSIONS
+ AX_CODE_COVERAGE
+--
+2.26.2
+
diff --git a/dev-util/strace/strace-5.6.ebuild
b/dev-util/strace/strace-5.6.ebuild
index c08dbf18c0a..f19588e9f9c 100644
--- a/dev-util/strace/strace-5.6.ebuild
+++ b/dev-util/strace/strace-5.6.ebuild
@@ -41,7 +41,8 @@ RDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-5.5-static.patch"
+ "${FILESDIR}/strace-5.5-static.patch"
+ "${FILESDIR}/strace-5.6-AR.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-util/strace/, dev-util/strace/files/
commit: cbc310b44cb1cca7dd68f70bf16dff3478f3d387
Author: Lars Wendler gentoo org>
AuthorDate: Thu Feb 6 21:06:46 2020 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Feb 6 21:11:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc310b4
dev-util/strace: Removed old
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Lars Wendler gentoo.org>
dev-util/strace/Manifest | 1 -
.../strace/files/strace-5.2-linux-5.3-compat.patch | 75 -
dev-util/strace/strace-5.2.ebuild | 97 --
3 files changed, 173 deletions(-)
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 920d075e810..1219d8b8409 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,5 +1,4 @@
DIST strace-4.26.tar.xz 1444216 BLAKE2B
ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba
SHA512
cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
-DIST strace-5.2.tar.xz 1515544 BLAKE2B
919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0
SHA512
41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35
DIST strace-5.3.tar.xz 1572708 BLAKE2B
808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9
SHA512
02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546db3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a
DIST strace-5.4.tar.xz 1599396 BLAKE2B
0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970
SHA512
4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
DIST strace-5.5.tar.xz 1628744 BLAKE2B
ae2ab9b2c756858c3c23640ee19821b8720da84a5e15e4a674768d8f4b51d74b2b490cfa18a862bc3c9d129baeaf09212700bea98ac151db035d03a05afa055d
SHA512
317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231
diff --git a/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch
b/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch
deleted file mode 100644
index 254326f0457..000
--- a/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://github.com/strace/strace/commit/60da39553ff92cf741bf7f54daff636bb28cbb3c
-https://bugs.gentoo.org/695260
-
a/xlat/v4l2_pix_fmts.h
-+++ b/xlat/v4l2_pix_fmts.h
-@@ -269,19 +269,23 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1')
- #endif
--#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444)
&& HAVE_DECL_V4L2_PIX_FMT_BGRA444)
-+#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12)
&& HAVE_DECL_V4L2_PIX_FMT_SGRBG12)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('B', 'A', '1', '2')),
"V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('B', 'A', '1', '2')");
-+static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')),
"V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
--# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2')
-+# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2')
- #endif
--#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12)
&& HAVE_DECL_V4L2_PIX_FMT_SGRBG12)
-+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+# undef V4L2_PIX_FMT_BGRA444
-+#endif
-+#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444)
&& HAVE_DECL_V4L2_PIX_FMT_BGRA444)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')),
"V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')");
-+static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('G', 'A', '1', '2')),
"V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('G', 'A', '1', '2')");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
--# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2')
-+# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2')
- #endif
- #if defined(V4L2_PIX_FMT_RGBA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_RGBA444)
&& HAVE_DECL_V4L2_PIX_FMT_RGBA444)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-@@ -1343,8 +1347,17 @@ const struct xlat v4l2_pix_fmts[] = {
- XLAT(V4L2_PIX_FMT_H264_NO_SC),
- XLAT(V4L2_PIX_FMT_PWC1),
- XLAT(V4L2_PIX_FMT_MPEG1),
-- XLAT(V4L2_PIX_FMT_BGRA444),
- XLAT(V4L2_PIX_FMT_SGRBG12),
-+#ifndef
