Merge from Gnulib

This incorporates:
2018-01-05 maint: Add encoding marker for Emacs to non-ASCII sources
2018-01-04 update-copyright: Handle use of ©
2018-01-04 pthread_sigmask: Avoid compilation error on mingw
2018-01-02 stat-time: silence -Wunused-parameter regression
* build-aux/config.guess, build-aux/config.sub:
* build-aux/update-copyright, doc/misc/texinfo.tex, lib/gnulib.mk.in:
* lib/md5.c, lib/md5.h, lib/sha1.c, lib/sha1.h, lib/sha256.c:
* lib/sha256.h, lib/sha512.c, lib/sha512.h, lib/signal.in.h:
* lib/stat-time.h: Copy from Gnulib, or regenerate.

diff --git a/build-aux/config.guess b/build-aux/config.guess
index 6be308dd9c752b970ab6cf4665acdfe21473044d..588fe82a42aa7014df8c77615d9efb0cdd881506 100755 (executable)
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2017-12-17'
+timestamp='2018-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

diff --git a/build-aux/config.sub b/build-aux/config.sub
index 9e84c010ecfdb3a4bb0d5475bb5b8a789ed7feee..f2632cd8a2be180cc957624e84044347eba9e263 100755 (executable)
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2017-11-23'
+timestamp='2018-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index 5b11e306cdcf5ee86db6e195063a567c5b542a90..3bb26abea1b661edf3c5160de40434ee0eb9458b 100755 (executable)
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" "$@"'
     if 0;
 # Update an FSF copyright year list to include the current year.
 
-my $VERSION = '2017-09-13.06:45'; # UTC
+my $VERSION = '2018-01-04.14:48'; # UTC
 
 # Copyright (C) 2009-2018 Free Software Foundation, Inc.
 #
@@ -81,6 +81,7 @@ my $VERSION = '2017-09-13.06:45'; # UTC
 #        B. (c)
 #        C. @copyright{}
 #        D. ©
+#        E. ©
 #
 #   4. The "Copyright" appears at the beginning of a line, except that it
 #      may be prefixed by any sequence (e.g., a comment) of no more than
@@ -124,7 +125,7 @@ use strict;
 use warnings;
 
 my $copyright_re = 'Copyright';
-my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©)';
+my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©|©)';
 my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
 $holder ||= 'Free Software Foundation, Inc.';
 my $prefix_max = 5;
@@ -263,7 +264,9 @@ else
     print STDERR "$ARGV: warning: copyright statement not found\n";
   }
 
+# Hey Emacs!
 # Local variables:
+# coding: utf-8
 # mode: perl
 # indent-tabs-mode: nil
 # eval: (add-hook 'write-file-hooks 'time-stamp)

diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index b0179d6b0074c4ce29af0d952b43ad1d1809219b..1987c50ba264f7e82d8d17e3ee7b075ecc053e5e 100644 (file)
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -5,7 +5,10 @@
 %
 \def\texinfoversion{2017-12-26.21}
 %
-% Copyright 1985-1986, 1988, 1990-2018 Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
+% Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as

diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index ee9e6bd12e1c861a1e86e10d1c6e4020b1d1b6d3..71c01e3e2a2fa8b7a3d7db7b1783c3113b7f004d 100644 (file)
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -945,7 +945,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@

diff --git a/lib/md5.c b/lib/md5.c
index 8bdd4a7884ba35ccdd3238c5ad07f5b757da5f9f..9dc915e2cf0f9d322f91729991a81b35e1b19237 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -469,3 +469,10 @@ md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
   ctx->D = D;
 }
 #endif
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */

diff --git a/lib/md5.h b/lib/md5.h
index 4adfcdd9cfd8f4ce39273ec0d050106172209863..d89f819a97b00e85d325ebf5bb46a887115d8776 100644 (file)
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -133,3 +133,10 @@ extern int __md5_stream (FILE *stream, void *resblock) __THROW;
 # endif
 
 #endif /* md5.h */
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */

diff --git a/lib/sha1.c b/lib/sha1.c
index 89a0f71e2039bb18a3aaa7557e5add36b7cc68a0..ce0f0b2e71fb560c224751fa3cb00a55612e87c9 100644 (file)
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -434,3 +434,10 @@ sha1_process_block (const void *buffer, size_t len, struct sha1_ctx *ctx)
     }
 }
 #endif
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */

diff --git a/lib/sha1.h b/lib/sha1.h
index 62c507bbdf0fa49f8a2faf809fc96e67e56f459d..b1db15da1e7cbcc8c5e5c96782bbd10661a68e0a 100644 (file)
--- a/lib/sha1.h
+++ b/lib/sha1.h
@@ -98,3 +98,10 @@ extern int sha1_stream (FILE *stream, void *resblock);
 # endif
 
 #endif
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */

