[SCM] GNU libidn branch, master, updated. libidn-1-26-3-g6caa24a

[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 libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=6caa24ad0ce9506346a8d7d47b64b864b701fd1b

The branch, master has been updated
       via  6caa24ad0ce9506346a8d7d47b64b864b701fd1b (commit)
       via  a285e144e00aa9594c83e1bbb0ddc8918d77e76c (commit)
       via  c8b5fc93cd80d42993cf8303e58ac6f105121ede (commit)
      from  ec6c14a46a926972bd57ee574f719406b08272dc (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 6caa24ad0ce9506346a8d7d47b64b864b701fd1b
Author: Simon Josefsson <address@hidden>
Date:   Wed Dec 12 09:51:17 2012 +0100

    Update gnulib files.

commit a285e144e00aa9594c83e1bbb0ddc8918d77e76c
Author: Simon Josefsson <address@hidden>
Date:   Tue Dec 11 17:12:12 2012 +0100

    Fix release rules.

commit c8b5fc93cd80d42993cf8303e58ac6f105121ede
Author: Simon Josefsson <address@hidden>
Date:   Tue Dec 11 17:12:06 2012 +0100

    More release dependencies.

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

Summary of changes:
 HACKING                    |   21 +++++++++++++--------
 build-aux/gnupload         |   17 ++++++++++-------
 cfg.mk                     |    6 +++++-
 gl/m4/extern-inline.m4     |   20 +++++++++++++-------
 lib/gl/m4/extern-inline.m4 |   20 +++++++++++++-------
 5 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/HACKING b/HACKING
index 5a9aea4..8dccbf2 100644
--- a/HACKING
+++ b/HACKING
@@ -28,11 +28,6 @@ We require several tools to build the software, including:
 - gjdoc <http://www.gnu.org/software/classpath/cp-tools/> (for java port)
 - Mono mcs <http://www.mono.org/> (for C# port)
 - fig2dev <http://www-epb.lbl.gov/xfig/>
-- Mingw (optional, to produce Windows binaries)
-- Wine (optional, to self-check Windows binaries)
-- Lcov (optional, to produce coverage HTML pages)
-- Clang (optional, to produce clang analysis)
-- Doxygen (optional, to produce doxygen manual)
 
 The required software is typically distributed with your operating
 system, and the instructions for installing them differ.  Here are
@@ -42,8 +37,7 @@ gNewSense/Debian/Ubuntu:
 apt-get install make git-core autoconf automake libtool gettext cvs
 apt-get install texinfo texlive texlive-generic-recommended texlive-extra-utils
 apt-get install help2man gtk-doc-tools valgrind gengetopt
-apt-get install gcj-jdk gjdoc transfig mono-mcs binfmt-support gperf
-apt-get install mingw-w64 wine binfmt-support zip lcov
+apt-get install gcj-jdk gjdoc transfig mono-mcs gperf
 
 To download the version controlled sources:
 
@@ -71,7 +65,18 @@ by putting the following in your ~/.valgrindrc:
 To prepare releases (see rules in cfg.mk) you need some additional
 tools:
 
-apt-get install pmccabe mingw-w64 wine clang lcov
+- Mingw (to produce Windows binaries)
+- Wine (to self-check Windows binaries)
+- Lcov (to produce coverage HTML pages)
+- Zip (to pack Windows binaries)
+- Clang (to produce clang analysis)
+- Doxygen (to produce doxygen manual)
+- pmccabe (to produce cyclomatic code complexity report)
+- ncftpput (to upload source tarballs)
+
+gNewSense/Debian/Ubuntu:
+apt-get install mingw-w64 wine binfmt-support lcov zip
+apt-get install clang doxygen pmccabe ncftp
 
 Happy hacking!
 
diff --git a/build-aux/gnupload b/build-aux/gnupload
index a0e5c7b..6eecef4 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2012-06-11.00; # UTC
+scriptversion=2012-12-11.16; # UTC
 
 # Copyright (C) 2004-2012 Free Software Foundation, Inc.
 #
@@ -242,6 +242,8 @@ fi
 
 # Make sure passphrase is not exported in the environment.
 unset passphrase
+unset passphrase_fd_0
+GNUPGHOME=${GNUPGHOME:-$HOME/.gnupg}
 
 # Reset PATH to be sure that echo is a built-in.  We will later use
 # 'echo $passphrase' to output the passphrase, so it is important that
@@ -249,12 +251,13 @@ unset passphrase
 # listings with their arguments...).
 # Remember this script runs with 'set -e', so if echo is not built-in
 # it will exit now.
-if $dry_run; then :; else
+if $dry_run || grep -q "^use-agent" $GNUPGHOME/gpg.conf; then :; else
   PATH=/empty echo -n "Enter GPG passphrase: "
   stty -echo
   read -r passphrase
   stty echo
   echo
+  passphrase_fd_0="--passphrase-fd 0"
 fi
 
 if test $# -ne 0; then
@@ -262,7 +265,7 @@ if test $# -ne 0; then
   do
     echo "Signing $file ..."
     rm -f $file.sig
-    echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file
+    echo "$passphrase" | $dbg $GPG $passphrase_fd_0 -ba -o $file.sig $file
   done
 fi
 
@@ -320,12 +323,12 @@ upload ()
   case $dest in
     alpha.gnu.org:*)
       mkdirective "$destdir" "$base" "$file" "$stmt"
-      echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign 
$base.directive
+      echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign 
$base.directive
       $dbg ncftpput ftp-upload.gnu.org /incoming/alpha $files 
$base.directive.asc
       ;;
     ftp.gnu.org:*)
       mkdirective "$destdir" "$base" "$file" "$stmt"
