Merge branch 'stable'

Conflicts:
	NEWS.stable

diff --git a/ChangeLog b/ChangeLog
index 7b349ea..528a59f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2009-11-19  Eric Blake  <ebb9@byu.net>
+
+       manywarnings: depend on warnings
+       * modules/manywarnings (Depends-on): Add warnings.
+
+       build: avoid compiler warnings
+       * lib/select.c (rpl_select): Delete unused variable.
+       * lib/setsockopt.c (rpl_setsockopt): Avoid incompatible pointer.
+
+2009-11-18  Eric Blake  <ebb9@byu.net>
+
+       tests: avoid false negative with --with-packager
+       * tests/test-version-etc.sh: Discard packager information.
+       * tests/test-argp-version-etc-1.sh: Likewise.
+       Reported by Mike Frysinger.
+
+       utimens: fix regression on Solaris
+       * m4/utimens.m4 (gl_UTIMENS): Check for BSD bug.
+       * lib/utimens.c (fdutimens): Revert 2009-11-08 change; Solaris 10
+       can only change fd timestamps via futimesat.  Instead, use an
+       additional witness macro to avoid BSD bug.
+       Reported by Jim Meyering.
+
+2009-11-17  Simon Josefsson  <simon@josefsson.org>
+
+       * gnulib-tool: Support LGPLv3+ licenses in module files.  Tiny
+       patch from ludo@gnu.org (Ludovic Courtès).
+
+2009-11-17  Jim Meyering  <meyering@redhat.com>
+
+       version-etc: use proper license string
+       * modules/version-etc (License): Use LGPL, not LGPLv3+.
+       * modules/version-etc-fsf: Likewise.
+
+2009-11-17  Jim Meyering  <meyering@redhat.com>
+
+       version-etc-fsf: relax license to LGPLv3+
+       * modules/version-etc-fsf (License): Relax license.
+
 2009-11-16  Jim Meyering  <meyering@redhat.com>
 
        version-etc: relax license to LGPLv3+

diff --git a/NEWS.stable b/NEWS.stable
index c3414ee..97f66ac 100644 (file)
--- a/NEWS.stable
+++ b/NEWS.stable
@@ -1,6 +1,6 @@
                        Gnulib stable snapshot
                        ----------------------
-  * 20091116-stable
+  * 20091120-stable
 
 Snapshot taken based on:
 
@@ -35,3 +35,12 @@ with the following additional commits:
     * [1b712ba]->[4b4b924] avoid new AC_REQUIRE expanded-before-required warnings
     * [6963723]->[456348e] better AC_REQUIRE expanded-before-required-warning avoidance
     * [1c32714]->[dc372f7] version-etc: relax license to LGPLv3+
+    * [7e52ced]->[3f0179e] version-etc-fsf: relax license to LGPLv3+
+    * [b205080]->[e09f5b5] version-etc: use proper license string
+    * [b9d28ec]->[f2baca9] Add `gnulib-tool --import' support for LGPLv3+.
+    * [d9d9b26]->[6d8c90b] Add.
+    * [0883405]->[72abcbb] utimens: fix regression on Solaris
+    * [8cfd4a9]->[8607d21] tests: avoid false negative with --with-packager
+    * [111e540]->[0028f27] build: avoid compiler warnings
+    * [841ad19]->[c6d977e] manywarnings: depend on warnings
+    * [758f912]->[dd21f46] autoupdate

diff --git a/build-aux/config.guess b/build-aux/config.guess
index 5290569..d53e309 100755 (executable)
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-08'
+timestamp='2009-11-19'
 
 # 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
@@ -891,7 +891,15 @@ EOF
        echo frv-unknown-linux-gnu
        exit ;;
     i*86:Linux:*:*)
-       echo ${UNAME_MACHINE}-pc-linux-gnu
+       LIBC=gnu
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #ifdef __dietlibc__
+       LIBC=dietlibc
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+       echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
        exit ;;
     ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -918,11 +926,7 @@ EOF
        #endif
        #endif
 EOF
-       eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-           /^CPU/{
-               s: ::g
-               p
-           }'`"
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
     or32:Linux:*:*)

diff --git a/gnulib-tool b/gnulib-tool
index aafd345..9efd8d1 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2809,7 +2809,7 @@ func_import ()
           case "$lgpl" in
             yes | 3)
               case $license in
-                LGPL | LGPLv2+) ;;
+                LGPL | LGPLv2+ | LGPLv3+) ;;
                 *) func_append license_incompatibilities "$module $license$nl" ;;
               esac
               ;;

diff --git a/lib/select.c b/lib/select.c
index 12d3e51..e82bf88 100644 (file)
--- a/lib/select.c
+++ b/lib/select.c
@@ -322,8 +322,6 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds,
   /* Classify handles.  Create fd sets for sockets, poll the others. */
   for (i = 0; i < nfds; i++)
     {
-      WSANETWORKEVENTS ev;
-
       if ((anyfds_in[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))) == 0)
        continue;
 

