From c4ae90736679bc93c72277a8f60cca35e1f15e3d Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Tue, 16 Jul 2024 11:23:46 +0000
Subject: [PATCH] sys-apps/coreutils: Sync with Gentoo

It's from Gentoo commit de734646c040c20459e4dc79976387d0578de3ee.
---
 .../sys-apps/coreutils/coreutils-9.5.ebuild      | 16 +++++++++++-----
 .../files/coreutils-9.5-skip-readutmp-test.patch | 13 +++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/coreutils/files/coreutils-9.5-skip-readutmp-test.patch

diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.5.ebuild
index 0b4053a9b3..e41798c954 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.5.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 )"
@@ -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/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/files/coreutils-9.5-skip-readutmp-test.patch b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/files/coreutils-9.5-skip-readutmp-test.patch
new file mode 100644
index 0000000000..3e7c9cf420
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/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