From 0ae619f3495dd9456e4a58226e16d3260b623a78 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 3 Jun 2022 17:32:18 -0700 Subject: [PATCH] build: update gnulib submodule to latest * bootstrap: Copy from latest Gnulib. * tests/misc/ls-misc.pl (v_files): Adjust to new Gnulib behavior. --- NEWS | 6 ++++++ bootstrap | 4 ++-- doc/sort-version.texi | 2 ++ gnulib | 2 +- tests/misc/ls-misc.pl | 7 +++---- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 8c3eb9b258..dd37e15252 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,12 @@ GNU coreutils NEWS -*- outline -*- long been documented to be platform-dependent. [bug introduced 1999-05-02 and only partly fixed in coreutils-8.14] +** Changes in behavior + + 'ls -v' and 'sort -V' go back to sorting ".0" before ".A", + reverting to the behavior in coreutils-9.0 and earlier. + This behavior is now documented. + ** New Features factor now accepts the --exponents (-h) option to print factors diff --git a/bootstrap b/bootstrap index 9c14d24f5e..1f375eef2f 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2022-03-21.01; # UTC +scriptversion=2022-06-04.00; # UTC # Bootstrap this package from checked-out sources. @@ -487,7 +487,7 @@ fi # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. found_aux_dir=no -grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ +grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'])' configure.ac \ >/dev/null && found_aux_dir=yes grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ >/dev/null && found_aux_dir=yes diff --git a/doc/sort-version.texi b/doc/sort-version.texi index aa7b0f9d5e..175559f7a2 100644 --- a/doc/sort-version.texi +++ b/doc/sort-version.texi @@ -587,6 +587,8 @@ ASCII letter or tilde, followed by zero or more ASCII letters, digits, or tildes; all repeated zero or more times, and ending at string end. This is equivalent to matching the extended regular expression @code{(\.[A-Za-z~][A-Za-z0-9~]*)*$} in the C locale. +The longest such match is used, except that a suffix is not +allowed to match an entire nonempty string. @item The suffixes are temporarily removed, and the strings are compared diff --git a/gnulib b/gnulib index 9cde39f881..762bd0aa66 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 9cde39f881204e422d4bdad67ab12877d6a8172d +Subproject commit 762bd0aa660b0c1c02597e0d2e5c5fbf9bab1b91 diff --git a/tests/misc/ls-misc.pl b/tests/misc/ls-misc.pl index a2ac60b239..2f4a7c1748 100755 --- a/tests/misc/ls-misc.pl +++ b/tests/misc/ls-misc.pl @@ -114,11 +114,10 @@ sub make_j_d () } my @v_files = ( - '.A', '.Z', '.a', '.z', '.zz~', '.zz', '.zz.~1~', - '.0', '.9', '.zz.0', + '.0', '.9', + '.A', '.Z', '.a', '.z', '.zz~', '.zz', '.zz.~1~', '.zz.0', '0', '9', - 'A', 'Z', 'a', 'z', 'zz~', 'zz', 'zz.~1~', - 'zz.0'); + 'A', 'Z', 'a', 'z', 'zz~', 'zz', 'zz.~1~', 'zz.0'); my $exe_in_subdir = {PRE => sub { make_j_d (); push_ls_colors('ex=01;32') }}; my $remove_j = {POST => sub {unlink 'j/d' or die "j/d: $!\n"; rmdir 'j' or die "j: $!\n"; -- 2.47.2