diff --git a/lib/setsockopt.c b/lib/setsockopt.c
index 96a00cc..daff382 100644 (file)
--- a/lib/setsockopt.c
+++ b/lib/setsockopt.c
@@ -41,7 +41,8 @@ rpl_setsockopt (int fd, int level, int optname, const void *optval, socklen_t op
     {
       const struct timeval *tv = optval;
       int milliseconds = tv->tv_sec * 1000 + tv->tv_usec / 1000;
-      r = setsockopt (sock, level, optname, &milliseconds, sizeof (int));
+      optval = &milliseconds;
+      r = setsockopt (sock, level, optname, optval, sizeof (int));
     }
   else
     {

diff --git a/lib/utimens.c b/lib/utimens.c
index bd482d7..eb63487 100644 (file)
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -280,9 +280,9 @@ fdutimens (char const *file, int fd, struct timespec const timespec[2])
       }
     else
       {
-        /* If futimesat (above) or futimes fails here, don't try to speed
-           things up by returning right away.  glibc can incorrectly fail
-           with errno == ENOENT if /proc isn't mounted.  Also, Mandrake 10.0
+        /* If futimesat or futimes fails here, don't try to speed things
+           up by returning right away.  glibc can incorrectly fail with
+           errno == ENOENT if /proc isn't mounted.  Also, Mandrake 10.0
            in high security mode doesn't allow ordinary users to read
            /proc/self, so glibc incorrectly fails with errno == EACCES.
            If errno == EIO, EPERM, or EROFS, it's probably safe to fail
@@ -290,7 +290,10 @@ fdutimens (char const *file, int fd, struct timespec const timespec[2])
            worth optimizing, and who knows what other messed-up systems
            are out there?  So play it safe and fall back on the code
            below.  */
-# if HAVE_FUTIMES
+# if HAVE_FUTIMESAT && !FUTIMESAT_NULL_BUG
+        if (futimesat (fd, NULL, t) == 0)
+          return 0;
+# elif HAVE_FUTIMES
         if (futimes (fd, t) == 0)
           return 0;
 # endif
@@ -299,7 +302,8 @@ fdutimens (char const *file, int fd, struct timespec const timespec[2])
 
     if (!file)
       {
-#if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES))
+#if ! ((HAVE_FUTIMESAT && !FUTIMESAT_NULL_BUG)          \
+        || (HAVE_WORKING_UTIMES && HAVE_FUTIMES))
         errno = ENOSYS;
 #endif
         return -1;

diff --git a/m4/utimens.m4 b/m4/utimens.m4
index 381d087..35ef949 100644 (file)
--- a/m4/utimens.m4
+++ b/m4/utimens.m4
@@ -4,7 +4,7 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-dnl serial 3
+dnl serial 4
 
 AC_DEFUN([gl_UTIMENS],
 [
@@ -15,4 +15,28 @@ AC_DEFUN([gl_UTIMENS],
   AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC])
   AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF])
   AC_CHECK_FUNCS_ONCE([futimes futimesat futimens utimensat lutimes])
+
+  if test $ac_cv_func_futimens = no && test $ac_cv_func_futimesat = yes; then
+    dnl FreeBSD 8.0-rc2 mishandles futimesat(fd,NULL,time).  It is not
+    dnl standardized, but Solaris implemented it first and uses it as
+    dnl its only means to set fd time.
+    AC_CACHE_CHECK([whether futimesat handles NULL file],
+      [gl_cv_func_futimesat_works],
+      [touch conftest.file
+       AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+#include <stddef.h>
+#include <sys/times.h>
+]], [[    int fd = open ("conftest.file", O_RDWR);
+          if (fd < 0) return 1;
+          if (futimesat (fd, NULL, NULL)) return 2;
+        ]])],
+        [gl_cv_func_futimesat_works=yes],
+        [gl_cv_func_futimesat_works=no],
+        [gl_cv_func_futimesat_works="guessing no"])
+      rm -f conftest.file])
+    if test "$gl_cv_func_futimesat_works" != yes; then
+      AC_DEFINE([FUTIMESAT_NULL_BUG], [1],
+        [Define to 1 if futimesat mishandles a NULL file name.])
+    fi
+  fi
 ])

diff --git a/modules/manywarnings b/modules/manywarnings
index fae9221..f557ef0 100644 (file)
--- a/modules/manywarnings
+++ b/modules/manywarnings
@@ -5,6 +5,7 @@ Files:
 m4/manywarnings.m4
 
 Depends-on:
+warnings
 
 configure.ac:
 

diff --git a/modules/version-etc b/modules/version-etc
index ff33256..d4cea5a 100644 (file)
--- a/modules/version-etc
+++ b/modules/version-etc
@@ -20,7 +20,7 @@ Include:
 "version-etc.h"
 
 License:
-LGPLv3+
+LGPL
 
 Maintainer:
 Jim Meyering

diff --git a/modules/version-etc-fsf b/modules/version-etc-fsf
index 698d41a..16663ca 100644 (file)
--- a/modules/version-etc-fsf
+++ b/modules/version-etc-fsf
@@ -15,7 +15,7 @@ lib_SOURCES += version-etc-fsf.c
 Include:
 
 License:
-GPL
+LGPL
 
 Maintainer:
 Jim Meyering

diff --git a/tests/test-argp-version-etc-1.sh b/tests/test-argp-version-etc-1.sh
index d1a14e6..302220e 100755 (executable)
--- a/tests/test-argp-version-etc-1.sh
+++ b/tests/test-argp-version-etc-1.sh
@@ -33,7 +33,8 @@ EOT
 
 ./test-argp-version-etc${EXEEXT} --version |
  sed '1s/test-argp-version-etc (.*) .*/test-argp-version-etc (PROJECT) VERSION/
-      2s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' |
+      /^Packaged by/d
+      2,3 s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' |
  tr -d '\015' |
  diff -c $TMP - || ERR=1
 

diff --git a/tests/test-version-etc.sh b/tests/test-version-etc.sh
index 528fadd..071764a 100755 (executable)
--- a/tests/test-version-etc.sh
+++ b/tests/test-version-etc.sh
@@ -33,7 +33,8 @@ EOT
 
 ./test-version-etc${EXEEXT} --version |
  sed '1s/test-version-etc (.*) .*/test-version-etc (PROJECT) VERSION/
-      2s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' |
+      /^Packaged by/d
+      2,3 s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' |
  tr -d '\015' |
  diff -c $TMP - || ERR=1