-      echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign 
$base.directive
+      echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign 
$base.directive
       $dbg ncftpput ftp-upload.gnu.org /incoming/ftp $files $base.directive.asc
       ;;
     savannah.gnu.org:*)
@@ -344,7 +347,7 @@ upload ()
       destdir_p1=`echo "$destdir" | sed 's,^[^/]*/,,'`
       destdir_topdir=`echo "$destdir" | sed 's,/.*,,'`
       mkdirective "$destdir_p1" "$base" "$file" "$stmt"
-      echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign 
$base.directive
+      echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign 
$base.directive
       for f in $files $base.directive.asc
       do
         echo put $f
@@ -353,7 +356,7 @@ upload ()
     /*)
       dest_host=`echo "$dest" | sed 's,:.*,,'`
       mkdirective "$destdir" "$base" "$file" "$stmt"
-      echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign 
$base.directive
+      echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign 
$base.directive
       $dbg cp $files $base.directive.asc $dest_host
       ;;
     *)
diff --git a/cfg.mk b/cfg.mk
index c639363..db1f9c8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -121,7 +121,8 @@ gendoc-upload:
        cd $(htmldir) && \
                cvs add manual || true && \
                cvs add manual/html_node || true && \
-               cvs add -kb manual/*.gz manual/*.pdf || true && \
+               cvs add -kb manual/*.gz manual/*.pdf \
+                       manual/html_node/*.png || true && \
                cvs add manual/*.txt manual/*.html \
                        manual/html_node/*.html || true && \
                cvs commit -m "Update." manual/
@@ -155,6 +156,9 @@ doxygen-copy:
 
 doxygen-upload:
        cd $(htmldir) && \
+               cvs add doxygen || true && \
+               cvs add -kb doxygen/*.png || true && \
+               cvs add doxygen/*.js doxygen/*.html || true && \
                cvs commit -m "Update." doxygen/
 
 ChangeLog:
diff --git a/gl/m4/extern-inline.m4 b/gl/m4/extern-inline.m4
index 2492260..0a9fc9a 100644
--- a/gl/m4/extern-inline.m4
+++ b/gl/m4/extern-inline.m4
@@ -16,13 +16,19 @@ AC_DEFUN([gl_EXTERN_INLINE],
      when FOO is an inline function in the header; see
      <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
    _GL_INLINE_HEADER_END contains useful stuff to put
-     in the same include file, after uses of _GL_INLINE.  */
-#if (__GNUC__ \
-     ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-     : 199901L <= __STDC_VERSION__)
+     in the same include file, after uses of _GL_INLINE.
+
+   Suppress the use of extern inline on Apple's platforms,
+   as Libc-825.25 (2012-09-19) is incompatible with it; see
+   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+   Perhaps Apple will fix this some day.  */
+#if ((__GNUC__ \
+      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+      : 199901L <= __STDC_VERSION__) \
+     && !defined __APPLE__)
 # define _GL_INLINE inline
 # define _GL_EXTERN_INLINE extern inline
-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
 # if __GNUC_GNU_INLINE__
    /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
 #  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
@@ -31,8 +37,8 @@ AC_DEFUN([gl_EXTERN_INLINE],
 # endif
 # define _GL_EXTERN_INLINE extern
 #else
-# define _GL_INLINE static
-# define _GL_EXTERN_INLINE static
+# define _GL_INLINE static _GL_UNUSED
+# define _GL_EXTERN_INLINE static _GL_UNUSED
 #endif
 
 #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
diff --git a/lib/gl/m4/extern-inline.m4 b/lib/gl/m4/extern-inline.m4
index 2492260..0a9fc9a 100644
--- a/lib/gl/m4/extern-inline.m4
+++ b/lib/gl/m4/extern-inline.m4
@@ -16,13 +16,19 @@ AC_DEFUN([gl_EXTERN_INLINE],
      when FOO is an inline function in the header; see
      <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
    _GL_INLINE_HEADER_END contains useful stuff to put
-     in the same include file, after uses of _GL_INLINE.  */
-#if (__GNUC__ \
-     ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-     : 199901L <= __STDC_VERSION__)
+     in the same include file, after uses of _GL_INLINE.
+
+   Suppress the use of extern inline on Apple's platforms,
+   as Libc-825.25 (2012-09-19) is incompatible with it; see
+   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+   Perhaps Apple will fix this some day.  */
+#if ((__GNUC__ \
+      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+      : 199901L <= __STDC_VERSION__) \
+     && !defined __APPLE__)
 # define _GL_INLINE inline
 # define _GL_EXTERN_INLINE extern inline
-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
 # if __GNUC_GNU_INLINE__
    /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
 #  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
@@ -31,8 +37,8 @@ AC_DEFUN([gl_EXTERN_INLINE],
 # endif
 # define _GL_EXTERN_INLINE extern
 #else
-# define _GL_INLINE static
-# define _GL_EXTERN_INLINE static
+# define _GL_INLINE static _GL_UNUSED
+# define _GL_EXTERN_INLINE static _GL_UNUSED
 #endif
 
 #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)


hooks/post-receive
-- 
GNU libidn