build: update gnulib submodule to latest

This includes a change to propagate the 4th "mount root"
field from /proc/self/mountinfo from the mountlist module,
which is needed in a subsequent commit in df.

* gl/lib/regcomp.c.diff: Regenerate against latest gnulib.
* gl/lib/regex_internal.c.diff: Likewise.
* gl/lib/regex_internal.h.diff: Likewise.
* cfg.mk: Exclude diffs from trailing whitespace check,
which is generally correct, and now needed.

diff --git a/cfg.mk b/cfg.mk
index d38a8dd6debef385e5ec80e62530275169dd6b34..bc5a1e8579fb3d7937e4882beba48725f7fb8c6d 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -673,7 +673,7 @@ sc_gitignore_missing:
              sort | uniq -u | grep . && { echo '$(ME): Add above'      \
                'entries to .gitignore' >&2; exit 1; } || :
 
-# Flag redundant entreis in .gitignore
+# Flag redundant entries in .gitignore
 sc_gitignore_redundant:
        @{ grep ^/lib .gitignore; sed 's|^|/lib|' lib/.gitignore; } |   \
            sort | uniq -d | grep . && { echo '$(ME): Remove above'     \
@@ -695,7 +695,8 @@ exclude_file_name_regexp--sc_space_tab = \
   ^(tests/pr/|tests/misc/nl\.sh$$|gl/.*\.diff$$|man/help2man$$)
 exclude_file_name_regexp--sc_bindtextdomain = \
   ^(gl/.*|lib/euidaccess-stat|src/make-prime-list)\.c$$
-exclude_file_name_regexp--sc_trailing_blank = ^(tests/pr/|man/help2man)
+exclude_file_name_regexp--sc_trailing_blank = \
+  ^(tests/pr/|gl/.*\.diff$$|man/help2man)
 exclude_file_name_regexp--sc_system_h_headers = \
   ^src/((system|copy)\.h|make-prime-list\.c)$$
 

diff --git a/gl/lib/regcomp.c.diff b/gl/lib/regcomp.c.diff
index cc6649f2ef8e338583e6efeecc6046d4253c515c..6ee51dad292100769818e78b9307f71d186538dc 100644 (file)
--- a/gl/lib/regcomp.c.diff
+++ b/gl/lib/regcomp.c.diff
@@ -1,8 +1,8 @@
 diff --git a/lib/regcomp.c b/lib/regcomp.c
-index 840220f..192632c 100644
+index 4cbb1b2..ac81318 100644
 --- a/lib/regcomp.c
 +++ b/lib/regcomp.c
-@@ -540,7 +540,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
+@@ -544,7 +544,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
      size_t errbuf_size;
  #else /* size_t might promote */
  size_t
@@ -11,8 +11,8 @@ index 840220f..192632c 100644
          char *_Restrict_ errbuf, size_t errbuf_size)
  #endif
  {
-@@ -1427,7 +1427,7 @@ calc_first (void *extra, bin_tree_t *node)
-
+@@ -1431,7 +1431,7 @@ calc_first (void *extra, bin_tree_t *node)
+ 
  /* Pass 2: compute NEXT on the tree.  Preorder visit.  */
  static reg_errcode_t
 -calc_next (void *extra, bin_tree_t *node)
@@ -20,7 +20,7 @@ index 840220f..192632c 100644
  {
    switch (node->token.type)
      {
-@@ -2820,8 +2820,10 @@ build_range_exp (const reg_syntax_t syntax,
+@@ -2828,8 +2828,10 @@ build_range_exp (const reg_syntax_t syntax,
  static reg_errcode_t
  internal_function
  # ifdef RE_ENABLE_I18N
@@ -33,8 +33,8 @@ index 840220f..192632c 100644
  # else /* not RE_ENABLE_I18N */
  build_collating_symbol (bitset_t sbcset, const unsigned char *name)
  # endif /* not RE_ENABLE_I18N */
-@@ -3389,7 +3391,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
-
+@@ -3399,7 +3401,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
+ 
  static reg_errcode_t
  parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp,
 -                     re_token_t *token, int token_len, re_dfa_t *dfa,
@@ -43,8 +43,8 @@ index 840220f..192632c 100644
                       reg_syntax_t syntax, bool accept_hyphen)
  {
  #ifdef RE_ENABLE_I18N
-@@ -3476,8 +3479,10 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
-
+@@ -3486,8 +3489,10 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
+ 
  static reg_errcode_t
  #ifdef RE_ENABLE_I18N
 -build_equiv_class (bitset_t sbcset, re_charset_t *mbcset,
@@ -56,9 +56,9 @@ index 840220f..192632c 100644
  #else /* not RE_ENABLE_I18N */
  build_equiv_class (bitset_t sbcset, const unsigned char *name)
  #endif /* not RE_ENABLE_I18N */
-@@ -3883,7 +3888,7 @@ free_token (re_token_t *node)
+@@ -3891,7 +3896,7 @@ free_token (re_token_t *node)
     and its children. */
-
+ 
  static reg_errcode_t
 -free_tree (void *extra, bin_tree_t *node)
 +free_tree (void *extra _UNUSED_PARAMETER_, bin_tree_t *node)

diff --git a/gl/lib/regex_internal.c.diff b/gl/lib/regex_internal.c.diff
index 355cadb42143be7d14a51b02ebcccc2c8e6e0929..2a72e0de78aac04e0d8a95480849902999225a72 100644 (file)
--- a/gl/lib/regex_internal.c.diff
+++ b/gl/lib/regex_internal.c.diff
@@ -1,11 +1,11 @@
 diff --git a/lib/regex_internal.c b/lib/regex_internal.c
-index 36ae6ab..c11ff09 100644
+index 93d7ee9..9b86a07 100644
 --- a/lib/regex_internal.c
 +++ b/lib/regex_internal.c
 @@ -17,6 +17,8 @@
     License along with the GNU C Library; if not, see
     <http://www.gnu.org/licenses/>.  */
-
+ 
 +#include "verify.h"
 +#include "intprops.h"
  static void re_string_construct_common (const char *str, Idx len,

diff --git a/gl/lib/regex_internal.h.diff b/gl/lib/regex_internal.h.diff
index a4d78af2179bcd4097d9dbe28a89e7fa722f4cf2..66ea41714e541f2c31cc6b9d9c5a20984ce67bb9 100644 (file)
--- a/gl/lib/regex_internal.h.diff
+++ b/gl/lib/regex_internal.h.diff
@@ -1,14 +1,14 @@
 diff --git a/lib/regex_internal.h b/lib/regex_internal.h
-index ff486bb..ff85ac8 100644
+index 0307a34..45c2d44 100644
 --- a/lib/regex_internal.h
 +++ b/lib/regex_internal.h
-@@ -863,7 +863,8 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx)
- # ifndef NOT_IN_libc
+@@ -868,7 +868,8 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx)
+ 
  static int
  internal_function __attribute__ ((pure, unused))
 -re_string_elem_size_at (const re_string_t *pstr, Idx idx)
 +re_string_elem_size_at (const re_string_t *pstr _UNUSED_PARAMETER_,
 +                      Idx idx _UNUSED_PARAMETER_)
  {
- #  ifdef _LIBC
+ # ifdef _LIBC
    const unsigned char *p, *extra;

diff --git a/gnulib b/gnulib
index 7ab64d2610ca5aa78006bef91091dfa0268adf64..6439a0af0ca6b0256a4273a8ae0175e896bcc8da 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 7ab64d2610ca5aa78006bef91091dfa0268adf64
+Subproject commit 6439a0af0ca6b0256a4273a8ae0175e896bcc8da