gentoo auto-resync : 04:07:2024 - 08:06:07

3 files changed, 25 insertions, 5 deletions

diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 3cf9bff79ac6..a45dbef6e80d 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -3,6 +3,7 @@ AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174
 AUX coreutils-9.4-CVE-2024-0684.patch 1168 BLAKE2B 0ac00f2b0b9c69680fbd0583d7534549971c384eae1d9da3b77ce46b31a58cb37126f9175b3273d2244e596cd511d7af60e89f95c485e3a8c0a7ca5d2e86fe81 SHA512 cc341446c31f5f46750034ab7a996830409d33813e5375264370d00811518ab964570573a92d8cd5495afac415d34fcb9c365cdc64804ea5e905a99e7f6011f0
 AUX coreutils-9.4-gnulib-clang-18-c23-stdckdint.patch 1097 BLAKE2B 2a15dfc18500c4480d5ddf87db2063b97cfdb064a3328e8dbc0f1b59a6372d1af09b6ee701563bd8f81e258925302b19f7093a71ef73b342d34a79a984851751 SHA512 a936b9eae5d2714bce6ee908ab15a4e46bd9e8fe137932759698cc88f94bfafd09b1ce39a868af7b34a6174b10021286bd52fb970f552aa6ef72ae70127c31b9
 AUX coreutils-9.4-gnulib-openssl-1.1.patch 6061 BLAKE2B af816c12ba6867d25d7ffb1d6213ac01e3107f0ae894c0f6452d348bf6d56cf57059fd967ab0ead7c290f7a2cb45494c5add7edace7d75ad9b89eb438b9f1d41 SHA512 9ef9ee4a987fa169dddc358fd51f37011173c9f82d81021d36faaf1dbd425d3e7f718724ad76ac61febdae76d5442a8b9e14a5638bdb52c2d256b104924ea2d0
+AUX coreutils-9.5-skip-readutmp-test.patch 409 BLAKE2B e2ab556b6d9838aebd60b2aadfac7270b181cabe3a14afab7a53e668546ae7cf020c9710be9e642f1df49e424a9af8296652bb818954af72ae9b979d5949f15f SHA512 4c663c683f3001edb29c3095fd44ce7a97e8f9348b949864db11cbafc613271f2b2578faf7df80cd8cc5d3b9cbd91072b7858aedea638c305a0f0fecb191b3eb
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST coreutils-9.4-patches.tar.xz 6756 BLAKE2B 677454409ccb629fd0efde1e15d8f9c13f208391e63a17816011e84d4ca3fb2a42c2a60853f213ade2a53c821d76fd8924c59388d160c6e7c7fa5755e1db4c68 SHA512 2025c80b5ada92bafb479c678917862be208534becd8b347d335032c6b4cc23c7b7630f15ca7dd3b5d691567cb70f3491753e29441cc54d8700cc3d966a5e743
@@ -14,6 +15,6 @@ DIST coreutils-9.5.tar.xz.sig 833 BLAKE2B 37c29984bceee0ff3bffde76712f71dbb118c2
 EBUILD coreutils-8.32-r1.ebuild 5947 BLAKE2B 19f30ddaa57e16326db783e2396ce653c17c8def86422ac517b45ee3869266a6e8c600d926814720b1b79485f1db34e3d8dbad32dcc5ad285987c53ab2dbab27 SHA512 a552a58864edf6a768933f85b6624f82b3bd1bf94c169acf3577394523c2768d6768d5a141283abac760bdab950a1ea394c8f36cf2c0793b8b9a2a1c6dda9622
 EBUILD coreutils-9.4-r1.ebuild 8494 BLAKE2B fdf0bda691689ad97a0c938d91d09f787a8c39f17e99af3ef5720b9aa42f1cd087543fded417d403eac48515095e5a80e93f24037a37e938219696d0407c7f1a SHA512 b360a66ff906e07171ecc124ace3809388154756da4d6f5c19f8f8152d039bb21e3fbdd2db785c4323a98fb8057acb292b044b08acaf4d801f67342ff927916b
 EBUILD coreutils-9.4.ebuild 8396 BLAKE2B 726efb986d7746043c9cdff74c12a66ff74b7910ec5f4a9b437c644132589155c0351df548e38c8eec2f5681bf1906594aebac6b5611880f2d7d80eac3f5b888 SHA512 4ec7e3b01025800a50bc1b5f772ab621411c142891e65cd77c4bc7d163962ac10e13d66e3add569a4caa78d873afbde8f662151f330768af49f5a45fb2b07732
