From 994fb0a8da980666da47960a2532ccdae0907783 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 8 Apr 2024 07:16:47 +0000 Subject: [PATCH] sys-apps/coreutils: Sync with Gentoo It's from Gentoo commit be458b80d3ff251e5ce7301b99e80b17b20f56d6. --- .../portage-stable/sys-apps/coreutils/Manifest | 4 ++-- .../sys-apps/coreutils/coreutils-9.4-r1.ebuild | 11 +++++++---- .../sys-apps/coreutils/coreutils-9.4.ebuild | 9 ++++++--- ...ls-9.4_p20240323.ebuild => coreutils-9.5.ebuild} | 13 ++++++++----- .../sys-apps/coreutils/coreutils-9999.ebuild | 13 ++++++++----- 5 files changed, 31 insertions(+), 19 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-apps/coreutils/{coreutils-9.4_p20240323.ebuild => coreutils-9.5.ebuild} (97%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest index 81083f6fe9..2823060d35 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest @@ -3,6 +3,6 @@ DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f015 DIST coreutils-9.4-patches.tar.xz 6756 BLAKE2B 677454409ccb629fd0efde1e15d8f9c13f208391e63a17816011e84d4ca3fb2a42c2a60853f213ade2a53c821d76fd8924c59388d160c6e7c7fa5755e1db4c68 SHA512 2025c80b5ada92bafb479c678917862be208534becd8b347d335032c6b4cc23c7b7630f15ca7dd3b5d691567cb70f3491753e29441cc54d8700cc3d966a5e743 DIST coreutils-9.4.tar.xz 5979200 BLAKE2B 83d41c48804c1d470c0e5eed38e692bb6875436dda3f6e2c29784ad6ef563d86e8e066a050e222621b400f78ea4630b1e127d20fc9b76f12096528c42677e35d SHA512 7c55ee23b685a0462bbbd118b04d25278c902604a0dcf3bf4f8bf81faa0500dee5a7813cba6f586d676c98e520cafd420f16479619305e94ea6798d8437561f5 DIST coreutils-9.4.tar.xz.sig 833 BLAKE2B 870f7eb28e8851f41954820c7f4f4b43a965e6650b303b79541dfdf98ca0cd52fe964d7eec72bea68066452d7ad21a01df5e4db9e5bc4c20bf26d8b416856446 SHA512 9674f783f592c4f3e5c708ff31426ac009bf132fd0005019571bf39c8a1627efb5351c6cecc7faecb1eff8fa2970318666593bffc0eda9c750159e174ef42524 -DIST coreutils-9.4_p20240323.tar.xz 5975332 BLAKE2B c319b3f639f49f2074082722096464304ba48e01f5d118a8b955a77086ec7f508c3dd80cd5732c2983f776af4cd3936e79da4f748682a3d5a67aceb0a862709a SHA512 915eb9428a98412542eab937a168ef5ccbd65246ac9e9e3dfba90210ecba53eb512a6b7c9c11de4bedd28c99a22a5ce445a94ff1cde79452f9eeb407725ce6f7 -DIST coreutils-9.4_p20240323.tar.xz.sig 833 BLAKE2B 24575deb0e58e3dceb7e719f03923539de8d0d1b2a4543bb54c886c1086d5d80bbc7a7164e58b4cc504a9749a8642f33bc4a11de5ce29503fa1ac20dec4b33f5 SHA512 16948e6f0698f17e65463a62a36bf5deea350547d1452d8e790ab051ea04b8e7467cda4d2c69e210d46b7b2fc6252e0a87fffb474636156677a2eb1aece6d67f DIST coreutils-9.5-patches.tar.xz 5912 BLAKE2B 873fbe1a60f8f8034b3d35796146765ce388952d649c32dc81ca0e4c2823c9f2f00b69bc5cb3af686434867459b6dc378fb9a6d59563d28b87c3ee1eceeedbb3 SHA512 4b4ad356615d046b8d67ea35b789f887a787ab01ece3234f6344518aef33cd30ca364fef5d85e11acfdb24003114c16ffdab82922fb135d5425fbcd541064a76 +DIST coreutils-9.5.tar.xz 6007136 BLAKE2B 6fd3a77697c9e85f31415c6ad66559faf18acc7d346677a89d4a999c2027886551e78842a7283e7b3b44fe8ef2fde04ba2f88df32a7844d5f69d45bcb7a04b6f SHA512 2ca0deac4dc10a80fd0c6fd131252e99d457fd03b7bd626a6bc74fe5a0529c0a3d48ce1f5da1d3b3a7a150a1ce44f0fbb6b68a6ac543dfd5baa3e71f5d65401c +DIST coreutils-9.5.tar.xz.sig 833 BLAKE2B 37c29984bceee0ff3bffde76712f71dbb118c228e328dc230d5c53c37da12f5ec2130e0123b97fda4a561f556c3be307fdbe1f0c21279db2c84030818386f626 SHA512 029997e0f4ee64e561853cff7c8a124f58cc891598595b44c4a46f9813b4b71c9d677464bc8a26d294e9971832f4b87c23777fea4fac6e8e30f06ad93b9957d5 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4-r1.ebuild index adf51c2bed..cd9bf44d06 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4-r1.ebuild @@ -33,7 +33,7 @@ else verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) " - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" fi SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )" @@ -244,11 +244,14 @@ src_test() { # We have a patch which fixes this (bug #259876) #tests/touch/not-owner #tests/touch/not-owner.sh - - # bug #910640 - tests/tty/tty-eof.pl ) + # This test is flaky (bug #910640). + cat > tests/tty/tty-eof.pl <<-EOF || die + #!/usr/bin/perl + exit 77; + EOF + # We set DISABLE_HARD_ERRORS because some of the tests hard error-out # because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed # to downgrade them to FAIL. diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4.ebuild index 4c826357e1..7f7d258299 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4.ebuild @@ -242,11 +242,14 @@ src_test() { # We have a patch which fixes this (bug #259876) #tests/touch/not-owner #tests/touch/not-owner.sh - - # bug #910640 - tests/tty/tty-eof.pl ) + # This test is flaky (bug #910640). + cat > tests/tty/tty-eof.pl <<-EOF || die + #!/usr/bin/perl + exit 77; + EOF + # We set DISABLE_HARD_ERRORS because some of the tests hard error-out # because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed # to downgrade them to FAIL. diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4_p20240323.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.5.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4_p20240323.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.5.ebuild index 95bb5424c9..187e8ba621 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4_p20240323.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.5.ebuild @@ -9,7 +9,7 @@ EAPI=8 # # Also recommend subscribing to the coreutils and bug-coreutils MLs. -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig @@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then elif [[ ${PV} == *_p* ]] ; then # Note: could put this in devspace, but if it's gone, we don't want # it in tree anyway. It's just for testing. - MY_SNAPSHOT="$(ver_cut 1-2).170-7b206" + MY_SNAPSHOT="$(ver_cut 1-2).185-541b02" SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz" SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )" S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} @@ -241,11 +241,14 @@ src_test() { # We have a patch which fixes this (bug #259876) #tests/touch/not-owner #tests/touch/not-owner.sh - - # bug #910640 - tests/tty/tty-eof.pl ) + # This test is flaky (bug #910640). + cat > tests/tty/tty-eof.pl <<-EOF || die + #!/usr/bin/perl + exit 77; + EOF + # We set DISABLE_HARD_ERRORS because some of the tests hard error-out # because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed # to downgrade them to FAIL. diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9999.ebuild index 95bb5424c9..187e8ba621 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9999.ebuild @@ -9,7 +9,7 @@ EAPI=8 # # Also recommend subscribing to the coreutils and bug-coreutils MLs. -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig @@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then elif [[ ${PV} == *_p* ]] ; then # Note: could put this in devspace, but if it's gone, we don't want # it in tree anyway. It's just for testing. - MY_SNAPSHOT="$(ver_cut 1-2).170-7b206" + MY_SNAPSHOT="$(ver_cut 1-2).185-541b02" SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz" SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )" S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} @@ -241,11 +241,14 @@ src_test() { # We have a patch which fixes this (bug #259876) #tests/touch/not-owner #tests/touch/not-owner.sh - - # bug #910640 - tests/tty/tty-eof.pl ) + # This test is flaky (bug #910640). + cat > tests/tty/tty-eof.pl <<-EOF || die + #!/usr/bin/perl + exit 77; + EOF + # We set DISABLE_HARD_ERRORS because some of the tests hard error-out # because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed # to downgrade them to FAIL.