From 14a6858a7d8bc085420a1430b3a3f67885019f27 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Aug 2023 04:04:16 +0100 Subject: gentoo auto-resync : 29:08:2023 - 04:04:16 --- dev-util/strace/Manifest | 2 + .../files/strace-6.4-linux-headers-6.5.patch | 160 +++++++++++++++++++++ dev-util/strace/strace-6.4-r1.ebuild | 110 ++++++++++++++ 3 files changed, 272 insertions(+) create mode 100644 dev-util/strace/files/strace-6.4-linux-headers-6.5.patch create mode 100644 dev-util/strace/strace-6.4-r1.ebuild (limited to 'dev-util/strace') diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest index f4451ffbceff..55ad42fac6b8 100644 --- a/dev-util/strace/Manifest +++ b/dev-util/strace/Manifest @@ -1,9 +1,11 @@ AUX strace-5.11-static.patch 5306 BLAKE2B 24150fcdf0ff75c4698542914bcd0fd39df9794f39ce0d16dac6dc3b689365e124d8d77a75a8fe81caff9432679563d84ffd31add74edb4c8f83aec28ff2f078 SHA512 bbeecbfd73109d21732acdaa28d5b4c82b23b7165f09e78e62cad68f9ac63dfb4c7a1c2eb8bdc642dda9f07d62e286ab46a2be236b5f03e1e6f9920f3093ede8 +AUX strace-6.4-linux-headers-6.5.patch 5283 BLAKE2B 67707d990124f3ebc05a33728251fb313fbde73b3f1ae72c046ea0c7faa05df26693fcdd8cd9ea98d8eb0c43dac5d35486af5392f7ad5f6cdbd8a05ad9991866 SHA512 ca11e21f848a2e7f128c10bc717ca6486caecbc43d45b04ee6c4c96014e645a43fec11d52c9b2f4911273b9d100c97b1956115dc7cfe5766c7fc9805952d88b5 DIST strace-6.2.tar.xz 2364280 BLAKE2B 8e51cb3e426e9b99d598b4fcece21ba7873e81468cddae04c2f0b1a48dc40643c626acadd226389c33dbef5350b502817d3459d445fc17cce149f7e501c15ae2 SHA512 56708faa3f73c0673c98a5b8b8fe35289ecf2870f4f775bcb7a6be59451ef84685564c0129aca15b576d851f8efa1ff760e27658b914d1f31adf4de3b1ad721f DIST strace-6.3.tar.xz 2382284 BLAKE2B 7373ebddd6f23713b752ed91598e536d61e08865907c7825dd3492574c7feb0ad6d56bea0e144e1082ac1882d68bb5f160f25e70bfc6e2fd47571ef2c40403fb SHA512 2b0a57e3ee8a23eb3882123149cd732c568322614bf8fde69fabcea64d0d4e3c46c71d63183e0e8d9f8744a7b1cebc823cc67023660c37547f5b854fcc1ca9df DIST strace-6.4.tar.xz 2391828 BLAKE2B a9d359679bc5cc61061eb9f19a6156637f12509cb1045462b1547cba8a1218a9b2a4d3b87cf4a33856500515cc0bd457c1374b0ed349293821d80e3cc0de0452 SHA512 29f47195b2766dc0d2907aba2d561e87ec87939251d07fd82d22ffdd3c864944ab0c47eabd7b13272345dfc5dfae7ca435c94fd5ccc297dd46e0747c6d463e01 EBUILD strace-6.2.ebuild 2490 BLAKE2B 7c9d96c1ec695a5ddc58491f3db68abcfeb6066986fe11853aa465a1c18dde977c7e87c58dfda78095ba4b6ddf05aae8b4cfa25fc7dc453955e823080cd6b3f5 SHA512 f2d6e2cd22968812c13f2ae6a09a15d0cb52cbb8211738d9b88be1830deef544442a62e92c69d23cb2e7a3565e3a489f529bef77cad646d51d6da384c4c34ec6 EBUILD strace-6.3.ebuild 2489 BLAKE2B a42aad4a728fa646bbc3f06d39e0a4bf6d602ad4e5472303f6b450ad9ce0f0134f2df5302457892b01104e10a939717711e195df6847cacbf6b3d12849729d28 SHA512 123cd965bd7b7ff9fb0269e3753552c56c5d7433f821cdbcbe5c380ac2c387509fb0ae2a190d1d036057fc071686877acf27fb693979071dafd59a61349735e7 +EBUILD strace-6.4-r1.ebuild 2539 BLAKE2B 570563803d7a9bdfcec04492e0385dbe82c65bfbb2413f676184c04dee3509ecabd0502b93b85c09957def28957a3b467259ea2d76bd4e5b636d711608bff74f SHA512 a65562825d4b1cdf37ef443db479d281b4d844a3f4ea9c26dd17ae8a7ea04d20adfe3dc7c26d4bd56fbbfd19277ed956f22874d2ae110d36b5c8219423125a86 EBUILD strace-6.4.ebuild 2495 BLAKE2B f33a7cc134b8b70b3e844e1f552eadcb6fdc9ee9216d5aaaef6a0a5e8165cc89ad3081c12bf438643b55a2d65c68e23df317f647566ff5a87d550ae517a486e4 SHA512 33a738435ca711e0c16a37576b71bae119b35a07b98ad41216c400c85cd5a4e6364e94d619e92a294798c392e00584dc47b273e28476bddb38ed4b4cb872ddb8 EBUILD strace-9999.ebuild 2495 BLAKE2B f33a7cc134b8b70b3e844e1f552eadcb6fdc9ee9216d5aaaef6a0a5e8165cc89ad3081c12bf438643b55a2d65c68e23df317f647566ff5a87d550ae517a486e4 SHA512 33a738435ca711e0c16a37576b71bae119b35a07b98ad41216c400c85cd5a4e6364e94d619e92a294798c392e00584dc47b273e28476bddb38ed4b4cb872ddb8 MISC metadata.xml 779 BLAKE2B 89b4360e876fbb34a7a766a57ba9ca088a5e03e9ef66fdbe0a2b15df4cfb625daba11dc76920dec405b97cb87df49fd3c9edc0e184e73262b14b616af36fa4dd SHA512 88b2d94fd6efebaa617c8344bff3997f31c6262b9376cbce014bf7f6225f02bd8ee7bcaf98df4477435319bbb92addcdb6756e5d37a137a863f0bef1ecc5fced 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 000000000000..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 +0000 +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 +0000 +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; + }; + + /* +@@ -425,7 +425,7 @@ struct io_cqring_offsets { + __u32 cqes; + __u32 flags; + __u32 resv1; +- __u64 resv2; ++ __u64 user_addr; + }; + + /* +--- a/src/io_uring.c ++++ b/src/io_uring.c +@@ -45,10 +45,8 @@ print_io_sqring_offsets(const struct io_sqring_offsets *const p) + tprint_struct_next(); + PRINT_FIELD_X(*p, resv1); + } +- if (p->resv2) { +- tprint_struct_next(); +- PRINT_FIELD_X(*p, resv2); +- } ++ tprint_struct_next(); ++ PRINT_FIELD_X(*p, user_addr); + tprint_struct_end(); + } + +@@ -73,10 +71,8 @@ print_io_cqring_offsets(const struct io_cqring_offsets *const p) + tprint_struct_next(); + PRINT_FIELD_X(*p, resv1); + } +- if (p->resv2) { +- tprint_struct_next(); +- PRINT_FIELD_X(*p, resv2); +- } ++ tprint_struct_next(); ++ PRINT_FIELD_X(*p, user_addr); + tprint_struct_end(); + } + +--- a/tests/io_uring_setup.c ++++ b/tests/io_uring_setup.c +@@ -113,10 +113,9 @@ main(void) + params->sq_off.array); + if (params->sq_off.resv1) + printf(", resv1=%#x", params->sq_off.resv1); +- if (params->sq_off.resv2) +- printf(", resv1=%#llx", +- (unsigned long long) +- params->sq_off.resv2); ++ printf(", user_addr=%#llx", ++ (unsigned long long) ++ params->sq_off.user_addr); + + printf("}, cq_off={head=%u, tail=%u, ring_mask=%u" + ", ring_entries=%u, overflow=%u, cqes=%u" +@@ -130,10 +129,9 @@ main(void) + params->cq_off.flags); + if (params->cq_off.resv1) + printf(", resv1=%#x", params->cq_off.resv1); +- if (params->cq_off.resv2) +- printf(", resv2=%#llx", +- (unsigned long long) +- params->cq_off.resv2); ++ printf(", user_addr=%#llx", ++ (unsigned long long) ++ params->cq_off.user_addr); + + printf("}}) = %ld\n", rc); + } diff --git a/dev-util/strace/strace-6.4-r1.ebuild b/dev-util/strace/strace-6.4-r1.ebuild new file mode 100644 index 000000000000..aaf9820a9637 --- /dev/null +++ b/dev-util/strace/strace-6.4-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools edo flag-o-matic toolchain-funcs + +DESCRIPTION="Useful diagnostic, instructional, and debugging tool" +HOMEPAGE="https://strace.io/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/strace/strace.git" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1+ test? ( GPL-2+ )" +SLOT="0" +IUSE="aio perl selinux static test unwind elfutils" +RESTRICT="!test? ( test )" +REQUIRED_USE="?? ( unwind elfutils )" + +BDEPEND="virtual/pkgconfig" +LIB_DEPEND=" + unwind? ( sys-libs/libunwind[static-libs(+)] ) + elfutils? ( dev-libs/elfutils[static-libs(+)] ) + selinux? ( sys-libs/libselinux[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? ( ${LIB_DEPEND//\[static-libs(+)]} ) + perl? ( dev-lang/perl ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.11-static.patch" + "${FILESDIR}/${P}-linux-headers-6.5.patch" +) + +src_prepare() { + default + + if [[ ! -e configure ]] ; then + # git generation + sed /autoreconf/d -i bootstrap || die + edo ./bootstrap + [[ ! -e CREDITS ]] && cp CREDITS{.in,} + fi + + eautoreconf + + # Stub out the -k test since it's known to be flaky. bug #545812 + sed -i '1iexit 77' tests*/strace-k.test || die +} + +src_configure() { + # Set up the default build settings, and then use the names strace expects. + tc-export_build_env BUILD_{CC,CPP} + local v bv + for v in CC CPP {C,CPP,LD}FLAGS ; do + bv="BUILD_${v}" + export "${v}_FOR_BUILD=${!bv}" + done + + filter-lfs-flags # configure handles this sanely + + export ac_cv_header_libaio_h=$(usex aio) + use elibc_musl && export ac_cv_header_stdc=no + + local myeconfargs=( + --disable-gcc-Werror + + # Don't require mpers support on non-multilib systems. #649560 + --enable-mpers=check + + $(use_enable static) + $(use_with unwind libunwind) + $(use_with elfutils libdw) + $(use_with selinux libselinux) + ) + econf "${myeconfargs[@]}" +} + +src_test() { + if has usersandbox ${FEATURES} ; then + # bug #643044 + ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." + return 0 + fi + + default +} + +src_install() { + default + + if use perl ; then + exeinto /usr/bin + doexe src/strace-graph + fi + + dodoc CREDITS +} -- cgit v1.2.3