refresh of the patches

uutils · Jan 13, 2025 · 664e118 · 664e118
1 parent 14dd663
commit 664e118
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/util/build-gnu.sh b/util/build-gnu.sh
@@ -223,7 +223,6 @@ grep -rlE '/usr/local/bin/\s?/usr/local/bin' init.cfg tests/* | xargs -r sed -Ei
 export QUILT_PATCHES="${ME_dir}/gnu-patches/"
 ls ${QUILT_PATCHES}/
 cd "$path_GNU"
-quilt setup ${QUILT_PATCHES}/series
 quilt push -a
 
 sed -i -e "s|rm: cannot remove 'e/slink'|rm: cannot remove 'e'|g" tests/rm/fail-eacces.sh

diff --git a/util/gnu-patches/debug-stat-nano.patch b/util/gnu-patches/debug-stat-nano.patch
@@ -13,31 +13,31 @@ Index: gnu/tests/stat/stat-nanoseconds.sh
 @@ -30,17 +30,29 @@ ls --full-time | grep 18:43:33.023456789
    || skip_ this file system does not support sub-second timestamps
 
- test "$(stat -c       %Y k)" =    67413               || fail=1
+ test "$(stat -c       %X k)" =    67413               || fail=1
 +echo $fail
- test "$(stat -c      %.Y k)" =    67413.023456789     || fail=1
+ test "$(stat -c      %.X k)" =    67413.023456789     || fail=1
 +echo $fail
- test "$(stat -c     %.1Y k)" =    67413.0             || fail=1
+ test "$(stat -c     %.1X k)" =    67413.0             || fail=1
 +echo $fail
- test "$(stat -c     %.3Y k)" =    67413.023           || fail=1
+ test "$(stat -c     %.3X k)" =    67413.023           || fail=1
 +echo $fail
- test "$(stat -c     %.6Y k)" =    67413.023456        || fail=1
+ test "$(stat -c     %.6X k)" =    67413.023456        || fail=1
 +echo $fail
- test "$(stat -c     %.9Y k)" =    67413.023456789     || fail=1
+ test "$(stat -c     %.9X k)" =    67413.023456789     || fail=1
 +echo $fail
- test "$(stat -c   %13.6Y k)" =  ' 67413.023456'       || fail=1
+ test "$(stat -c   %13.6X k)" =  ' 67413.023456'       || fail=1
 +echo $fail
- test "$(stat -c  %013.6Y k)" =   067413.023456        || fail=1
+ test "$(stat -c  %013.6X k)" =   067413.023456        || fail=1
 +echo $fail
- test "$(stat -c  %-13.6Y k)" =   '67413.023456 '      || fail=1
+ test "$(stat -c  %-13.6X k)" =   '67413.023456 '      || fail=1
 +echo $fail
- test "$(stat -c  %18.10Y k)" = '  67413.0234567890'   || fail=1
+ test "$(stat -c  %18.10X k)" = '  67413.0234567890'   || fail=1
 +echo $fail
- test "$(stat -c %I18.10Y k)" = '  67413.0234567890'   || fail=1
+ test "$(stat -c %I18.10X k)" = '  67413.0234567890'   || fail=1
 +echo $fail
- test "$(stat -c %018.10Y k)" =  0067413.0234567890    || fail=1
+ test "$(stat -c %018.10X k)" =  0067413.0234567890    || fail=1
 +echo $fail
- test "$(stat -c %-18.10Y k)" =   '67413.0234567890  ' || fail=1
+ test "$(stat -c %-18.10X k)" =   '67413.0234567890  ' || fail=1
 -
 +echo $fail
  Exit $fail
diff --git a/util/gnu-patches/tests_ls_no_cap.patch b/util/gnu-patches/tests_ls_no_cap.patch
@@ -2,15 +2,21 @@ Index: gnu/tests/ls/no-cap.sh
 ===================================================================
 --- gnu.orig/tests/ls/no-cap.sh
 +++ gnu/tests/ls/no-cap.sh
-@@ -27,11 +27,11 @@ setcap 'cap_net_bind_service=ep' file ||
-   skip_ "setcap doesn't work"
+@@ -18,16 +18,16 @@
+
+ . "${srcdir=.}/tests/init.sh";
+ print_ver_ ls
+-require_strace_ capget
++require_strace_ llistxattr
 
  LS_COLORS=ca=1; export LS_COLORS
 -strace -e capget ls --color=always > /dev/null 2> out || fail=1
 -$EGREP 'capget\(' out || skip_ "your ls doesn't call capget"
 +strace -e llistxattr ls --color=always > /dev/null 2> out || fail=1
 +$EGREP 'llistxattr\(' out || skip_ "your ls doesn't call llistxattr"
 
+ rm -f out
+
  LS_COLORS=ca=:; export LS_COLORS
 -strace -e capget ls --color=always > /dev/null 2> out || fail=1
 -$EGREP 'capget\(' out && fail=1