From 720f1ce7ccd3d9bd4c364320f266fb93200baea0 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 18 Dec 2025 07:57:44 +0000 Subject: [PATCH] sys-apps/coreutils: restore utmp test skip Seems I dropped this accidentally in >=9.6. Bug: https://bugs.gentoo.org/935367 Signed-off-by: Sam James --- sys-apps/coreutils/coreutils-9.9-r10.ebuild | 1 + sys-apps/coreutils/coreutils-9.9.ebuild | 1 + sys-apps/coreutils/coreutils-9999.ebuild | 1 + .../files/coreutils-9.5-skip-readutmp-test.patch | 13 +++++++++++++ 4 files changed, 16 insertions(+) create mode 100644 sys-apps/coreutils/files/coreutils-9.5-skip-readutmp-test.patch diff --git a/sys-apps/coreutils/coreutils-9.9-r10.ebuild b/sys-apps/coreutils/coreutils-9.9-r10.ebuild index cc5b3c6b7d5ba..3775a9cdeef94 100644 --- a/sys-apps/coreutils/coreutils-9.9-r10.ebuild +++ b/sys-apps/coreutils/coreutils-9.9-r10.ebuild @@ -116,6 +116,7 @@ src_unpack() { src_prepare() { # TODO: past 2025, we may need to add our own hack for bug #907474. local PATCHES=( + "${FILESDIR}"/${PN}-9.5-skip-readutmp-test.patch # Upstream patches ) diff --git a/sys-apps/coreutils/coreutils-9.9.ebuild b/sys-apps/coreutils/coreutils-9.9.ebuild index a4baa527e7e82..325ec80fe1244 100644 --- a/sys-apps/coreutils/coreutils-9.9.ebuild +++ b/sys-apps/coreutils/coreutils-9.9.ebuild @@ -115,6 +115,7 @@ src_unpack() { src_prepare() { # TODO: past 2025, we may need to add our own hack for bug #907474. local PATCHES=( + "${FILESDIR}"/${PN}-9.5-skip-readutmp-test.patch # Upstream patches ) diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild index c7ea3c6527d95..ab2136dcc0cfe 100644 --- a/sys-apps/coreutils/coreutils-9999.ebuild +++ b/sys-apps/coreutils/coreutils-9999.ebuild @@ -116,6 +116,7 @@ src_unpack() { src_prepare() { # TODO: past 2025, we may need to add our own hack for bug #907474. local PATCHES=( + "${FILESDIR}"/${PN}-9.5-skip-readutmp-test.patch # Upstream patches ) 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 0000000000000..3e7c9cf420c01 --- /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