[SCM] GNU shishi branch, master, updated. shishi-0-0-40-26-g2066773

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=2066773b613f9c73a58a6ed8afe934c1b2b4c298

The branch, master has been updated
       via  2066773b613f9c73a58a6ed8afe934c1b2b4c298 (commit)
       via  655739a6f835ba3c92877a9192757989d5cb7685 (commit)
       via  550522d431640d1cc1b855c241634b45e3177b6b (commit)
       via  d53dff8f1b4da4bfcaa811ab5f4402170ffaffea (commit)
       via  61834323fb819d3ba178a2abf5fcd10410253061 (commit)
      from  270d193e03654f0d4ac2d11e585e875e7b7e652e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2066773b613f9c73a58a6ed8afe934c1b2b4c298
Author: Simon Josefsson <address@hidden>
Date:   Tue Jan 12 19:51:15 2010 +0100

    Update gnulib files.

commit 655739a6f835ba3c92877a9192757989d5cb7685
Author: Simon Josefsson <address@hidden>
Date:   Tue Jan 12 19:27:20 2010 +0100

    Update gnulib files.

commit 550522d431640d1cc1b855c241634b45e3177b6b
Author: Simon Josefsson <address@hidden>
Date:   Tue Jan 12 19:26:14 2010 +0100

    Fix dup2.

commit d53dff8f1b4da4bfcaa811ab5f4402170ffaffea
Author: Simon Josefsson <address@hidden>
Date:   Tue Jan 12 19:10:52 2010 +0100

    Add.

commit 61834323fb819d3ba178a2abf5fcd10410253061
Author: Simon Josefsson <address@hidden>
Date:   Tue Jan 12 19:09:34 2010 +0100

    Update gnulib files.

-----------------------------------------------------------------------

Summary of changes:
 NEWS                        |    4 ++++
 db/gl/m4/gnulib-common.m4   |   10 +++++++++-
 gl/dup2.c                   |   15 +++++++++++++++
 gl/m4/gc.m4                 |    4 ++--
 gl/m4/gnulib-common.m4      |   10 +++++++++-
 gl/m4/warnings.m4           |   10 +---------
 gl/override/lib/dup2.c.diff |   40 ++++++++++++++++++++++++++++++++++++++++
 gl/stdio.in.h               |    2 +-
 src/gl/m4/gnulib-common.m4  |   10 +++++++++-
 9 files changed, 90 insertions(+), 15 deletions(-)
 create mode 100644 gl/override/lib/dup2.c.diff

diff --git a/NEWS b/NEWS
index 37394bf..ac8a6a1 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ See the end for copying conditions.
 
 ** Add configuration keyword 'quick-random' to speed up libgcrypt.
 
+** Fix libgcrypt detection (problem with libgpg-error dependency).
+
+** Update many gnulib files.
+
 ** API and ABI modifications:
 No changes since last version.
 