-EBUILD coreutils-9.5.ebuild 8449 BLAKE2B 31a82e6309a20e1d237997a6f4d989c172db42e741ecb3c9e1db3dfdc56029ed49875fcd68a58efc7b9a52dd0084d08531e91ce594453b13dd7ef2f86419f9ff SHA512 ba24a87db5c49f55973ab3a0abbaa0e90f23337785df8d486cf3242da3bf9cf4126c7f060b7da572a34b61e0ff4e3db21f6c9795b0d497f35b8bf75b9bcfaa5f
+EBUILD coreutils-9.5.ebuild 8585 BLAKE2B f69a5f8f43132081c59c3f6458d56ede9bc8392adb6010470535c4d4ebc8a0f64097b87d71467ad7692c9c61c98a2b342546c239f4dcb3721965a351695ba893 SHA512 13af9bd6a7b804b10fa8e058372c9fa59bb9bae7eb2ee4afba873f17c51a3011ce8bb89030c04d840694e4cf6cb8e31ebca07ed7e453c80f1166a61acde78a4c
 EBUILD coreutils-9999.ebuild 8358 BLAKE2B 95219e83ffe8a143b33eb7015539240f1480f922e9817b3dc5b8e8d12d7908ec77158361957cefdfb3146ce95f5849b5ef7eb874c74eeec21fe89c79b058fc61 SHA512 385c4aa80c35ccbfdf64b418a1adba4acd671603f9579d95bc05f10f51cb3904857c7f0e718d889e86601bb95f559f51e2a1aa23068959233465e66422ac5073
 MISC metadata.xml 1093 BLAKE2B 68a653fe54fc668c7f2c7c01904cfca5a071192de4370dcbba427e673f8e9ec33b5104a868a5493117ef24e277446181383140c621b105689797aec4e077b86e SHA512 bf8f2653a1a81edb6e4090b127c5660e0c5ab41a33c985dea1b5cb05c6656b04f42084ce4e561f4550c3e54630893314d3084011c673e7d5aded022be1c065d1
diff --git a/sys-apps/coreutils/coreutils-9.5.ebuild b/sys-apps/coreutils/coreutils-9.5.ebuild
index 3e451f36d7cb..4d92094067f1 100644
--- a/sys-apps/coreutils/coreutils-9.5.ebuild
+++ b/sys-apps/coreutils/coreutils-9.5.ebuild
@@ -121,7 +121,10 @@ src_prepare() {
 	)
 
 	if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
-		PATCHES+=( "${WORKDIR}"/${MY_PATCH} )
+		PATCHES+=(
+			"${WORKDIR}"/${MY_PATCH}
+			"${FILESDIR}"/${PN}-9.5-skip-readutmp-test.patch
+		)
 	fi
 
 	default
@@ -224,9 +227,6 @@ src_test() {
 	local -x gl_public_submodule_commit=
 
 	local xfail_tests=(
-		# bug #629660
-		tests/dd/no-allocate.sh
-
 		# bug #675802
 		tests/env/env-S
 		tests/env/env-S.pl
@@ -245,6 +245,12 @@ src_test() {
 		#tests/touch/not-owner.sh
 	)
 
+	# This test is flaky (bug #629660, bug #935367).
+	cat > tests/dd/no-allocate.sh <<-EOF || die
+	#!/bin/sh
+	exit 77;
+	EOF
+
 	# This test is flaky (bug #910640).
 	cat > tests/tty/tty-eof.pl <<-EOF || die
 	#!/usr/bin/perl
diff --git a/sys-apps/coreutils/files/coreutils-9.5-skip-readutmp-test.patch b/sys-apps/coreutils/files/coreutils-9.5-skip-readutmp-test.patch
new file mode 100644
index 000000000000..3e7c9cf420c0
--- /dev/null
+++ b/sys-apps/coreutils/files/coreutils-9.5-skip-readutmp-test.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/935367
+--- a/gnulib-tests/test-readutmp.c
++++ b/gnulib-tests/test-readutmp.c
+@@ -43,6 +43,9 @@ main (int argc, char *argv[])
+   STRUCT_UTMP *entries;
+   idx_t num_entries;
+ 
++  fprintf (stderr, "Skipping test: Gentoo: examines host entries, so unreliable in ebuild\n");
++  return 77;
++
+   if (read_utmp (UTMP_FILE, &num_entries, &entries, 0) < 0)
+     {
+       #if READ_UTMP_SUPPORTED