diff --git a/lib/sha256.c b/lib/sha256.c
index 2f28fcd7100e887c32c6ea2bd847b789aea2cefe..85405b20fdf481f4255ee6689a52be389517274f 100644 (file)
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -577,3 +577,10 @@ sha256_process_block (const void *buffer, size_t len, struct sha256_ctx *ctx)
     }
 }
 #endif
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */

diff --git a/lib/sha256.h b/lib/sha256.h
index ca06691241a4565801669bd87c5ef4c9d0dd82be..e3449864bb674de96b25470c7274943de10ab989 100644 (file)
--- a/lib/sha256.h
+++ b/lib/sha256.h
@@ -101,3 +101,10 @@ extern int sha224_stream (FILE *stream, void *resblock);
 # endif
 
 #endif
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */

diff --git a/lib/sha512.c b/lib/sha512.c
index d6a8ce181a1a5a6aeed19404d9a70cd0608c42e2..8a6dd4e83ac18c66a9350fbf64355ad5ad6916b0 100644 (file)
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -629,3 +629,10 @@ sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx)
     }
 }
 #endif
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */

diff --git a/lib/sha512.h b/lib/sha512.h
index 516e75b30139d2def14605f2c4a56814ba89230e..6a0aadba02fdbd13c716394df770443be5e38a56 100644 (file)
--- a/lib/sha512.h
+++ b/lib/sha512.h
@@ -104,3 +104,10 @@ extern int sha384_stream (FILE *stream, void *resblock);
 # endif
 
 #endif
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */

diff --git a/lib/signal.in.h b/lib/signal.in.h
index 483413dc7f5a907120950f077352f23e5cb8fdbc..7d4927b828e4680216743e7c6366cfd5e00d9256 100644 (file)
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -137,7 +137,7 @@ _GL_FUNCDECL_RPL (pthread_sigmask, int,
 _GL_CXXALIAS_RPL (pthread_sigmask, int,
                   (int how, const sigset_t *new_mask, sigset_t *old_mask));
 # else
-#  if !@HAVE_PTHREAD_SIGMASK@
+#  if !(@HAVE_PTHREAD_SIGMASK@ || defined pthread_sigmask)
 _GL_FUNCDECL_SYS (pthread_sigmask, int,
                   (int how, const sigset_t *new_mask, sigset_t *old_mask));
 #  endif

diff --git a/lib/stat-time.h b/lib/stat-time.h
index 5f8bf4e126f7a706df164b7d0056c350492a80c3..104f53766829c5aa3709d9b6bfa7657799813bae 100644 (file)
--- a/lib/stat-time.h
+++ b/lib/stat-time.h
@@ -102,15 +102,13 @@ get_stat_mtime_ns (struct stat const *st)
 
 /* Return the nanosecond component of *ST's birth time.  */
 _GL_STAT_TIME_INLINE long int _GL_ATTRIBUTE_PURE
-get_stat_birthtime_ns (struct stat const *st)
+get_stat_birthtime_ns (struct stat const *st _GL_UNUSED)
 {
 # if defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC
   return STAT_TIMESPEC (st, st_birthtim).tv_nsec;
 # elif defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC
   return STAT_TIMESPEC_NS (st, st_birthtim);
 # else
-  /* Avoid a "parameter unused" warning.  */
-  (void) st;
   return 0;
 # endif
 }
@@ -160,7 +158,7 @@ get_stat_mtime (struct stat const *st)
 /* Return *ST's birth time, if available; otherwise return a value
    with tv_sec and tv_nsec both equal to -1.  */
 _GL_STAT_TIME_INLINE struct timespec _GL_ATTRIBUTE_PURE
-get_stat_birthtime (struct stat const *st)
+get_stat_birthtime (struct stat const *st _GL_UNUSED)
 {
   struct timespec t;
 
@@ -184,8 +182,6 @@ get_stat_birthtime (struct stat const *st)
   /* Birth time is not supported.  */
   t.tv_sec = -1;
   t.tv_nsec = -1;
-  /* Avoid a "parameter unused" warning.  */
-  (void) st;
 #endif
 
 #if (defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC \
@@ -212,7 +208,7 @@ get_stat_birthtime (struct stat const *st)
    errno to EOVERFLOW if normalization overflowed.  This function
    is intended to be private to this .h file.  */
 _GL_STAT_TIME_INLINE int
-stat_time_normalize (int result, struct stat *st)
+stat_time_normalize (int result, struct stat *st _GL_UNUSED)
 {
 #if defined __sun && defined STAT_TIMESPEC
   if (result == 0)