From 767ac46858d7cf83f94ba89214103ead589af221 Mon Sep 17 00:00:00 2001
From: oech3 <>
Date: Mon, 1 Dec 2025 00:30:05 +0900
Subject: [PATCH] Backport cp-mv-enotsup-xattr.sh and
 writable-under-readonly.sh from GNU coreutils > 9.9

---
 util/build-gnu.sh | 8 +++++---
 util/why-skip.md  | 6 ------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/util/build-gnu.sh b/util/build-gnu.sh
index 532e905929d..2ab29886ea6 100755
--- a/util/build-gnu.sh
+++ b/util/build-gnu.sh
@@ -5,7 +5,6 @@
 # spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW
 # spell-checker:ignore baddecode submodules xstrtol distros ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed multihardlink texinfo CARGOFLAGS
 # spell-checker:ignore openat TOCTOU CFLAGS
-# spell-checker:ignore hfsplus casefold chattr
 
 set -e
 
@@ -169,8 +168,11 @@ grep -rl 'path_prepend_' tests/* | xargs -r "${SED}" -i 's| path_prepend_ ./src|
 # path_prepend_ sets $abs_path_dir_: set it manually instead.
 grep -rl '\$abs_path_dir_' tests/*/*.sh | xargs -r "${SED}" -i "s|\$abs_path_dir_|${UU_BUILD_DIR//\//\\/}|g"
 
-# Remove hfs dependency (should be merged to upstream)
-"${SED}" -i -e "s|hfsplus|ext4 -O casefold|" -e "s|cd mnt|rm -d mnt/lost+found;chattr +F mnt;cd mnt|" tests/mv/hardlink-case.sh
+# Backport tests fixed at GNU coreutils > 9.9
+curl https://raw.githubusercontent.com/coreutils/coreutils/refs/heads/master/tests/mv/hardlink-case.sh > tests/mv/hardlink-case.sh
+# spell-checker:ignore enotsup
+curl https://raw.githubusercontent.com/coreutils/coreutils/refs/heads/master/tests/cp/cp-mv-enotsup-xattr.sh > tests/cp/cp-mv-enotsup-xattr.sh
+curl https://raw.githubusercontent.com/coreutils/coreutils/refs/heads/master/tests/mkdir/writable-under-readonly.sh > tests/mkdir/writable-under-readonly.sh
 
 # Use the system coreutils where the test fails due to error in a util that is not the one being tested
 "${SED}" -i "s|grep '^#define HAVE_CAP 1' \$CONFIG_HEADER > /dev/null|true|"  tests/ls/capability.sh
diff --git a/util/why-skip.md b/util/why-skip.md
index 48d0b6fc286..3c9ec08ebb6 100644
--- a/util/why-skip.md
+++ b/util/why-skip.md
@@ -13,9 +13,6 @@
 = LD_PRELOAD was ineffective? =
 * tests/cp/nfs-removal-race.sh
 
-= temporarily disabled =
-* tests/mkdir/writable-under-readonly.sh
-
 = this system lacks SMACK support =
 * tests/mkdir/smack-root.sh
 * tests/mkdir/smack-no-root.sh
@@ -54,9 +51,6 @@
 = no rootfs in mtab =
 * tests/df/skip-rootfs.sh
 
-= insufficient mount/ext2 support =
-* tests/cp/cp-mv-enotsup-xattr.sh
-
 = requires controlling input terminal =
 * tests/misc/stty-pairs.sh
 * tests/misc/stty.sh