diff --git a/db/gl/m4/gnulib-common.m4 b/db/gl/m4/gnulib-common.m4
index d53b9cb..b7812a8 100644
--- a/db/gl/m4/gnulib-common.m4
+++ b/db/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 11
+# gnulib-common.m4 serial 12
 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -52,6 +52,14 @@ m4_ifndef([m4_foreach_w],
   [m4_define([m4_foreach_w],
     [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
 
+# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
+# ----------------------------------------------------
+# Backport of autoconf-2.63b's macro.
+# Remove this macro when we can assume autoconf >= 2.64.
+m4_ifndef([AS_VAR_IF],
+[m4_define([AS_VAR_IF],
+[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
+
 # AC_PROG_MKDIR_P
 # is a backport of autoconf-2.60's AC_PROG_MKDIR_P.
 # Remove this macro when we can assume autoconf >= 2.60.
diff --git a/gl/dup2.c b/gl/dup2.c
index a4422bf..b9b329c 100644
--- a/gl/dup2.c
+++ b/gl/dup2.c
@@ -40,6 +40,7 @@ rpl_dup2 (int fd, int desired_fd)
 {
   int result;
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+  int fd_mode = -1;
   /* If fd is closed, mingw hangs on dup2 (fd, fd).  If fd is open,
      dup2 (fd, fd) returns 0, but all further attempts to use fd in
      future dup2 calls will hang.  */
@@ -59,6 +60,14 @@ rpl_dup2 (int fd, int desired_fd)
       errno = EBADF;
       return -1;
     }
+  /* Wine 1.0.1 puts desired_fd into binary mode when fd is in text
+     mode, so we save the old mode here.
+     http://bugs.winehq.org/show_bug.cgi?id=21291 */
+  if ((HANDLE) _get_osfhandle (fd) != (HANDLE) -1)
+    {
+      fd_mode = setmode (fd, O_BINARY);
+      setmode (fd, fd_mode);
+    }
 # endif
   result = dup2 (fd, desired_fd);
 # ifdef __linux__
@@ -80,6 +89,12 @@ rpl_dup2 (int fd, int desired_fd)
   if (fd != desired_fd && result != -1)
     result = _gl_register_dup (fd, result);
 # endif
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+  /* Restore text mode if needed.
+     http://bugs.winehq.org/show_bug.cgi?id=21291 */
+  if (result != -1 && fd_mode != -1)
+    setmode (desired_fd, fd_mode);
+# endif
   return result;
 }
 
diff --git a/gl/m4/gc.m4 b/gl/m4/gc.m4
index b43e30b..f237d8d 100644
--- a/gl/m4/gc.m4
+++ b/gl/m4/gc.m4
@@ -1,4 +1,4 @@
-# gc.m4 serial 5
+# gc.m4 serial 6
 dnl Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@ AC_DEFUN([gl_GC],
     AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]),
     libgcrypt=$withval, libgcrypt=no)
   if test "$libgcrypt" != no; then
-    AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
+    AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>])
   fi
   if test "$ac_cv_libgcrypt" = yes; then
     AC_LIBOBJ([gc-libgcrypt])
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index d53b9cb..b7812a8 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 11
+# gnulib-common.m4 serial 12
 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -52,6 +52,14 @@ m4_ifndef([m4_foreach_w],
   [m4_define([m4_foreach_w],
     [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
 
+# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
+# ----------------------------------------------------
+# Backport of autoconf-2.63b's macro.
+# Remove this macro when we can assume autoconf >= 2.64.
+m4_ifndef([AS_VAR_IF],
+[m4_define([AS_VAR_IF],
+[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
+
 # AC_PROG_MKDIR_P
 # is a backport of autoconf-2.60's AC_PROG_MKDIR_P.
 # Remove this macro when we can assume autoconf >= 2.60.
diff --git a/gl/m4/warnings.m4 b/gl/m4/warnings.m4
index 2745d73..dad5c1f 100644
--- a/gl/m4/warnings.m4
+++ b/gl/m4/warnings.m4
@@ -6,14 +6,6 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 dnl From Simon Josefsson
 
-# gl_AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
-# ----------------------------------------------------
-# Provide the functionality of AS_VAR_IF if Autoconf does not have it.
-m4_ifdef([AS_VAR_IF],
-[m4_copy([AS_VAR_IF], [gl_AS_VAR_IF])],
-[m4_define([gl_AS_VAR_IF],
-[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
-
 # gl_AS_VAR_APPEND(VAR, VALUE)
 # ----------------------------
 # Provide the functionality of AS_VAR_APPEND if Autoconf does not have it.
@@ -37,7 +29,7 @@ AC_CACHE_CHECK([whether compiler handles $1], [gl_Warn], [
   CPPFLAGS="$save_CPPFLAGS"
 ])
 AS_VAR_PUSHDEF([gl_Flags], m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]))dnl
-gl_AS_VAR_IF([gl_Warn], [yes], [gl_AS_VAR_APPEND([gl_Flags], [" $1"])])
+AS_VAR_IF([gl_Warn], [yes], [gl_AS_VAR_APPEND([gl_Flags], [" $1"])])
 AS_VAR_POPDEF([gl_Flags])dnl
 AS_VAR_POPDEF([gl_Warn])dnl
 m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl
diff --git a/gl/override/lib/dup2.c.diff b/gl/override/lib/dup2.c.diff
new file mode 100644
index 0000000..e48354d
--- /dev/null
+++ b/gl/override/lib/dup2.c.diff
@@ -0,0 +1,40 @@
+diff --git a/gltests/dup2.c b/gltests/dup2.c
+index a4422bf..b9b329c 100644
+--- a/gltests/dup2.c
++++ b/gltests/dup2.c
+@@ -40,6 +40,7 @@ rpl_dup2 (int fd, int desired_fd)
+ {
+   int result;
+ # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
++  int fd_mode = -1;
+   /* If fd is closed, mingw hangs on dup2 (fd, fd).  If fd is open,
+      dup2 (fd, fd) returns 0, but all further attempts to use fd in
+      future dup2 calls will hang.  */
+@@ -59,6 +60,14 @@ rpl_dup2 (int fd, int desired_fd)
+       errno = EBADF;
+       return -1;
+     }
++  /* Wine 1.0.1 puts desired_fd into binary mode when fd is in text
++     mode, so we save the old mode here.
++     http://bugs.winehq.org/show_bug.cgi?id=21291 */
++  if ((HANDLE) _get_osfhandle (fd) != (HANDLE) -1)
++    {
++      fd_mode = setmode (fd, O_BINARY);
++      setmode (fd, fd_mode);
++    }
+ # endif
+   result = dup2 (fd, desired_fd);
+ # ifdef __linux__
+@@ -80,6 +89,12 @@ rpl_dup2 (int fd, int desired_fd)
+   if (fd != desired_fd && result != -1)
+     result = _gl_register_dup (fd, result);
+ # endif
++# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
++  /* Restore text mode if needed.
++     http://bugs.winehq.org/show_bug.cgi?id=21291 */
++  if (result != -1 && fd_mode != -1)
++    setmode (desired_fd, fd_mode);
++# endif
+   return result;
+ }
+ 
diff --git a/gl/stdio.in.h b/gl/stdio.in.h
index 80c1d44..284af8c 100644
--- a/gl/stdio.in.h
+++ b/gl/stdio.in.h
@@ -297,7 +297,7 @@ _GL_WARN_ON_USE (fseek, "fseek cannot handle files larger 
than 4 GB "
 #  define _GL_FTELL_WARN /* Category 2, above.  */
 #  undef ftell
 # endif
-# if && @REPLACE_FTELL@
+# if @REPLACE_FTELL@
 #  undef ftell
 #  define ftell rpl_ftell
 extern long ftell (FILE *fp) _GL_ARG_NONNULL ((1));
diff --git a/src/gl/m4/gnulib-common.m4 b/src/gl/m4/gnulib-common.m4
index d53b9cb..b7812a8 100644
--- a/src/gl/m4/gnulib-common.m4
+++ b/src/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 11
+# gnulib-common.m4 serial 12
 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -52,6 +52,14 @@ m4_ifndef([m4_foreach_w],
   [m4_define([m4_foreach_w],
     [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
 
+# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
+# ----------------------------------------------------
+# Backport of autoconf-2.63b's macro.
+# Remove this macro when we can assume autoconf >= 2.64.
+m4_ifndef([AS_VAR_IF],
+[m4_define([AS_VAR_IF],
+[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
+
 # AC_PROG_MKDIR_P
 # is a backport of autoconf-2.60's AC_PROG_MKDIR_P.
 # Remove this macro when we can assume autoconf >= 2.60.


hooks/post-receive
-- 
GNU shishi