sys-apps/coreutils: Sync with Gentoo

It's from Gentoo commit de734646c040c20459e4dc79976387d0578de3ee.
This commit is contained in:
Flatcar Buildbot 2024-07-16 11:23:46 +00:00 committed by Mathieu Tortuyaux
parent c8059b65b2
commit c4ae907366
No known key found for this signature in database
GPG Key ID: AC5CCFB52545D9B8
2 changed files with 24 additions and 5 deletions

View File

@ -33,7 +33,7 @@ else
verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) 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 fi
SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )" 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 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 fi
default default
@ -224,9 +227,6 @@ src_test() {
local -x gl_public_submodule_commit= local -x gl_public_submodule_commit=
local xfail_tests=( local xfail_tests=(
# bug #629660
tests/dd/no-allocate.sh
# bug #675802 # bug #675802
tests/env/env-S tests/env/env-S
tests/env/env-S.pl tests/env/env-S.pl
@ -245,6 +245,12 @@ src_test() {
#tests/touch/not-owner.sh #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). # This test is flaky (bug #910640).
cat > tests/tty/tty-eof.pl <<-EOF || die cat > tests/tty/tty-eof.pl <<-EOF || die
#!/usr/bin/perl #!/usr/bin/perl

View File

@ -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