From af44411e905937230eda92912d14ff0c36e9004d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 12 Aug 2022 14:47:18 +0200 Subject: [PATCH] dev-util/strace: Sync with Gentoo It's from Gentoo commit b95e21368252ad592083b193849d4e950f9f04f0. --- .../portage-stable/dev-util/strace/Manifest | 5 +- .../dev-util/strace/metadata.xml | 41 +++---- .../dev-util/strace/strace-5.13.ebuild | 105 ------------------ ...{strace-5.11.ebuild => strace-5.17.ebuild} | 35 +++--- ...{strace-5.12.ebuild => strace-5.19.ebuild} | 40 ++++--- .../dev-util/strace/strace-9999.ebuild | 47 ++++---- 6 files changed, 89 insertions(+), 184 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.13.ebuild rename sdk_container/src/third_party/portage-stable/dev-util/strace/{strace-5.11.ebuild => strace-5.17.ebuild} (79%) rename sdk_container/src/third_party/portage-stable/dev-util/strace/{strace-5.12.ebuild => strace-5.19.ebuild} (78%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/strace/Manifest index dce8cafc85..f38d718945 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/strace/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/strace/Manifest @@ -1,3 +1,2 @@ -DIST strace-5.11.tar.xz 1926632 BLAKE2B df47612c0928466f8b5788c4a7dc74208fe76c6967d3219b0eb753131fba315e715626c2cd1ed56d3e8ba0eb9a338589a8cbd6205fe876123ac26fdf0fab8d31 SHA512 688bec8d620c7ca701561ed7479e42687cc30737f944b82201731d827775cd2864787ecca7c93ba149b06d5d654d9f6bd109a977f8138bab34339cd5930828f0 -DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9 -DIST strace-5.13.tar.xz 2040116 BLAKE2B a604342d68f504b42ff1cb4918aa9ced6575f589caeb62f53e0b125f24cfaf0423f1911f352f21ecea0d702197d65edc85d3e97ffca3561f619f9c4c80386cdc SHA512 ba8b0eae396fa2b762bf17cbcdcd84b0660b2a5d5e7e9caf098ef3414a87fd28d4140dd10136483f35904560e5044e40be2bf6117462868a360306d62887c8ed +DIST strace-5.17.tar.xz 2281220 BLAKE2B 27e7dc19302c58144b0a7d8de41f717760b8e3cde4ab56892045727597bbfc894bf8f137aee476548c2d16d1e9c8005f931f31a5d2f8bfc4ce5565c2aa01f1ec SHA512 1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44 +DIST strace-5.19.tar.xz 2353276 BLAKE2B 44b9a87f36e66481d8ac2107efbc389fa64c47b2ae7b1cc728241baa1c7d2d5d4d9410622763eb1247b415cad9afdd9f61552d2545388cadf5a33b568ed09af2 SHA512 1ea1c6e12d05bf145bc3c74f8d06b08dfc3eae3a5a21bfe8ab080053dc4c2da8a95be5956652ea62bb083462015a55f9bc1d1023919dcf2929a05211b7dde963 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/strace/metadata.xml index 7aa6b81780..50e8e39652 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/strace/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/strace/metadata.xml @@ -1,23 +1,24 @@ - + - - base-system@gentoo.org - Gentoo Base System - - - - Enable dev-libs/libaio support for tracing Asynchronous I/O operations - - - Enable stack backtraces (-k flag) via sys-libs/libunwind - - - Enable stack backtraces (-k flag) via dev-libs/elfutils - - - - strace/strace - strace - + + base-system@gentoo.org + Gentoo Base System + + + + Enable dev-libs/libaio support for tracing Asynchronous I/O operations + + + Enable stack backtraces (-k flag) via sys-libs/libunwind + + + Enable stack backtraces (-k flag) via dev-libs/elfutils + + + + strace/strace + strace/strace + strace + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.13.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.13.ebuild deleted file mode 100644 index 73df00d83e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.13.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -if [[ ${PV} == "9999" ]] ; 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 )" - -BDEPEND=" - virtual/pkgconfig -" -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? ( ${LIB_DEPEND//\[static-libs(+)]} ) - perl? ( dev-lang/perl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.11-static.patch" -) - -src_prepare() { - default - - eautoreconf - - if [[ ! -e configure ]] ; then - # git generation - sed /autoreconf/d -i bootstrap || die - ./bootstrap || die - eautoreconf - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - # Stub out the -k test since it's known to be flaky. #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 - - # Don't require mpers support on non-multilib systems. #649560 - local myeconfargs=( - --disable-gcc-Werror - --enable-mpers=check - $(use_enable static) - $(use_with unwind libunwind) - $(use_with elfutils libdw) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if has usersandbox ${FEATURES} ; then - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 - return 0 - fi - - default -} - -src_install() { - default - if use perl ; then - exeinto /usr/bin - doexe src/strace-graph - fi - dodoc CREDITS -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.11.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.17.ebuild similarity index 79% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.11.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.17.ebuild index d71516e9a0..26462a79e4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.11.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,10 +7,10 @@ inherit autotools flag-o-matic toolchain-funcs if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 autotools + 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A useful diagnostic, instructional, and debugging tool" @@ -18,16 +18,14 @@ HOMEPAGE="https://strace.io/" LICENSE="BSD" SLOT="0" -IUSE="aio perl static unwind elfutils" - +IUSE="aio perl selinux static unwind elfutils" REQUIRED_USE="?? ( unwind elfutils )" -BDEPEND=" - virtual/pkgconfig -" +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=" @@ -57,12 +55,7 @@ src_prepare() { [[ ! -e CREDITS ]] && cp CREDITS{.in,} fi - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - # Stub out the -k test since it's known to be flaky. #545812 + # Stub out the -k test since it's known to be flaky. bug #545812 sed -i '1iexit 77' tests*/strace-k.test || die } @@ -75,20 +68,29 @@ src_configure() { export "${v}_FOR_BUILD=${!bv}" done - # Don't require mpers support on non-multilib systems. #649560 + 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 - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 + # bug #643044 + ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." return 0 fi @@ -97,6 +99,7 @@ src_test() { src_install() { default + if use perl ; then exeinto /usr/bin doexe src/strace-graph diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.19.ebuild similarity index 78% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.12.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.19.ebuild index d71516e9a0..8d532b61c6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-5.19.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic toolchain-funcs -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 autotools + 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A useful diagnostic, instructional, and debugging tool" @@ -18,16 +18,14 @@ HOMEPAGE="https://strace.io/" LICENSE="BSD" SLOT="0" -IUSE="aio perl static unwind elfutils" - +IUSE="aio perl selinux static unwind elfutils" REQUIRED_USE="?? ( unwind elfutils )" -BDEPEND=" - virtual/pkgconfig -" +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=" @@ -57,12 +55,7 @@ src_prepare() { [[ ! -e CREDITS ]] && cp CREDITS{.in,} fi - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - # Stub out the -k test since it's known to be flaky. #545812 + # Stub out the -k test since it's known to be flaky. bug #545812 sed -i '1iexit 77' tests*/strace-k.test || die } @@ -75,20 +68,29 @@ src_configure() { export "${v}_FOR_BUILD=${!bv}" done - # Don't require mpers support on non-multilib systems. #649560 + 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 - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 + # bug #643044 + ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." return 0 fi @@ -97,9 +99,11 @@ src_test() { src_install() { default + if use perl ; then exeinto /usr/bin doexe src/strace-graph fi + dodoc CREDITS } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-9999.ebuild index 73df00d83e..49ada01092 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic toolchain-funcs +inherit autotools edo flag-o-matic toolchain-funcs -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 autotools + 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A useful diagnostic, instructional, and debugging tool" @@ -18,16 +18,14 @@ HOMEPAGE="https://strace.io/" LICENSE="BSD" SLOT="0" -IUSE="aio perl static unwind elfutils" - +IUSE="aio perl selinux static unwind elfutils" REQUIRED_USE="?? ( unwind elfutils )" -BDEPEND=" - virtual/pkgconfig -" +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=" @@ -47,22 +45,16 @@ PATCHES=( src_prepare() { default - eautoreconf - if [[ ! -e configure ]] ; then # git generation sed /autoreconf/d -i bootstrap || die - ./bootstrap || die - eautoreconf + edo ./bootstrap [[ ! -e CREDITS ]] && cp CREDITS{.in,} fi - filter-lfs-flags # configure handles this sanely + eautoreconf - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - # Stub out the -k test since it's known to be flaky. #545812 + # Stub out the -k test since it's known to be flaky. bug #545812 sed -i '1iexit 77' tests*/strace-k.test || die } @@ -75,20 +67,29 @@ src_configure() { export "${v}_FOR_BUILD=${!bv}" done - # Don't require mpers support on non-multilib systems. #649560 + 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 - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 + # bug #643044 + ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." return 0 fi @@ -97,9 +98,11 @@ src_test() { src_install() { default + if use perl ; then exeinto /usr/bin doexe src/strace-graph fi + dodoc CREDITS }