From MAILER-DAEMON Thu May 10 06:57:44 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SSR44-0000ix-73
	for mharc-libidn-commit@gnu.org; Thu, 10 May 2012 06:57:44 -0400
Received: from eggs.gnu.org ([208.118.235.92]:49039)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SSR41-0000iq-JF
	for libidn-commit@gnu.org; Thu, 10 May 2012 06:57:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SSR3v-0002b1-63
	for libidn-commit@gnu.org; Thu, 10 May 2012 06:57:41 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:56808)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SSR3v-0002aw-2U
	for libidn-commit@gnu.org; Thu, 10 May 2012 06:57:35 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SSR3t-0007sp-VB
	for libidn-commit@gnu.org; Thu, 10 May 2012 10:57:34 +0000
Date: Thu, 10 May 2012 10:57:34 +0000
Message-Id: <E1SSR3t-0007sp-VB@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-24-17-gcf72524
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0949633139994875fc730179ba477ce829195ca5
X-Git-Newrev: cf725246a5585d56ccb14c46bfe2a163342ff21f
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 10 May 2012 10:57:43 -0000

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=cf725246a5585d56ccb14c46bfe2a163342ff21f

The branch, master has been updated
       via  cf725246a5585d56ccb14c46bfe2a163342ff21f (commit)
       via  19cc11e8e0249ba15e4d7988f6a603cbc3ddbc64 (commit)
      from  0949633139994875fc730179ba477ce829195ca5 (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 cf725246a5585d56ccb14c46bfe2a163342ff21f
Author: Nitin A Kamble <nitin.a.kamble@intel.com>
Date:   Thu May 10 12:56:52 2012 +0200

    Fix version controlled build of libidn with automake 1.12.
    
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

commit 19cc11e8e0249ba15e4d7988f6a603cbc3ddbc64
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Apr 27 13:52:03 2012 +0200

    Add.

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

Summary of changes:
 NEWS         |    2 ++
 configure.ac |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index 02a8791..57d9d68 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ Reported by Bartosz Brachaczek <b.brachaczek@gmail.com>.
 ** tests: Ship with a valgrind suppressions file for the strlen issue.
 See bottom of HACKING for discussion.
 
+** Update gnulib files and translations.
+
 ** API and ABI is backwards compatible with the previous version.
 
 * Version 1.24 (released 2012-01-10) [stable]
diff --git a/configure.ac b/configure.ac
index 4725137..dced578 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,10 @@ AC_SUBST(LT_CURRENT, 17)
 AC_SUBST(LT_REVISION, 8)
 AC_SUBST(LT_AGE, 6)
 
+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
+
 AC_PROG_CC
 gl_EARLY
 lgl_EARLY


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Tue May 22 13:26:05 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SWsqT-0004HZ-4l
	for mharc-libidn-commit@gnu.org; Tue, 22 May 2012 13:26:05 -0400
Received: from eggs.gnu.org ([208.118.235.92]:40950)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWsqM-0004HF-Qy
	for libidn-commit@gnu.org; Tue, 22 May 2012 13:26:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWsqK-0004uE-Tl
	for libidn-commit@gnu.org; Tue, 22 May 2012 13:25:58 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:54772)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWsqK-0004u8-QZ
	for libidn-commit@gnu.org; Tue, 22 May 2012 13:25:56 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWsqJ-0002eC-3a
	for libidn-commit@gnu.org; Tue, 22 May 2012 17:25:56 +0000
Date: Tue, 22 May 2012 17:25:55 +0000
Message-Id: <E1SWsqJ-0002eC-3a@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-24-18-g56eacb2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cf725246a5585d56ccb14c46bfe2a163342ff21f
X-Git-Newrev: 56eacb2d1e0575b2638200903609d68058dce727
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 22 May 2012 17:26:04 -0000

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=56eacb2d1e0575b2638200903609d68058dce727

The branch, master has been updated
       via  56eacb2d1e0575b2638200903609d68058dce727 (commit)
      from  cf725246a5585d56ccb14c46bfe2a163342ff21f (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 56eacb2d1e0575b2638200903609d68058dce727
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 16 00:52:54 2012 +0200

    Fix valgrind wording.

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

Summary of changes:
 HACKING |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/HACKING b/HACKING
index b039e56..45fe63f 100644
--- a/HACKING
+++ b/HACKING
@@ -54,10 +54,11 @@ $ make
 $ make check
 
 When building from version controlled sources, some developer specific
-flags are automatically enabled.  Due to compiler optimizations, you
-may run into valgrind false positives.  We ship a Valgrind suppression
-file in tests/libidn.supp and you can use it by putting the following
-in your ~/.valgrindrc:
+flags are automatically enabled.  For example, the self-checks are run
+under valgrind if available.  For various reasons, you may run into
+valgrind false positives that will cause self-checks to fail.  We ship
+a Valgrind suppression file to address common issues.  You can use it
+by putting the following in your ~/.valgrindrc:
 
 --suppressions=/path/to/libidn/tests/libidn.supp
 


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Tue May 22 13:26:42 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SWsr4-0004M3-9n
	for mharc-libidn-commit@gnu.org; Tue, 22 May 2012 13:26:42 -0400
Received: from eggs.gnu.org ([208.118.235.92]:41044)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWsqy-0004KO-JB
	for libidn-commit@gnu.org; Tue, 22 May 2012 13:26:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWsqp-0005Am-SN
	for libidn-commit@gnu.org; Tue, 22 May 2012 13:26:36 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:54797)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWsqp-0005Ag-Ow
	for libidn-commit@gnu.org; Tue, 22 May 2012 13:26:27 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWsqp-0002jD-Ar
	for libidn-commit@gnu.org; Tue, 22 May 2012 17:26:27 +0000
Date: Tue, 22 May 2012 17:26:27 +0000
Message-Id: <E1SWsqp-0002jD-Ar@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-24-19-g7010f02
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 56eacb2d1e0575b2638200903609d68058dce727
X-Git-Newrev: 7010f02429a4d60d61c6b0bc70c896f240c9419c
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 22 May 2012 17:26:41 -0000

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=7010f02429a4d60d61c6b0bc70c896f240c9419c

The branch, master has been updated
       via  7010f02429a4d60d61c6b0bc70c896f240c9419c (commit)
      from  56eacb2d1e0575b2638200903609d68058dce727 (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 7010f02429a4d60d61c6b0bc70c896f240c9419c
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue May 22 19:26:12 2012 +0200

    Revert "Fix version controlled build of libidn with automake 1.12."
    
    This reverts commit cf725246a5585d56ccb14c46bfe2a163342ff21f.

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

Summary of changes:
 configure.ac |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index dced578..4725137 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,6 @@ AC_SUBST(LT_CURRENT, 17)
 AC_SUBST(LT_REVISION, 8)
 AC_SUBST(LT_AGE, 6)
 
-# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-m4_pattern_allow([AM_PROG_AR])
-AM_PROG_AR
-
 AC_PROG_CC
 gl_EARLY
 lgl_EARLY


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Tue May 22 15:16:18 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SWuZ8-0001qt-CU
	for mharc-libidn-commit@gnu.org; Tue, 22 May 2012 15:16:18 -0400
Received: from eggs.gnu.org ([208.118.235.92]:37108)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWuZ1-0001pv-GD
	for libidn-commit@gnu.org; Tue, 22 May 2012 15:16:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWuYt-00030i-Pp
	for libidn-commit@gnu.org; Tue, 22 May 2012 15:16:11 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:32800)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWuYt-00030X-Gj
	for libidn-commit@gnu.org; Tue, 22 May 2012 15:16:03 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SWuYs-0000Oc-SZ
	for libidn-commit@gnu.org; Tue, 22 May 2012 19:16:03 +0000
Date: Tue, 22 May 2012 19:16:02 +0000
Message-Id: <E1SWuYs-0000Oc-SZ@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-24-23-g86db04b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7010f02429a4d60d61c6b0bc70c896f240c9419c
X-Git-Newrev: 86db04b996f18530b9f618b30df972a2665409b0
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 22 May 2012 19:16:17 -0000

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=86db04b996f18530b9f618b30df972a2665409b0

The branch, master has been updated
       via  86db04b996f18530b9f618b30df972a2665409b0 (commit)
       via  864a95df8080bf01bfca48ca9f82d6778c5f249e (commit)
       via  711d53852528e0bd5bab614d321ab4aa5f0436d9 (commit)
       via  c055c0dc564c91e08a4623317cae740b933e3c42 (commit)
      from  7010f02429a4d60d61c6b0bc70c896f240c9419c (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 86db04b996f18530b9f618b30df972a2665409b0
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue May 22 20:27:27 2012 +0200

    Use devhelp2 format.

commit 864a95df8080bf01bfca48ca9f82d6778c5f249e
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue May 22 20:18:11 2012 +0200

    Push to git after doing gnupload.

commit 711d53852528e0bd5bab614d321ab4aa5f0436d9
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue May 22 20:17:21 2012 +0200

    Sync with TP.

commit c055c0dc564c91e08a4623317cae740b933e3c42
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue May 22 20:08:11 2012 +0200

    Update gnulib files.

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

Summary of changes:
 build-aux/snippet/_Noreturn.h         |    2 +-
 cfg.mk                                |    8 +-
 doc/gendocs_template                  |    2 +-
 gl/m4/dup2.m4                         |   23 +++--
 gl/m4/fstat.m4                        |   12 ++-
 gl/m4/getcwd.m4                       |   19 ++--
 gl/m4/gnulib-common.m4                |    3 +-
 gl/m4/gnulib-comp.m4                  |    3 +-
 gl/m4/lstat.m4                        |   33 ++++---
 gl/m4/malloc.m4                       |   40 ++++++++-
 gl/m4/off_t.m4                        |   18 ++++
 gl/m4/putenv.m4                       |   20 +++-
 gl/m4/setenv.m4                       |   38 ++++++--
 gl/m4/stat.m4                         |   10 ++-
 gl/m4/strerror.m4                     |   48 +++++++---
 gl/m4/symlink.m4                      |   20 +++-
 gl/m4/sys_types_h.m4                  |    9 +--
 gl/m4/unistd_h.m4                     |    4 +-
 gl/m4/warnings.m4                     |   47 +++++++---
 gl/override/doc/gendocs_template.diff |    2 +-
 gltests/binary-io.h                   |   41 ++++++---
 gltests/ignore-value.h                |   10 --
 gltests/init.sh                       |    8 ++
 gltests/stdint.in.h                   |   49 +++++++----
 gltests/test-binary-io.c              |   26 ++++--
 gltests/test-binary-io.sh             |    8 +-
 lib/gl/m4/gnulib-common.m4            |    3 +-
 lib/gl/m4/gnulib-comp.m4              |    1 +
 lib/gl/m4/malloc.m4                   |   40 ++++++++-
 lib/gl/m4/off_t.m4                    |   18 ++++
 lib/gl/m4/putenv.m4                   |   20 +++-
 lib/gl/m4/setenv.m4                   |   38 ++++++--
 lib/gl/m4/sys_types_h.m4              |    9 +--
 lib/gl/m4/unistd_h.m4                 |    4 +-
 lib/gl/stdint.in.h                    |   49 +++++++----
 lib/gltests/init.sh                   |    8 ++
 po/id.po.in                           |  161 ++++++++++++++++-----------------
 37 files changed, 577 insertions(+), 277 deletions(-)
 create mode 100644 gl/m4/off_t.m4
 create mode 100644 lib/gl/m4/off_t.m4

diff --git a/build-aux/snippet/_Noreturn.h b/build-aux/snippet/_Noreturn.h
index 1a7b4da..c44ad89 100644
--- a/build-aux/snippet/_Noreturn.h
+++ b/build-aux/snippet/_Noreturn.h
@@ -1,4 +1,4 @@
-#ifndef _Noreturn
+#if !defined _Noreturn && __STDC_VERSION__ < 201112
 # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
       || 0x5110 <= __SUNPRO_C)
 #  define _Noreturn __attribute__ ((__noreturn__))
diff --git a/cfg.mk b/cfg.mk
index cbe01ae..722bc48 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -131,7 +131,7 @@ gtkdoc-copy:
 	cp -v doc/reference/$(PACKAGE).pdf \
 		doc/reference/html/*.html \
 		doc/reference/html/*.png \
-		doc/reference/html/*.devhelp \
+		doc/reference/html/*.devhelp2 \
 		doc/reference/html/*.css \
 		$(htmldir)/reference/
 
@@ -140,7 +140,7 @@ gtkdoc-upload:
 		cvs add reference || true && \
 		cvs add -kb reference/*.png reference/*.pdf || true && \
 		cvs add reference/*.html reference/*.css \
-			reference/*.devhelp || true && \
+			reference/*.devhelp2 || true && \
 		cvs commit -m "Update." reference/
 
 javadoc-copy:
@@ -183,9 +183,9 @@ release-check: syntax-check i18n tarball binaries gendoc-copy gtkdoc-copy covera
 release-upload-www: gendoc-upload gtkdoc-upload coverage-upload clang-upload cyclo-upload javadoc-upload doxygen-upload
 
 release-upload-ftp:
-	git push
-	git push --tags
 	build-aux/gnupload --to ftp.gnu.org:$(PACKAGE) $(distdir).tar.gz
 	cp $(distdir).tar.gz $(distdir).tar.gz.sig ../releases/$(PACKAGE)/
+	git push
+	git push --tags
 
 release: release-check release-upload-www source release-upload-ftp binaries-upload
diff --git a/doc/gendocs_template b/doc/gendocs_template
index 4fbf1c5..c5d84c7 100644
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -69,7 +69,7 @@ this helps support FSF activities.</p>
 <ul>
   <li><a href="../reference/ch01.html">GTK-DOC HTML C/C++ API Reference Manual</a>.
   <li><a href="../reference/%%PACKAGE%%.pdf">PDF Reference API Manual (GTK-DOC)</a>.
-  <li><a href="../reference/libidn.devhelp">GTK-DOC DevHelp C/C++ API Reference Manual</a>.
+  <li><a href="../reference/libidn.devhelp2">DevHelp C/C++ API Reference Manual</a>.
 </ul>
 
 <p>The native Java implementation is documented using Javadoc:
diff --git a/gl/m4/dup2.m4 b/gl/m4/dup2.m4
index dec27fa..fc86e80 100644
--- a/gl/m4/dup2.m4
+++ b/gl/m4/dup2.m4
@@ -1,4 +1,4 @@
-#serial 17
+#serial 18
 dnl Copyright (C) 2002, 2005, 2007, 2009-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -45,22 +45,25 @@ AC_DEFUN([gl_FUNC_DUP2],
         [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no],
         [case "$host_os" in
            mingw*) # on this platform, dup2 always returns 0 for success
-             gl_cv_func_dup2_works=no;;
+             gl_cv_func_dup2_works="guessing no" ;;
            cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
-             gl_cv_func_dup2_works=no;;
+             gl_cv_func_dup2_works="guessing no" ;;
            linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
                    # closed fd may yield -EBADF instead of -1 / errno=EBADF.
-             gl_cv_func_dup2_works=no;;
+             gl_cv_func_dup2_works="guessing no" ;;
            freebsd*) # on FreeBSD 6.1, dup2(1,1000000) gives EMFILE, not EBADF.
-             gl_cv_func_dup2_works=no;;
+             gl_cv_func_dup2_works="guessing no" ;;
            haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC.
-             gl_cv_func_dup2_works=no;;
-           *) gl_cv_func_dup2_works=yes;;
+             gl_cv_func_dup2_works="guessing no" ;;
+           *) gl_cv_func_dup2_works="guessing yes" ;;
          esac])
       ])
-    if test "$gl_cv_func_dup2_works" = no; then
-      REPLACE_DUP2=1
-    fi
+    case "$gl_cv_func_dup2_works" in
+      *yes) ;;
+      *)
+        REPLACE_DUP2=1
+        ;;
+    esac
   fi
   dnl Replace dup2() for supporting the gnulib-defined fchdir() function,
   dnl to keep fchdir's bookkeeping up-to-date.
diff --git a/gl/m4/fstat.m4 b/gl/m4/fstat.m4
index fb07fed..3ab3297 100644
--- a/gl/m4/fstat.m4
+++ b/gl/m4/fstat.m4
@@ -1,4 +1,4 @@
-# fstat.m4 serial 2
+# fstat.m4 serial 3
 dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -21,9 +21,13 @@ AC_DEFUN([gl_FUNC_FSTAT],
   dnl Replace fstat() for supporting the gnulib-defined open() on directories.
   m4_ifdef([gl_FUNC_FCHDIR], [
     gl_TEST_FCHDIR
-    if test $HAVE_FCHDIR = 0 \
-       && test "$gl_cv_func_open_directory_works" != yes; then
-      REPLACE_FSTAT=1
+    if test $HAVE_FCHDIR = 0; then
+      case "$gl_cv_func_open_directory_works" in
+        *yes) ;;
+        *)
+          REPLACE_FSTAT=1
+          ;;
+      esac
     fi
   ])
 ])
diff --git a/gl/m4/getcwd.m4 b/gl/m4/getcwd.m4
index ccb1f47..50b96c6 100644
--- a/gl/m4/getcwd.m4
+++ b/gl/m4/getcwd.m4
@@ -6,7 +6,7 @@
 # with or without modifications, as long as this notice is preserved.
 
 # Written by Paul Eggert.
-# serial 11
+# serial 12
 
 AC_DEFUN([gl_FUNC_GETCWD_NULL],
   [
@@ -45,15 +45,14 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
          ]])],
         [gl_cv_func_getcwd_null=yes],
         [gl_cv_func_getcwd_null=no],
-        [[
-       case "$host_os" in
-                               # Guess yes on glibc systems.
-         *-gnu*)               gl_cv_func_getcwd_null="guessing yes";;
-                               # Guess yes on Cygwin.
-         cygwin*)              gl_cv_func_getcwd_null="guessing yes";;
-                               # If we don't know, assume the worst.
-         *)                    gl_cv_func_getcwd_null="guessing no";;
-       esac
+        [[case "$host_os" in
+                     # Guess yes on glibc systems.
+            *-gnu*)  gl_cv_func_getcwd_null="guessing yes";;
+                     # Guess yes on Cygwin.
+            cygwin*) gl_cv_func_getcwd_null="guessing yes";;
+                     # If we don't know, assume the worst.
+            *)       gl_cv_func_getcwd_null="guessing no";;
+          esac
         ]])])
 ])
 
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index ae4d254..d62b767 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -14,7 +14,8 @@ AC_DEFUN([gl_COMMON], [
 AC_DEFUN([gl_COMMON_BODY], [
   AH_VERBATIM([_Noreturn],
 [/* The _Noreturn keyword of C11.  */
-#ifndef _Noreturn
+#if ! (defined _Noreturn \
+       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
 # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
       || 0x5110 <= __SUNPRO_C)
 #  define _Noreturn __attribute__ ((__noreturn__))
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index c46f9ba..c295cdb 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -252,7 +252,6 @@ AC_PROG_MKDIR_P
 gl_UNISTD_H
 gl_VALGRIND_TESTS
 gl_VERSION_ETC
-AC_SUBST([WARN_CFLAGS])
   # End of code from modules
   m4_ifval(gl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
@@ -300,6 +299,7 @@ changequote([, ])dnl
   gl_module_indicator_condition=$gltests_WITNESS
   m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
 gl_FUNC_ALLOCA
+AC_REQUIRE([AC_C_INLINE])
 gl_FUNC_CLOSE
 if test $REPLACE_CLOSE = 1; then
   AC_LIBOBJ([close])
@@ -562,6 +562,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/msvc-nothrow.m4
   m4/multiarch.m4
   m4/nocrash.m4
+  m4/off_t.m4
   m4/open.m4
   m4/pathmax.m4
   m4/putenv.m4
diff --git a/gl/m4/lstat.m4 b/gl/m4/lstat.m4
index b83858b..b7335bd 100644
--- a/gl/m4/lstat.m4
+++ b/gl/m4/lstat.m4
@@ -1,4 +1,4 @@
-# serial 24
+# serial 25
 
 # Copyright (C) 1997-2001, 2003-2012 Free Software Foundation, Inc.
 #
@@ -16,9 +16,11 @@ AC_DEFUN([gl_FUNC_LSTAT],
   AC_CHECK_FUNCS_ONCE([lstat])
   if test $ac_cv_func_lstat = yes; then
     AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
-    if test $gl_cv_func_lstat_dereferences_slashed_symlink = no; then
-      REPLACE_LSTAT=1
-    fi
+    case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
+      *no)
+        REPLACE_LSTAT=1
+        ;;
+    esac
   else
     HAVE_LSTAT=0
   fi
@@ -51,20 +53,25 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
             ]])],
          [gl_cv_func_lstat_dereferences_slashed_symlink=yes],
          [gl_cv_func_lstat_dereferences_slashed_symlink=no],
-         [# When cross-compiling, be pessimistic so we will end up using the
-          # replacement version of lstat that checks for trailing slashes and
-          # calls lstat a second time when necessary.
-          gl_cv_func_lstat_dereferences_slashed_symlink=no
+         [case "$host_os" in
+                    # Guess yes on glibc systems.
+            *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+                    # If we don't know, assume the worst.
+            *)      gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
+          esac
          ])
      else
        # If the 'ln -s' command failed, then we probably don't even
        # have an lstat function.
-       gl_cv_func_lstat_dereferences_slashed_symlink=no
+       gl_cv_func_lstat_dereferences_slashed_symlink="guessing no"
      fi
      rm -f conftest.sym conftest.file
     ])
-  test $gl_cv_func_lstat_dereferences_slashed_symlink = yes &&
-    AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
-      [Define to 1 if 'lstat' dereferences a symlink specified
-       with a trailing slash.])
+  case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
+    *yes)
+      AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
+        [Define to 1 if 'lstat' dereferences a symlink specified
+         with a trailing slash.])
+      ;;
+  esac
 ])
diff --git a/gl/m4/malloc.m4 b/gl/m4/malloc.m4
index d3c39f5..8fa48e9 100644
--- a/gl/m4/malloc.m4
+++ b/gl/m4/malloc.m4
@@ -1,9 +1,47 @@
-# malloc.m4 serial 13
+# malloc.m4 serial 14
 dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
 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.
 
+m4_version_prereq([2.70], [] ,[
+
+# This is taken from the following Autoconf patch:
+# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
+AC_DEFUN([_AC_FUNC_MALLOC_IF],
+[
+  AC_REQUIRE([AC_HEADER_STDC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
+  AC_CHECK_HEADERS([stdlib.h])
+  AC_CACHE_CHECK([for GNU libc compatible malloc],
+    [ac_cv_func_malloc_0_nonnull],
+    [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+            # include <stdlib.h>
+            #else
+            char *malloc ();
+            #endif
+          ]],
+          [[return ! malloc (0);]])
+       ],
+       [ac_cv_func_malloc_0_nonnull=yes],
+       [ac_cv_func_malloc_0_nonnull=no],
+       [case "$host_os" in
+          # Guess yes on platforms where we know the result.
+          *-gnu* | freebsd* | netbsd* | openbsd* \
+          | hpux* | solaris* | cygwin* | mingw*)
+            ac_cv_func_malloc_0_nonnull=yes ;;
+          # If we don't know, assume the worst.
+          *) ac_cv_func_malloc_0_nonnull=no ;;
+        esac
+       ])
+    ])
+  AS_IF([test $ac_cv_func_malloc_0_nonnull = yes], [$1], [$2])
+])# _AC_FUNC_MALLOC_IF
+
+])
+
 # gl_FUNC_MALLOC_GNU
 # ------------------
 # Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if
diff --git a/gl/m4/off_t.m4 b/gl/m4/off_t.m4
new file mode 100644
index 0000000..dfca2df
--- /dev/null
+++ b/gl/m4/off_t.m4
@@ -0,0 +1,18 @@
+# off_t.m4 serial 1
+dnl Copyright (C) 2012 Free Software Foundation, Inc.
+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 Check whether to override the 'off_t' type.
+dnl Set WINDOWS_64_BIT_OFF_T.
+
+AC_DEFUN([gl_TYPE_OFF_T],
+[
+  m4_ifdef([gl_LARGEFILE], [
+    AC_REQUIRE([gl_LARGEFILE])
+  ], [
+    WINDOWS_64_BIT_OFF_T=0
+  ])
+  AC_SUBST([WINDOWS_64_BIT_OFF_T])
+])
diff --git a/gl/m4/putenv.m4 b/gl/m4/putenv.m4
index 1cb23a5..b971b12 100644
--- a/gl/m4/putenv.m4
+++ b/gl/m4/putenv.m4
@@ -1,4 +1,4 @@
-# putenv.m4 serial 18
+# putenv.m4 serial 19
 dnl Copyright (C) 2002-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -12,6 +12,7 @@ dnl The putenv in libc on at least SunOS 4.1.4 does *not* do that.
 AC_DEFUN([gl_FUNC_PUTENV],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([for putenv compatible with GNU and SVID],
    [gl_cv_func_svid_putenv],
    [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[[
@@ -32,9 +33,18 @@ AC_DEFUN([gl_FUNC_PUTENV],
              gl_cv_func_svid_putenv=yes,
              gl_cv_func_svid_putenv=no,
              dnl When crosscompiling, assume putenv is broken.
-             gl_cv_func_svid_putenv=no)
+             [case "$host_os" in
+                        # Guess yes on glibc systems.
+                *-gnu*) gl_cv_func_svid_putenv="guessing yes" ;;
+                        # If we don't know, assume the worst.
+                *)      gl_cv_func_svid_putenv="guessing no" ;;
+              esac
+             ])
    ])
-  if test $gl_cv_func_svid_putenv = no; then
-    REPLACE_PUTENV=1
-  fi
+  case "$gl_cv_func_svid_putenv" in
+    *yes) ;;
+    *)
+      REPLACE_PUTENV=1
+      ;;
+  esac
 ])
diff --git a/gl/m4/setenv.m4 b/gl/m4/setenv.m4
index a1f30bc..e1931e7 100644
--- a/gl/m4/setenv.m4
+++ b/gl/m4/setenv.m4
@@ -1,4 +1,4 @@
-# setenv.m4 serial 25
+# setenv.m4 serial 26
 dnl Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,6 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_SETENV],
 [
   AC_REQUIRE([gl_FUNC_SETENV_SEPARATE])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   if test $ac_cv_func_setenv = no; then
     HAVE_SETENV=0
   else
@@ -33,10 +34,19 @@ AC_DEFUN([gl_FUNC_SETENV],
        return result;
       ]])],
       [gl_cv_func_setenv_works=yes], [gl_cv_func_setenv_works=no],
-      [gl_cv_func_setenv_works="guessing no"])])
-    if test "$gl_cv_func_setenv_works" != yes; then
-      REPLACE_SETENV=1
-    fi
+      [case "$host_os" in
+                 # Guess yes on glibc systems.
+         *-gnu*) gl_cv_func_setenv_works="guessing yes" ;;
+                 # If we don't know, assume the worst.
+         *)      gl_cv_func_setenv_works="guessing no" ;;
+       esac
+      ])])
+    case "$gl_cv_func_setenv_works" in
+      *yes) ;;
+      *)
+        REPLACE_SETENV=1
+        ;;
+    esac
   fi
 ])
 
@@ -56,6 +66,7 @@ AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
 AC_DEFUN([gl_FUNC_UNSETENV],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CHECK_DECLS_ONCE([unsetenv])
   if test $ac_cv_have_decl_unsetenv = no; then
     HAVE_DECL_UNSETENV=0
@@ -115,10 +126,19 @@ int unsetenv (const char *name);
        if (getenv ("a")) return 6;
       ]])],
       [gl_cv_func_unsetenv_works=yes], [gl_cv_func_unsetenv_works=no],
-      [gl_cv_func_unsetenv_works="guessing no"])])
-    if test "$gl_cv_func_unsetenv_works" != yes; then
-      REPLACE_UNSETENV=1
-    fi
+      [case "$host_os" in
+                 # Guess yes on glibc systems.
+         *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;;
+                 # If we don't know, assume the worst.
+         *)      gl_cv_func_unsetenv_works="guessing no" ;;
+       esac
+      ])])
+    case "$gl_cv_func_unsetenv_works" in
+      *yes) ;;
+      *)
+        REPLACE_UNSETENV=1
+        ;;
+    esac
   fi
 ])
 
diff --git a/gl/m4/stat.m4 b/gl/m4/stat.m4
index 1e0d0dd..a8b79f5 100644
--- a/gl/m4/stat.m4
+++ b/gl/m4/stat.m4
@@ -1,4 +1,4 @@
-# serial 9
+# serial 10
 
 # Copyright (C) 2009-2012 Free Software Foundation, Inc.
 #
@@ -47,7 +47,13 @@ AC_DEFUN([gl_FUNC_STAT],
       return result;
            ]])],
          [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no],
-         [gl_cv_func_stat_file_slash="guessing no"])
+         [case "$host_os" in
+                    # Guess yes on glibc systems.
+            *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
+                    # If we don't know, assume the worst.
+            *)      gl_cv_func_stat_file_slash="guessing no" ;;
+          esac
+         ])
        rm -f conftest.tmp conftest.lnk])
   case $gl_cv_func_stat_dir_slash in
     *no) REPLACE_STAT=1
diff --git a/gl/m4/strerror.m4 b/gl/m4/strerror.m4
index 6bf14ef..1c96e52 100644
--- a/gl/m4/strerror.m4
+++ b/gl/m4/strerror.m4
@@ -1,4 +1,4 @@
-# strerror.m4 serial 16
+# strerror.m4 serial 17
 dnl Copyright (C) 2002, 2007-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,7 @@ AC_DEFUN([gl_FUNC_STRERROR],
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REQUIRE([gl_HEADER_ERRNO_H])
   AC_REQUIRE([gl_FUNC_STRERROR_0])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
     AC_REQUIRE([gl_FUNC_STRERROR_R_WORKS])
   ])
@@ -22,14 +23,22 @@ AC_DEFUN([gl_FUNC_STRERROR],
            [[if (!*strerror (-2)) return 1;]])],
         [gl_cv_func_working_strerror=yes],
         [gl_cv_func_working_strerror=no],
-        [dnl Be pessimistic on cross-compiles for now.
-         gl_cv_func_working_strerror="guessing no"])
+        [case "$host_os" in
+                   # Guess yes on glibc systems.
+           *-gnu*) gl_cv_func_working_strerror="guessing yes" ;;
+                   # If we don't know, assume the worst.
+           *)      gl_cv_func_working_strerror="guessing no" ;;
+         esac
+        ])
     ])
-    if test "$gl_cv_func_working_strerror" != yes; then
-      dnl The system's strerror() fails to return a string for out-of-range
-      dnl integers. Replace it.
-      REPLACE_STRERROR=1
-    fi
+    case "$gl_cv_func_working_strerror" in
+      *yes) ;;
+      *)
+        dnl The system's strerror() fails to return a string for out-of-range
+        dnl integers. Replace it.
+        REPLACE_STRERROR=1
+        ;;
+    esac
     m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
       dnl If the system's strerror_r or __xpg_strerror_r clobbers strerror's
       dnl buffer, we must replace strerror.
@@ -48,6 +57,7 @@ dnl Detect if strerror(0) passes (that is, does not set errno, and does not
 dnl return a string that matches strerror(-1)).
 AC_DEFUN([gl_FUNC_STRERROR_0],
 [
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   REPLACE_STRERROR_0=0
   AC_CACHE_CHECK([whether strerror(0) succeeds],
    [gl_cv_func_strerror_0_works],
@@ -67,12 +77,20 @@ AC_DEFUN([gl_FUNC_STRERROR_0],
            return result;]])],
       [gl_cv_func_strerror_0_works=yes],
       [gl_cv_func_strerror_0_works=no],
-      [dnl Be pessimistic on cross-compiles for now.
-       gl_cv_func_strerror_0_works="guessing no"])
+      [case "$host_os" in
+                 # Guess yes on glibc systems.
+         *-gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
+                 # If we don't know, assume the worst.
+         *)      gl_cv_func_strerror_0_works="guessing no" ;;
+       esac
+      ])
   ])
-  if test "$gl_cv_func_strerror_0_works" != yes; then
-    REPLACE_STRERROR_0=1
-    AC_DEFINE([REPLACE_STRERROR_0], [1], [Define to 1 if strerror(0)
-      does not return a message implying success.])
-  fi
+  case "$gl_cv_func_strerror_0_works" in
+    *yes) ;;
+    *)
+      REPLACE_STRERROR_0=1
+      AC_DEFINE([REPLACE_STRERROR_0], [1], [Define to 1 if strerror(0)
+        does not return a message implying success.])
+      ;;
+  esac
 ])
diff --git a/gl/m4/symlink.m4 b/gl/m4/symlink.m4
index f84b21e..cfd90ec 100644
--- a/gl/m4/symlink.m4
+++ b/gl/m4/symlink.m4
@@ -1,4 +1,4 @@
-# serial 5
+# serial 6
 # See if we need to provide symlink replacement.
 
 dnl Copyright (C) 2009-2012 Free Software Foundation, Inc.
@@ -11,6 +11,7 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_SYMLINK],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CHECK_FUNCS_ONCE([symlink])
   dnl The best we can do on mingw is provide a dummy that always fails, so
   dnl that compilation can proceed with fewer ifdefs.  On FreeBSD 7.2, AIX 7.1,
@@ -34,10 +35,19 @@ AC_DEFUN([gl_FUNC_SYMLINK],
              return result;
            ]])],
          [gl_cv_func_symlink_works=yes], [gl_cv_func_symlink_works=no],
-         [gl_cv_func_symlink_works="guessing no"])
+         [case "$host_os" in
+                    # Guess yes on glibc systems.
+            *-gnu*) gl_cv_func_symlink_works="guessing yes" ;;
+                    # If we don't know, assume the worst.
+            *)      gl_cv_func_symlink_works="guessing no" ;;
+          esac
+         ])
       rm -f conftest.f conftest.link conftest.lnk2])
-    if test "$gl_cv_func_symlink_works" != yes; then
-      REPLACE_SYMLINK=1
-    fi
+    case "$gl_cv_func_symlink_works" in
+      *yes) ;;
+      *)
+        REPLACE_SYMLINK=1
+        ;;
+    esac
   fi
 ])
diff --git a/gl/m4/sys_types_h.m4 b/gl/m4/sys_types_h.m4
index a14ba24..f11eef2 100644
--- a/gl/m4/sys_types_h.m4
+++ b/gl/m4/sys_types_h.m4
@@ -1,4 +1,4 @@
-# sys_types_h.m4 serial 3
+# sys_types_h.m4 serial 4
 dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -16,12 +16,7 @@ AC_DEFUN([gl_SYS_TYPES_H],
   AC_REQUIRE([AC_TYPE_MODE_T])
 
   dnl Whether to override the 'off_t' type.
-  m4_ifdef([gl_LARGEFILE], [
-    AC_REQUIRE([gl_LARGEFILE])
-  ], [
-    WINDOWS_64_BIT_OFF_T=0
-  ])
-  AC_SUBST([WINDOWS_64_BIT_OFF_T])
+  AC_REQUIRE([gl_TYPE_OFF_T])
 ])
 
 AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
diff --git a/gl/m4/unistd_h.m4 b/gl/m4/unistd_h.m4
index d636caf..7e7651b 100644
--- a/gl/m4/unistd_h.m4
+++ b/gl/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 64
+# unistd_h.m4 serial 65
 dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -25,7 +25,7 @@ AC_DEFUN([gl_UNISTD_H],
   AC_REQUIRE([AC_TYPE_PID_T])
 
   dnl Determine WINDOWS_64_BIT_OFF_T.
-  AC_REQUIRE([gl_SYS_TYPES_H])
+  AC_REQUIRE([gl_TYPE_OFF_T])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
diff --git a/gl/m4/warnings.m4 b/gl/m4/warnings.m4
index c14c480..28b8294 100644
--- a/gl/m4/warnings.m4
+++ b/gl/m4/warnings.m4
@@ -1,4 +1,4 @@
-# warnings.m4 serial 6
+# warnings.m4 serial 7
 dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -15,28 +15,47 @@ m4_ifdef([AS_VAR_APPEND],
 [AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])])
 
 
-# gl_WARN_ADD(PARAMETER, [VARIABLE = WARN_CFLAGS])
-# ------------------------------------------------
-# Adds parameter to WARN_CFLAGS if the compiler supports it.  For example,
-# gl_WARN_ADD([-Wparentheses]).
+# gl_COMPILER_OPTION_IF(OPTION, [IF-SUPPORTED], [IF-NOT-SUPPORTED],
+#                       [PROGRAM = AC_LANG_PROGRAM()])
+# -----------------------------------------------------------------
+# Check if the compiler supports OPTION when compiling PROGRAM.
 #
-# If VARIABLE is a variable name, AC_SUBST it.
-AC_DEFUN([gl_WARN_ADD],
-dnl FIXME: gl_Warn must be used unquoted until we can assume
-dnl autoconf 2.64 or newer.
+# FIXME: gl_Warn must be used unquoted until we can assume Autoconf
+# 2.64 or newer.
+AC_DEFUN([gl_COMPILER_OPTION_IF],
 [AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl
 AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl
 AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [
   gl_save_compiler_FLAGS="$gl_Flags"
-  gl_Flags="$gl_Flags $1"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+  gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $1"])
+  AC_COMPILE_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])],
                     [AS_VAR_SET(gl_Warn, [yes])],
                     [AS_VAR_SET(gl_Warn, [no])])
   gl_Flags="$gl_save_compiler_FLAGS"
 ])
-AS_VAR_IF(gl_Warn, [yes],
-  [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])])
+AS_VAR_IF(gl_Warn, [yes], [$2], [$3])
 AS_VAR_POPDEF([gl_Flags])dnl
 AS_VAR_POPDEF([gl_Warn])dnl
-m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl
 ])
+
+
+# gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS],
+#             [PROGRAM = AC_LANG_PROGRAM()])
+# ---------------------------------------------
+# Adds parameter to WARN_CFLAGS if the compiler supports it when
+# compiling PROGRAM.  For example, gl_WARN_ADD([-Wparentheses]).
+#
+# If VARIABLE is a variable name, AC_SUBST it.
+AC_DEFUN([gl_WARN_ADD],
+[gl_COMPILER_OPTION_IF([$1],
+  [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])],
+  [],
+  [$3])
+m4_ifval([$2],
+         [AS_LITERAL_IF([$2], [AC_SUBST([$2])])],
+         [AC_SUBST([WARN_CFLAGS])])dnl
+])
+
+# Local Variables:
+# mode: autoconf
+# End:
diff --git a/gl/override/doc/gendocs_template.diff b/gl/override/doc/gendocs_template.diff
index 9cb1a0a..da26043 100644
--- a/gl/override/doc/gendocs_template.diff
+++ b/gl/override/doc/gendocs_template.diff
@@ -16,7 +16,7 @@
 +<ul>
 +  <li><a href="../reference/ch01.html">GTK-DOC HTML C/C++ API Reference Manual</a>.
 +  <li><a href="../reference/%%PACKAGE%%.pdf">PDF Reference API Manual (GTK-DOC)</a>.
-+  <li><a href="../reference/libidn.devhelp">GTK-DOC DevHelp C/C++ API Reference Manual</a>.
++  <li><a href="../reference/libidn.devhelp2">DevHelp C/C++ API Reference Manual</a>.
 +</ul>
 +
 +<p>The native Java implementation is documented using Javadoc:
diff --git a/gltests/binary-io.h b/gltests/binary-io.h
index 824ad5b..a33e32a 100644
--- a/gltests/binary-io.h
+++ b/gltests/binary-io.h
@@ -25,28 +25,41 @@
    so we include it here first.  */
 #include <stdio.h>
 
-/* SET_BINARY (fd);
-   changes the file descriptor fd to perform binary I/O.  */
+/* set_binary_mode (fd, mode)
+   sets the binary/text I/O mode of file descriptor fd to the given mode
+   (must be O_BINARY or O_TEXT) and returns the previous mode.  */
 #if O_BINARY
 # if defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__
 #  include <io.h> /* declares setmode() */
+#  define set_binary_mode setmode
 # else
-#  define setmode _setmode
+#  define set_binary_mode _setmode
 #  undef fileno
 #  define fileno _fileno
 # endif
-# ifdef __DJGPP__
-#  include <unistd.h> /* declares isatty() */
-   /* Avoid putting stdin/stdout in binary mode if it is connected to
-      the console, because that would make it impossible for the user
-      to interrupt the program through Ctrl-C or Ctrl-Break.  */
-#  define SET_BINARY(fd) ((void) (!isatty (fd) ? (setmode (fd, O_BINARY), 0) : 0))
-# else
-#  define SET_BINARY(fd) ((void) setmode (fd, O_BINARY))
-# endif
 #else
-  /* On reasonable systems, binary I/O is the default.  */
-# define SET_BINARY(fd) /* do nothing */ ((void) 0)
+  /* On reasonable systems, binary I/O is the only choice.  */
+  /* Use an inline function rather than a macro, to avoid gcc warnings
+     "warning: statement with no effect".  */
+static inline int
+set_binary_mode (int fd, int mode)
+{
+  (void) fd;
+  (void) mode;
+  return O_BINARY;
+}
+#endif
+
+/* SET_BINARY (fd);
+   changes the file descriptor fd to perform binary I/O.  */
+#ifdef __DJGPP__
+# include <unistd.h> /* declares isatty() */
+  /* Avoid putting stdin/stdout in binary mode if it is connected to
+     the console, because that would make it impossible for the user
+     to interrupt the program through Ctrl-C or Ctrl-Break.  */
+# define SET_BINARY(fd) ((void) (!isatty (fd) ? (set_binary_mode (fd, O_BINARY), 0) : 0))
+#else
+# define SET_BINARY(fd) ((void) set_binary_mode (fd, O_BINARY))
 #endif
 
 #endif /* _BINARY_H */
diff --git a/gltests/ignore-value.h b/gltests/ignore-value.h
index 52919de..2e34435 100644
--- a/gltests/ignore-value.h
+++ b/gltests/ignore-value.h
@@ -35,16 +35,6 @@
 #ifndef _GL_IGNORE_VALUE_H
 # define _GL_IGNORE_VALUE_H
 
-# ifndef _GL_ATTRIBUTE_DEPRECATED
-/* The __attribute__((__deprecated__)) feature
-   is available in gcc versions 3.1 and newer.  */
-#  if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 1)
-#   define _GL_ATTRIBUTE_DEPRECATED /* empty */
-#  else
-#   define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
-#  endif
-# endif
-
 /* The __attribute__((__warn_unused_result__)) feature
    is available in gcc versions 3.4 and newer,
    while the typeof feature has been available since 2.7 at least.  */
diff --git a/gltests/init.sh b/gltests/init.sh
index ae86714..f525a7c 100644
--- a/gltests/init.sh
+++ b/gltests/init.sh
@@ -207,6 +207,14 @@ else
   fi
 fi
 
+# If this is bash, turn off all aliases.
+test -n "$BASH_VERSION" && unalias -a
+
+# Note that when supporting $EXEEXT (transparently mapping from PROG_NAME to
+# PROG_NAME.exe), we want to support hyphen-containing names like test-acos.
+# That is part of the shell-selection test above.  Why use aliases rather
+# than functions?  Because support for hyphen-containing aliases is more
+# widespread than that for hyphen-containing function names.
 test -n "$EXEEXT" && shopt -s expand_aliases
 
 # Enable glibc's malloc-perturbing option.
diff --git a/gltests/stdint.in.h b/gltests/stdint.in.h
index 8e4c822..59c00d5 100644
--- a/gltests/stdint.in.h
+++ b/gltests/stdint.in.h
@@ -90,7 +90,8 @@
 # include <sys/types.h>
 #endif
 
-/* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
+/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
+   LONG_MIN, LONG_MAX, ULONG_MAX.  */
 #include <limits.h>
 
 #if @HAVE_INTTYPES_H@
@@ -246,8 +247,9 @@ typedef unsigned long long int gl_uint64_t;
 
 /* Here we assume a standard architecture where the hardware integer
    types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
-   are taken from the same list of types.  Assume that 'long int'
-   is fast enough for all narrower integers.  */
+   are taken from the same list of types.  The following code normally
+   uses types consistent with glibc, as that lessens the chance of
+   incompatibility with older GNU hosts.  */
 
 #undef int_fast8_t
 #undef uint_fast8_t
@@ -257,12 +259,21 @@ typedef unsigned long long int gl_uint64_t;
 #undef uint_fast32_t
 #undef int_fast64_t
 #undef uint_fast64_t
-typedef long int gl_int_fast8_t;
-typedef unsigned long int gl_uint_fast8_t;
-typedef long int gl_int_fast16_t;
-typedef unsigned long int gl_uint_fast16_t;
+typedef signed char gl_int_fast8_t;
+typedef unsigned char gl_uint_fast8_t;
+
+#ifdef __sun
+/* Define types compatible with SunOS 5.10, so that code compiled under
+   earlier SunOS versions works with code compiled under SunOS 5.10.  */
+typedef int gl_int_fast32_t;
+typedef unsigned int gl_uint_fast32_t;
+#else
 typedef long int gl_int_fast32_t;
 typedef unsigned long int gl_uint_fast32_t;
+#endif
+typedef gl_int_fast32_t gl_int_fast16_t;
+typedef gl_uint_fast32_t gl_uint_fast16_t;
+
 #define int_fast8_t gl_int_fast8_t
 #define uint_fast8_t gl_uint_fast8_t
 #define int_fast16_t gl_int_fast16_t
@@ -418,23 +429,29 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 #undef INT_FAST8_MIN
 #undef INT_FAST8_MAX
 #undef UINT_FAST8_MAX
-#define INT_FAST8_MIN  LONG_MIN
-#define INT_FAST8_MAX  LONG_MAX
-#define UINT_FAST8_MAX  ULONG_MAX
+#define INT_FAST8_MIN  SCHAR_MIN
+#define INT_FAST8_MAX  SCHAR_MAX
+#define UINT_FAST8_MAX  UCHAR_MAX
 
 #undef INT_FAST16_MIN
 #undef INT_FAST16_MAX
 #undef UINT_FAST16_MAX
-#define INT_FAST16_MIN  LONG_MIN
-#define INT_FAST16_MAX  LONG_MAX
-#define UINT_FAST16_MAX  ULONG_MAX
+#define INT_FAST16_MIN  INT_FAST32_MIN
+#define INT_FAST16_MAX  INT_FAST32_MAX
+#define UINT_FAST16_MAX  UINT_FAST32_MAX
 
 #undef INT_FAST32_MIN
 #undef INT_FAST32_MAX
 #undef UINT_FAST32_MAX
-#define INT_FAST32_MIN  LONG_MIN
-#define INT_FAST32_MAX  LONG_MAX
-#define UINT_FAST32_MAX  ULONG_MAX
+#ifdef __sun
+# define INT_FAST32_MIN  INT_MIN
+# define INT_FAST32_MAX  INT_MAX
+# define UINT_FAST32_MAX  UINT_MAX
+#else
+# define INT_FAST32_MIN  LONG_MIN
+# define INT_FAST32_MAX  LONG_MAX
+# define UINT_FAST32_MAX  ULONG_MAX
+#endif
 
 #undef INT_FAST64_MIN
 #undef INT_FAST64_MAX
diff --git a/gltests/test-binary-io.c b/gltests/test-binary-io.c
index c695454..4f284e7 100644
--- a/gltests/test-binary-io.c
+++ b/gltests/test-binary-io.c
@@ -30,26 +30,40 @@
 #include "macros.h"
 
 int
-main ()
+main (int argc, char *argv[])
 {
   /* Test the O_BINARY macro.  */
   {
     int fd =
-      open ("t-bin-out2.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0600);
+      open ("t-bin-out0.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0600);
     if (write (fd, "Hello\n", 6) < 0)
       exit (1);
     close (fd);
   }
   {
     struct stat statbuf;
-    if (stat ("t-bin-out2.tmp", &statbuf) < 0)
+    if (stat ("t-bin-out0.tmp", &statbuf) < 0)
       exit (1);
     ASSERT (statbuf.st_size == 6);
   }
 
-  /* Test the SET_BINARY macro.  */
-  SET_BINARY (1);
-  fputs ("Hello\n", stdout);
+  switch (argv[1][0])
+    {
+    case '1':
+      /* Test the set_binary_mode() function.  */
+      set_binary_mode (1, O_BINARY);
+      fputs ("Hello\n", stdout);
+      break;
+
+    case '2':
+      /* Test the SET_BINARY macro.  */
+      SET_BINARY (1);
+      fputs ("Hello\n", stdout);
+      break;
+
+    default:
+      break;
+    }
 
   return 0;
 }
diff --git a/gltests/test-binary-io.sh b/gltests/test-binary-io.sh
index 272edef..c4dd6e9 100755
--- a/gltests/test-binary-io.sh
+++ b/gltests/test-binary-io.sh
@@ -3,9 +3,11 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles t-bin-out1.tmp t-bin-out2.tmp"
-./test-binary-io${EXEEXT} > t-bin-out1.tmp || exit 1
-cmp t-bin-out1.tmp t-bin-out2.tmp > /dev/null || exit 1
+tmpfiles="$tmpfiles t-bin-out0.tmp t-bin-out1.tmp t-bin-out2.tmp"
+./test-binary-io${EXEEXT} 1 > t-bin-out1.tmp || exit 1
+cmp t-bin-out0.tmp t-bin-out1.tmp > /dev/null || exit 1
+./test-binary-io${EXEEXT} 2 > t-bin-out2.tmp || exit 1
+cmp t-bin-out0.tmp t-bin-out2.tmp > /dev/null || exit 1
 
 rm -fr $tmpfiles
 
diff --git a/lib/gl/m4/gnulib-common.m4 b/lib/gl/m4/gnulib-common.m4
index ae4d254..d62b767 100644
--- a/lib/gl/m4/gnulib-common.m4
+++ b/lib/gl/m4/gnulib-common.m4
@@ -14,7 +14,8 @@ AC_DEFUN([gl_COMMON], [
 AC_DEFUN([gl_COMMON_BODY], [
   AH_VERBATIM([_Noreturn],
 [/* The _Noreturn keyword of C11.  */
-#ifndef _Noreturn
+#if ! (defined _Noreturn \
+       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
 # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
       || 0x5110 <= __SUNPRO_C)
 #  define _Noreturn __attribute__ ((__noreturn__))
diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4
index 68a717d..a28e198 100644
--- a/lib/gl/m4/gnulib-comp.m4
+++ b/lib/gl/m4/gnulib-comp.m4
@@ -436,6 +436,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   m4/malloc.m4
   m4/malloca.m4
   m4/multiarch.m4
+  m4/off_t.m4
   m4/putenv.m4
   m4/setenv.m4
   m4/setlocale.m4
diff --git a/lib/gl/m4/malloc.m4 b/lib/gl/m4/malloc.m4
index d3c39f5..8fa48e9 100644
--- a/lib/gl/m4/malloc.m4
+++ b/lib/gl/m4/malloc.m4
@@ -1,9 +1,47 @@
-# malloc.m4 serial 13
+# malloc.m4 serial 14
 dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
 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.
 
+m4_version_prereq([2.70], [] ,[
+
+# This is taken from the following Autoconf patch:
+# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
+AC_DEFUN([_AC_FUNC_MALLOC_IF],
+[
+  AC_REQUIRE([AC_HEADER_STDC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
+  AC_CHECK_HEADERS([stdlib.h])
+  AC_CACHE_CHECK([for GNU libc compatible malloc],
+    [ac_cv_func_malloc_0_nonnull],
+    [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+            # include <stdlib.h>
+            #else
+            char *malloc ();
+            #endif
+          ]],
+          [[return ! malloc (0);]])
+       ],
+       [ac_cv_func_malloc_0_nonnull=yes],
+       [ac_cv_func_malloc_0_nonnull=no],
+       [case "$host_os" in
+          # Guess yes on platforms where we know the result.
+          *-gnu* | freebsd* | netbsd* | openbsd* \
+          | hpux* | solaris* | cygwin* | mingw*)
+            ac_cv_func_malloc_0_nonnull=yes ;;
+          # If we don't know, assume the worst.
+          *) ac_cv_func_malloc_0_nonnull=no ;;
+        esac
+       ])
+    ])
+  AS_IF([test $ac_cv_func_malloc_0_nonnull = yes], [$1], [$2])
+])# _AC_FUNC_MALLOC_IF
+
+])
+
 # gl_FUNC_MALLOC_GNU
 # ------------------
 # Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if
diff --git a/lib/gl/m4/off_t.m4 b/lib/gl/m4/off_t.m4
new file mode 100644
index 0000000..dfca2df
--- /dev/null
+++ b/lib/gl/m4/off_t.m4
@@ -0,0 +1,18 @@
+# off_t.m4 serial 1
+dnl Copyright (C) 2012 Free Software Foundation, Inc.
+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 Check whether to override the 'off_t' type.
+dnl Set WINDOWS_64_BIT_OFF_T.
+
+AC_DEFUN([gl_TYPE_OFF_T],
+[
+  m4_ifdef([gl_LARGEFILE], [
+    AC_REQUIRE([gl_LARGEFILE])
+  ], [
+    WINDOWS_64_BIT_OFF_T=0
+  ])
+  AC_SUBST([WINDOWS_64_BIT_OFF_T])
+])
diff --git a/lib/gl/m4/putenv.m4 b/lib/gl/m4/putenv.m4
index 1cb23a5..b971b12 100644
--- a/lib/gl/m4/putenv.m4
+++ b/lib/gl/m4/putenv.m4
@@ -1,4 +1,4 @@
-# putenv.m4 serial 18
+# putenv.m4 serial 19
 dnl Copyright (C) 2002-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -12,6 +12,7 @@ dnl The putenv in libc on at least SunOS 4.1.4 does *not* do that.
 AC_DEFUN([gl_FUNC_PUTENV],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([for putenv compatible with GNU and SVID],
    [gl_cv_func_svid_putenv],
    [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[[
@@ -32,9 +33,18 @@ AC_DEFUN([gl_FUNC_PUTENV],
              gl_cv_func_svid_putenv=yes,
              gl_cv_func_svid_putenv=no,
              dnl When crosscompiling, assume putenv is broken.
-             gl_cv_func_svid_putenv=no)
+             [case "$host_os" in
+                        # Guess yes on glibc systems.
+                *-gnu*) gl_cv_func_svid_putenv="guessing yes" ;;
+                        # If we don't know, assume the worst.
+                *)      gl_cv_func_svid_putenv="guessing no" ;;
+              esac
+             ])
    ])
-  if test $gl_cv_func_svid_putenv = no; then
-    REPLACE_PUTENV=1
-  fi
+  case "$gl_cv_func_svid_putenv" in
+    *yes) ;;
+    *)
+      REPLACE_PUTENV=1
+      ;;
+  esac
 ])
diff --git a/lib/gl/m4/setenv.m4 b/lib/gl/m4/setenv.m4
index a1f30bc..e1931e7 100644
--- a/lib/gl/m4/setenv.m4
+++ b/lib/gl/m4/setenv.m4
@@ -1,4 +1,4 @@
-# setenv.m4 serial 25
+# setenv.m4 serial 26
 dnl Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,6 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_SETENV],
 [
   AC_REQUIRE([gl_FUNC_SETENV_SEPARATE])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   if test $ac_cv_func_setenv = no; then
     HAVE_SETENV=0
   else
@@ -33,10 +34,19 @@ AC_DEFUN([gl_FUNC_SETENV],
        return result;
       ]])],
       [gl_cv_func_setenv_works=yes], [gl_cv_func_setenv_works=no],
-      [gl_cv_func_setenv_works="guessing no"])])
-    if test "$gl_cv_func_setenv_works" != yes; then
-      REPLACE_SETENV=1
-    fi
+      [case "$host_os" in
+                 # Guess yes on glibc systems.
+         *-gnu*) gl_cv_func_setenv_works="guessing yes" ;;
+                 # If we don't know, assume the worst.
+         *)      gl_cv_func_setenv_works="guessing no" ;;
+       esac
+      ])])
+    case "$gl_cv_func_setenv_works" in
+      *yes) ;;
+      *)
+        REPLACE_SETENV=1
+        ;;
+    esac
   fi
 ])
 
@@ -56,6 +66,7 @@ AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
 AC_DEFUN([gl_FUNC_UNSETENV],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CHECK_DECLS_ONCE([unsetenv])
   if test $ac_cv_have_decl_unsetenv = no; then
     HAVE_DECL_UNSETENV=0
@@ -115,10 +126,19 @@ int unsetenv (const char *name);
        if (getenv ("a")) return 6;
       ]])],
       [gl_cv_func_unsetenv_works=yes], [gl_cv_func_unsetenv_works=no],
-      [gl_cv_func_unsetenv_works="guessing no"])])
-    if test "$gl_cv_func_unsetenv_works" != yes; then
-      REPLACE_UNSETENV=1
-    fi
+      [case "$host_os" in
+                 # Guess yes on glibc systems.
+         *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;;
+                 # If we don't know, assume the worst.
+         *)      gl_cv_func_unsetenv_works="guessing no" ;;
+       esac
+      ])])
+    case "$gl_cv_func_unsetenv_works" in
+      *yes) ;;
+      *)
+        REPLACE_UNSETENV=1
+        ;;
+    esac
   fi
 ])
 
diff --git a/lib/gl/m4/sys_types_h.m4 b/lib/gl/m4/sys_types_h.m4
index a14ba24..f11eef2 100644
--- a/lib/gl/m4/sys_types_h.m4
+++ b/lib/gl/m4/sys_types_h.m4
@@ -1,4 +1,4 @@
-# sys_types_h.m4 serial 3
+# sys_types_h.m4 serial 4
 dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -16,12 +16,7 @@ AC_DEFUN([gl_SYS_TYPES_H],
   AC_REQUIRE([AC_TYPE_MODE_T])
 
   dnl Whether to override the 'off_t' type.
-  m4_ifdef([gl_LARGEFILE], [
-    AC_REQUIRE([gl_LARGEFILE])
-  ], [
-    WINDOWS_64_BIT_OFF_T=0
-  ])
-  AC_SUBST([WINDOWS_64_BIT_OFF_T])
+  AC_REQUIRE([gl_TYPE_OFF_T])
 ])
 
 AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
diff --git a/lib/gl/m4/unistd_h.m4 b/lib/gl/m4/unistd_h.m4
index d636caf..7e7651b 100644
--- a/lib/gl/m4/unistd_h.m4
+++ b/lib/gl/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 64
+# unistd_h.m4 serial 65
 dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -25,7 +25,7 @@ AC_DEFUN([gl_UNISTD_H],
   AC_REQUIRE([AC_TYPE_PID_T])
 
   dnl Determine WINDOWS_64_BIT_OFF_T.
-  AC_REQUIRE([gl_SYS_TYPES_H])
+  AC_REQUIRE([gl_TYPE_OFF_T])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
diff --git a/lib/gl/stdint.in.h b/lib/gl/stdint.in.h
index b016046..d6c3450 100644
--- a/lib/gl/stdint.in.h
+++ b/lib/gl/stdint.in.h
@@ -90,7 +90,8 @@
 # include <sys/types.h>
 #endif
 
-/* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
+/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
+   LONG_MIN, LONG_MAX, ULONG_MAX.  */
 #include <limits.h>
 
 #if @HAVE_INTTYPES_H@
@@ -246,8 +247,9 @@ typedef unsigned long long int gl_uint64_t;
 
 /* Here we assume a standard architecture where the hardware integer
    types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
-   are taken from the same list of types.  Assume that 'long int'
-   is fast enough for all narrower integers.  */
+   are taken from the same list of types.  The following code normally
+   uses types consistent with glibc, as that lessens the chance of
+   incompatibility with older GNU hosts.  */
 
 #undef int_fast8_t
 #undef uint_fast8_t
@@ -257,12 +259,21 @@ typedef unsigned long long int gl_uint64_t;
 #undef uint_fast32_t
 #undef int_fast64_t
 #undef uint_fast64_t
-typedef long int gl_int_fast8_t;
-typedef unsigned long int gl_uint_fast8_t;
-typedef long int gl_int_fast16_t;
-typedef unsigned long int gl_uint_fast16_t;
+typedef signed char gl_int_fast8_t;
+typedef unsigned char gl_uint_fast8_t;
+
+#ifdef __sun
+/* Define types compatible with SunOS 5.10, so that code compiled under
+   earlier SunOS versions works with code compiled under SunOS 5.10.  */
+typedef int gl_int_fast32_t;
+typedef unsigned int gl_uint_fast32_t;
+#else
 typedef long int gl_int_fast32_t;
 typedef unsigned long int gl_uint_fast32_t;
+#endif
+typedef gl_int_fast32_t gl_int_fast16_t;
+typedef gl_uint_fast32_t gl_uint_fast16_t;
+
 #define int_fast8_t gl_int_fast8_t
 #define uint_fast8_t gl_uint_fast8_t
 #define int_fast16_t gl_int_fast16_t
@@ -418,23 +429,29 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 #undef INT_FAST8_MIN
 #undef INT_FAST8_MAX
 #undef UINT_FAST8_MAX
-#define INT_FAST8_MIN  LONG_MIN
-#define INT_FAST8_MAX  LONG_MAX
-#define UINT_FAST8_MAX  ULONG_MAX
+#define INT_FAST8_MIN  SCHAR_MIN
+#define INT_FAST8_MAX  SCHAR_MAX
+#define UINT_FAST8_MAX  UCHAR_MAX
 
 #undef INT_FAST16_MIN
 #undef INT_FAST16_MAX
 #undef UINT_FAST16_MAX
-#define INT_FAST16_MIN  LONG_MIN
-#define INT_FAST16_MAX  LONG_MAX
-#define UINT_FAST16_MAX  ULONG_MAX
+#define INT_FAST16_MIN  INT_FAST32_MIN
+#define INT_FAST16_MAX  INT_FAST32_MAX
+#define UINT_FAST16_MAX  UINT_FAST32_MAX
 
 #undef INT_FAST32_MIN
 #undef INT_FAST32_MAX
 #undef UINT_FAST32_MAX
-#define INT_FAST32_MIN  LONG_MIN
-#define INT_FAST32_MAX  LONG_MAX
-#define UINT_FAST32_MAX  ULONG_MAX
+#ifdef __sun
+# define INT_FAST32_MIN  INT_MIN
+# define INT_FAST32_MAX  INT_MAX
+# define UINT_FAST32_MAX  UINT_MAX
+#else
+# define INT_FAST32_MIN  LONG_MIN
+# define INT_FAST32_MAX  LONG_MAX
+# define UINT_FAST32_MAX  ULONG_MAX
+#endif
 
 #undef INT_FAST64_MIN
 #undef INT_FAST64_MAX
diff --git a/lib/gltests/init.sh b/lib/gltests/init.sh
index ae86714..f525a7c 100644
--- a/lib/gltests/init.sh
+++ b/lib/gltests/init.sh
@@ -207,6 +207,14 @@ else
   fi
 fi
 
+# If this is bash, turn off all aliases.
+test -n "$BASH_VERSION" && unalias -a
+
+# Note that when supporting $EXEEXT (transparently mapping from PROG_NAME to
+# PROG_NAME.exe), we want to support hyphen-containing names like test-acos.
+# That is part of the shell-selection test above.  Why use aliases rather
+# than functions?  Because support for hyphen-containing aliases is more
+# widespread than that for hyphen-containing function names.
 test -n "$EXEEXT" && shopt -s expand_aliases
 
 # Enable glibc's malloc-perturbing option.
diff --git a/po/id.po.in b/po/id.po.in
index 7a5e5f1..95c3dc5 100644
--- a/po/id.po.in
+++ b/po/id.po.in
@@ -1,168 +1,156 @@
 # Indonesian translations for libidn package.
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libidn package.
-# Andhika Padmawan <andhika.padmawan@gmail.com>, 2008.
+# Andhika Padmawan <andhika.padmawan@gmail.com>, 2008-2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.24\n"
 "Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2008-08-16 21:05+0700\n"
+"POT-Creation-Date: 2012-01-10 21:21+0100\n"
+"PO-Revision-Date: 2012-05-18 17:42+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/strerror-idna.c:74 lib/strerror-pr29.c:58 lib/strerror-punycode.c:58
-#: lib/strerror-stringprep.c:78 lib/strerror-tld.c:60
+#: lib/strerror-idna.c:82 lib/strerror-pr29.c:66 lib/strerror-punycode.c:66
+#: lib/strerror-stringprep.c:86 lib/strerror-tld.c:68
 msgid "Success"
 msgstr "Sukses"
 
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:86 lib/strerror-pr29.c:74
 msgid "String preparation failed"
 msgstr "Penyiapan benang gagal"
 
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:90
 msgid "Punycode failed"
 msgstr "Punycode gagal"
 
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:94
 msgid "Non-digit/letter/hyphen in input"
 msgstr "Non-digit/huruf/sambung di masukan"
 
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:98
 msgid "Forbidden leading or trailing minus sign (`-')"
 msgstr "Tanda minus awalan atau akhiran terlarang (`-')"
 
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:102
 msgid "Output would be too large or too small"
 msgstr "Keluaran akan terlalu besar atau terlalu kecil"
 
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:106
 msgid "Input does not start with ACE prefix (`xn--')"
 msgstr "Masukan tidak diawali dengan prefiks ACE (`xn--')"
 
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:110
 msgid "String not idempotent under ToASCII"
 msgstr "Benar tidak idempoten di bawah ToASCII"
 
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:114
 msgid "Input already contain ACE prefix (`xn--')"
 msgstr "Masukan telah berisi prefiks ACE (`xn--')"
 
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:118 lib/strerror-tld.c:84
 msgid "System iconv failed"
 msgstr "Sistem iconv gagal"
 
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:122 lib/strerror-stringprep.c:130 lib/strerror-tld.c:80
 msgid "Cannot allocate memory"
 msgstr "Tak dapat alokasi memori"
 
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:126
 msgid "System dlopen failed"
 msgstr "Sistem dlopen gagal"
 
-#: lib/strerror-idna.c:122 lib/strerror-pr29.c:70 lib/strerror-punycode.c:74
-#: lib/strerror-stringprep.c:126 lib/strerror-tld.c:84
+#: lib/strerror-idna.c:130 lib/strerror-pr29.c:78 lib/strerror-punycode.c:82
+#: lib/strerror-stringprep.c:134 lib/strerror-tld.c:92
 msgid "Unknown error"
 msgstr "Galat tak dikenal"
 
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:70
 msgid "String not idempotent under Unicode NFKC normalization"
 msgstr "Benang tak idempoten di bawah normalisasi Unicode NFKC"
 
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:70
 msgid "Invalid input"
 msgstr "Masukan tidak sah"
 
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:74 lib/strerror-stringprep.c:110
 msgid "Output would exceed the buffer space provided"
 msgstr "Keluaran akan melebihi ruang penyangga yang disediakan"
 
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:78
 msgid "String size limit exceeded"
 msgstr "Batas ruang benang tercapai"
 
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:90
 msgid "Forbidden unassigned code points in input"
 msgstr "Titik kode tak ditugaskan terlarang di masukan"
 
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:94
 msgid "Prohibited code points in input"
 msgstr "Titik kode terlarang di masukan"
 
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:98
 msgid "Conflicting bidirectional properties in input"
 msgstr "Properti dwiarah konflik di masukan"
 
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:102
 msgid "Malformed bidirectional string"
 msgstr "Benang dwiarah salah bentuk"
 
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:106
 msgid "Prohibited bidirectional code points in input"
 msgstr "Titik kode dwiarah terlarang di masukan"
 
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:114
 msgid "Error in stringprep profile definition"
 msgstr "Galat di definisi profil stringprep"
 
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:118
 msgid "Flag conflict with profile"
 msgstr "Bendera konflik dengan profil"
 
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:122
 msgid "Unknown profile"
 msgstr "Profil tak diketahui"
 
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:126
 msgid "Unicode normalization failed (internal error)"
 msgstr "Normalisasi unicode gagal (galat internal)"
 
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:72
 msgid "Code points prohibited by top-level domain"
 msgstr "Titik kode dilarang oleh ranah level atas"
 
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:76
 msgid "Missing input"
 msgstr "Masukan hilang"
 
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:88
 msgid "No top-level domain found in input"
 msgstr "Tak ada ranah level atas yang ditemukan di masukan"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
-#. "Report translation bugs to <...>\n" with the address for translation
-#. bugs (typically your translation team's web or email address).
-#: src/idn.c:68
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <%s>.\n"
-msgstr ""
-"\n"
-"Laporkan kutu ke <%s>.\n"
-
-#: src/idn.c:75
+#: src/idn.c:65
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `'%s -- help' untuk informasi lebih lanjut.\n"
 
-#: src/idn.c:79
+#: src/idn.c:69
 #, c-format
 msgid "Usage: %s [OPTION]... [STRINGS]...\n"
 msgstr "Penggunaan: %s [OPSI]... [BENANG]...\n"
 
-#: src/idn.c:82
+#: src/idn.c:72
 msgid ""
 "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
 "\n"
 msgstr "BENANG konversi Internationalized Domain Name (IDN), atau masukan standar.\n"
 
-#: src/idn.c:86
+#: src/idn.c:76
 msgid ""
 "Command line interface to the internationalized domain name library.\n"
 "\n"
@@ -186,7 +174,7 @@ msgstr ""
 "\n"
 "Argumen mandatori untuk opsi panjang merupakan mandatori untuk opsi pendek juga.\n"
 
-#: src/idn.c:98
+#: src/idn.c:88
 msgid ""
 "  -h, --help               Print help and exit\n"
 "  -V, --version            Print version and exit\n"
@@ -194,7 +182,7 @@ msgstr ""
 "  -h, --help               Cetak bantuan lalu keluar\n"
 "  -V, --version            Cetak versi lalu keluar\n"
 
-#: src/idn.c:102
+#: src/idn.c:92
 msgid ""
 "  -s, --stringprep         Prepare string according to nameprep profile\n"
 "  -d, --punycode-decode    Decode Punycode\n"
@@ -208,27 +196,27 @@ msgstr ""
 "  -a, --idna-to-ascii      Konversi ke ACE menurut IDNA (mode standar)\n"
 "  -u, --idna-to-unicode    Konversi dari ACE menurut IDNA\n"
 
-#: src/idn.c:109
+#: src/idn.c:99
 msgid ""
-"      --allow-unassigned   Toggle IDNA AllowUnassigned flag\n"
-"      --usestd3asciirules  Toggle IDNA UseSTD3ASCIIRules flag\n"
+"      --allow-unassigned   Toggle IDNA AllowUnassigned flag (default off)\n"
+"      --usestd3asciirules  Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
 msgstr ""
-"      --allow-unassigned   Ubah bendera AllowUnassigned IDNA\n"
-"      --usestd3asciirules  Ubah bendera UseSTD3ASCIIRules IDNA\n"
+"      --allow-unassigned   Ubah bendera AllowUnassigned IDNA (standar mati)\n"
+"      --usestd3asciirules  Ubah bendera UseSTD3ASCIIRules IDNA (standar mati)\n"
 
-#: src/idn.c:113
+#: src/idn.c:103
 msgid ""
-"  -t, --tld                Check string for TLD specific rules\n"
+"      --no-tld             Don't check string for TLD specific rules\n"
 "                             Only for --idna-to-ascii and --idna-to-unicode\n"
 msgstr ""
-"  -t, --tld                Cek benang untuk peraturan spesifik TLD\n"
+"      --no-tld             Jangan cek benang untuk peraturan spesifik TLD\n"
 "                             Hanya untuk --idna-to-ascii dan --idna-to-unicode\n"
 
-#: src/idn.c:117
+#: src/idn.c:107
 msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 NFKC\n"
 msgstr "  -n, --nfkc               Normalisasi benang berdasarkan Unicode v3.2 NFKC\n"
 
-#: src/idn.c:120
+#: src/idn.c:110
 msgid ""
 "  -p, --profile=STRING     Use specified stringprep profile instead\n"
 "                             Valid stringprep profiles: `Nameprep',\n"
@@ -240,7 +228,7 @@ msgstr ""
 "                             `iSCSI', `Nodeprep', `Resourceprep', \n"
 "                             `trace', `SASLprep'\n"
 
-#: src/idn.c:126
+#: src/idn.c:116
 msgid ""
 "      --debug              Print debugging information\n"
 "      --quiet              Silent operation\n"
@@ -248,12 +236,12 @@ msgstr ""
 "      --debug              Cetak informasi awakutu\n"
 "      --quiet              Operasi diam\n"
 
-#: src/idn.c:176
+#: src/idn.c:172
 #, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Hanya salah satu dari -s, -e, -d, -a, -u, atau -n yang dapat ditentukan."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "Hanya salah satu dari -s, -e, -d, -a, -u, atau -n yang dapat ditentukan"
 
-#: src/idn.c:184
+#: src/idn.c:182
 #, c-format
 msgid "Charset `%s'.\n"
 msgstr "Set karakter `%s'.\n"
@@ -265,19 +253,19 @@ msgstr "Ketik tiap benang masukan pada baris itu sendiri, diakhiri oleh karakter
 
 #: src/idn.c:202
 #, c-format
-msgid "Input error"
-msgstr "Galat masukan"
+msgid "input error"
+msgstr "galat masukan"
 
 #: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
 #, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Tak dapat konversi dari %s ke UTF-8."
+msgid "could not convert from %s to UTF-8"
+msgstr "tak dapat konversi dari %s ke UTF-8."
 
 #: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
 #: src/idn.c:551
 #, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Tak dapat konversi dari UTF-8 ke UCS-4"
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "tak dapat konversi dari UTF-8 ke UCS-4"
 
 #: src/idn.c:237
 #, c-format
@@ -286,14 +274,18 @@ msgstr "stringprep_profile: %s"
 
 #: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
 #, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Tak dapat konversi dari UTF-8 ke %s."
+msgid "could not convert from UTF-8 to %s"
+msgstr "tak dapat konversi dari UTF-8 ke %s"
 
 #: src/idn.c:295
 #, c-format
 msgid "punycode_encode: %s"
 msgstr "punycode_encode: %s"
 
+#: src/idn.c:317
+msgid "malloc"
+msgstr "malloc"
+
 #: src/idn.c:323
 #, c-format
 msgid "punycode_decode: %s"
@@ -301,8 +293,8 @@ msgstr "punycode_decode: %s"
 
 #: src/idn.c:340 src/idn.c:364 src/idn.c:442
 #, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Tak dapat konversi dari UCS-4 ke UTF-8."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "tak dapat konversi dari UCS-4 ke UTF-8."
 
 #: src/idn.c:381
 #, c-format
@@ -331,5 +323,12 @@ msgstr "idna_to_unicode_8z4z: %s"
 
 #: src/idn.c:540
 #, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Tak dapat melakukan normalisasi NFKC."
+msgid "could not do NFKC normalization"
+msgstr "tak dapat melakukan normalisasi NFKC"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Laporkan kutu ke <%s>.\n"


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Wed May 23 04:52:24 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SX7Iu-0005fq-LD
	for mharc-libidn-commit@gnu.org; Wed, 23 May 2012 04:52:24 -0400
Received: from eggs.gnu.org ([208.118.235.92]:35595)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SX7In-0005el-Ev
	for libidn-commit@gnu.org; Wed, 23 May 2012 04:52:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SX7Il-0000uP-8j
	for libidn-commit@gnu.org; Wed, 23 May 2012 04:52:16 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:54787)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SX7Il-0000uI-5V
	for libidn-commit@gnu.org; Wed, 23 May 2012 04:52:15 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SX7Ik-0004Um-Hd
	for libidn-commit@gnu.org; Wed, 23 May 2012 08:52:14 +0000
Date: Wed, 23 May 2012 08:52:14 +0000
Message-Id: <E1SX7Ik-0004Um-Hd@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-24-25-g7514349
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 86db04b996f18530b9f618b30df972a2665409b0
X-Git-Newrev: 751434958063c3acc1b9ed1610f6fc0740831e15
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 23 May 2012 08:52:23 -0000

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=751434958063c3acc1b9ed1610f6fc0740831e15

The branch, master has been updated
       via  751434958063c3acc1b9ed1610f6fc0740831e15 (commit)
       via  b5816faf0b502a8a019a33bd80df20175ac156d4 (commit)
      from  86db04b996f18530b9f618b30df972a2665409b0 (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 751434958063c3acc1b9ed1610f6fc0740831e15
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 23 10:38:53 2012 +0200

    Version 1.25.

commit b5816faf0b502a8a019a33bd80df20175ac156d4
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 23 10:37:20 2012 +0200

    Fix.

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

Summary of changes:
 NEWS |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 57d9d68..1b4b475 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ Libidn NEWS -- History of user-visible changes.                 -*- outline -*-
 Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
-* Version 1.25 (unreleased) [?]
+* Version 1.25 (released 2012-05-23) [stable]
 
 ** MSVC: Build fixes related to _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE.
 Reported by Bartosz Brachaczek <b.brachaczek@gmail.com>.
@@ -10,7 +10,7 @@ Reported by Bartosz Brachaczek <b.brachaczek@gmail.com>.
 ** examples: Fix compiler warning about ignoring return value from fgets.
 
 ** tests: Ship with a valgrind suppressions file for the strlen issue.
-See bottom of HACKING for discussion.
+See tests/libidn.supp and  bottom of HACKING for discussion.
 
 ** Update gnulib files and translations.
 


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Wed May 23 04:52:30 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SX7J0-0005go-PV
	for mharc-libidn-commit@gnu.org; Wed, 23 May 2012 04:52:30 -0400
Received: from eggs.gnu.org ([208.118.235.92]:35621)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SX7It-0005fg-7C
	for libidn-commit@gnu.org; Wed, 23 May 2012 04:52:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SX7Io-0000xn-7T
	for libidn-commit@gnu.org; Wed, 23 May 2012 04:52:22 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:54794)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SX7Io-0000xe-3c
	for libidn-commit@gnu.org; Wed, 23 May 2012 04:52:18 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SX7In-0004Vy-Kx
	for libidn-commit@gnu.org; Wed, 23 May 2012 08:52:17 +0000
Date: Wed, 23 May 2012 08:52:17 +0000
Message-Id: <E1SX7In-0004Vy-Kx@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn annotated tag, libidn-1-25, created. libidn-1-25
X-Git-Refname: refs/tags/libidn-1-25
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: fecf55e4b142c85dd44ec827cedf16151fa4cf7d
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 23 May 2012 08:52:29 -0000

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=fecf55e4b142c85dd44ec827cedf16151fa4cf7d

The annotated tag, libidn-1-25 has been created
        at  fecf55e4b142c85dd44ec827cedf16151fa4cf7d (tag)
   tagging  751434958063c3acc1b9ed1610f6fc0740831e15 (commit)
  replaces  libidn-1-24
 tagged by  Simon Josefsson
        on  Wed May 23 10:51:10 2012 +0200

- Log -----------------------------------------------------------------
1.25
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iO4EAAECADgFAk+8pP4xFIAAAAAAFQATcGthLWFkZHJlc3NAZ251cGcub3Jnc2lt
b25Aam9zZWZzc29uLm9yZwAKCRDtoh6UtWVxbyjjBQCTNTAR0Q23N4eilSrP/u+A
rYZu5tBHY0QvOZdGDwuenWS3E4PgmrU/GHzSTAzsoC4kmTsYnGmlNQf3V32gTqug
74s4Lnyy6uooIRC5f+1EvhcFID6m70CQqkBlzQcslTCRBHzWtGy0finNwpk8MGL9
iiwCGQLwc1AftqcJiB/bz7hRKHMUnN7UWO3wQ1jaJrCjXQadrRgA9MFqmD/nhise
=nh9F
-----END PGP SIGNATURE-----

Nitin A Kamble (1):
      Fix version controlled build of libidn with automake 1.12.

Simon Josefsson (24):
      Update for 1.23.
      Update for 1.24.
      Bump versions.
      Drop files.
      Typos.
      Update gnulib files.
      Dummy defines for _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE.
      Add valgrind suppressions file.
      Ignore more.
      Fix compiler warning about unused fgets return value.
      Sync with TP.
      Update gnulib files.
      Mention release tools.
      Ignore more.
      Remove ChangeLog, it is generated.
      Add.
      Fix valgrind wording.
      Revert "Fix version controlled build of libidn with automake 1.12."
      Update gnulib files.
      Sync with TP.
      Push to git after doing gnupload.
      Use devhelp2 format.
      Fix.
      Version 1.25.

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


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Mon May 28 12:28:30 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SZ2o2-0004kE-Ub
	for mharc-libidn-commit@gnu.org; Mon, 28 May 2012 12:28:30 -0400
Received: from eggs.gnu.org ([208.118.235.92]:54336)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SZ2ny-0004jy-Kf
	for libidn-commit@gnu.org; Mon, 28 May 2012 12:28:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SZ2nw-0000kl-1s
	for libidn-commit@gnu.org; Mon, 28 May 2012 12:28:26 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44143)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SZ2nv-0000kh-Uj
	for libidn-commit@gnu.org; Mon, 28 May 2012 12:28:23 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SZ2nu-0002SZ-OI
	for libidn-commit@gnu.org; Mon, 28 May 2012 16:28:23 +0000
Date: Mon, 28 May 2012 16:28:22 +0000
Message-Id: <E1SZ2nu-0002SZ-OI@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-25-4-gf0f88a3
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 751434958063c3acc1b9ed1610f6fc0740831e15
X-Git-Newrev: f0f88a30f9536bcaac26967d11a0e66f0984f40e
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 May 2012 16:28:29 -0000

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=f0f88a30f9536bcaac26967d11a0e66f0984f40e

The branch, master has been updated
       via  f0f88a30f9536bcaac26967d11a0e66f0984f40e (commit)
       via  89c8392556bbfde03812082b776297f2ffa1eabe (commit)
       via  25977e74836ee31720c7b60414f96ce91efb3616 (commit)
       via  01543d2dd1e6d049853101560df08d7a005e30e3 (commit)
      from  751434958063c3acc1b9ed1610f6fc0740831e15 (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 f0f88a30f9536bcaac26967d11a0e66f0984f40e
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon May 28 18:28:12 2012 +0200

    Update for 1.25.

commit 89c8392556bbfde03812082b776297f2ffa1eabe
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri May 25 15:06:18 2012 +0200

    Improve debug output from version comparisons.

commit 25977e74836ee31720c7b60414f96ce91efb3616
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 23 10:53:40 2012 +0200

    Bump versions.

commit 01543d2dd1e6d049853101560df08d7a005e30e3
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 23 10:52:48 2012 +0200

    Fix release rules.

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

Summary of changes:
 NEWS                   |    4 ++++
 cfg.mk                 |    3 +--
 configure.ac           |    4 ++--
 doc/announce.txt       |   47 +++++++++++++++++++++--------------------------
 lib/stringprep.h       |    2 +-
 tests/tst_stringprep.c |    7 ++++++-
 6 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/NEWS b/NEWS
index 1b4b475..6551638 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ Libidn NEWS -- History of user-visible changes.                 -*- outline -*-
 Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
+* Version 1.26 (unreleased) [stable]
+
+** API and ABI is backwards compatible with the previous version.
+
 * Version 1.25 (released 2012-05-23) [stable]
 
 ** MSVC: Build fixes related to _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE.
diff --git a/cfg.mk b/cfg.mk
index 722bc48..e345e31 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -175,8 +175,7 @@ binaries-upload:
 	cd win32 && make -f libidn4win.mk upload VERSION=$(VERSION)
 
 source:
-	git commit -m Generated. ChangeLog
-	git tag -u b565716f! -m $(VERSION) $(tag)
+	git tag -u b565716f -m $(VERSION) $(tag)
 
 release-check: syntax-check i18n tarball binaries gendoc-copy gtkdoc-copy coverage-my coverage-copy clang clang-copy cyclo-copy javadoc-copy doxygen-copy
 
diff --git a/configure.ac b/configure.ac
index 4725137..f67afb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([GNU Libidn], [1.25], [bug-libidn@gnu.org])
+AC_INIT([GNU Libidn], [1.26], [bug-libidn@gnu.org])
 AC_COPYRIGHT([Copyright (c) 2002-2012 Simon Josefsson <simon@josefsson.org>.])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -31,7 +31,7 @@ AM_SILENT_RULES([yes])
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
 AC_SUBST(LT_CURRENT, 17)
-AC_SUBST(LT_REVISION, 8)
+AC_SUBST(LT_REVISION, 9)
 AC_SUBST(LT_AGE, 6)
 
 AC_PROG_CC
diff --git a/doc/announce.txt b/doc/announce.txt
index ead947a..762cffb 100644
--- a/doc/announce.txt
+++ b/doc/announce.txt
@@ -1,5 +1,5 @@
 To: help-libidn@gnu.org, info-gnu@gnu.org
-Subject: Libidn 1.24 released
+Subject: Libidn 1.25 released
 <#part sign=pgpmime>
 GNU Libidn is a fully documented implementation of the Stringprep,
 Punycode and IDNA specifications.  Libidn's purpose is to encode and
@@ -8,20 +8,15 @@ and Java libraries.
 
 Noteworthy changes since the last release (from NEWS file):
 
-* Version 1.24 (released 2012-01-10) [stable]
+* Version 1.25 (released 2012-05-23) [stable]
 
-** Libraries are re-licensed from LGPLv2+ to dual-GPLv2+|LGPLv3+.
+** MSVC: Build fixes related to _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE.
+Reported by Bartosz Brachaczek <b.brachaczek@gmail.com>.
 
-** build: Fix parallel Windows builds.
-Reported by René Berber <r.berber@computer.org>.
+** examples: Fix compiler warning about ignoring return value from fgets.
 
-** libidn: Fix potential infloop in pr29 code.
-Reported by Jon Nelson <jnelson@jamponi.net> in
-<http://lists.gnu.org/archive/html/help-libidn/2012-01/msg00008.html>.
-
-** libidn: Add 'const' keyword to 'stringprep_ucs4_nfkc_normalize' function.
-
-** Sync glib NFKC code and improve copyright/license statements.
+** tests: Ship with a valgrind suppressions file for the strlen issue.
+See tests/libidn.supp and  bottom of HACKING for discussion.
 
 ** Update gnulib files and translations.
 
@@ -96,33 +91,33 @@ invited to join our help-libidn mailing list, see:
   https://lists.gnu.org/mailman/listinfo/help-libidn
 
 Here are the compressed sources (3.2MB):
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24.tar.gz
-  http://ftp.gnu.org/gnu/libidn/libidn-1.24.tar.gz
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25.tar.gz
+  http://ftp.gnu.org/gnu/libidn/libidn-1.25.tar.gz
 
 Here are GPG detached signatures:
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24.tar.gz.sig
-  http://ftp.gnu.org/gnu/libidn/libidn-1.24.tar.gz.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25.tar.gz.sig
+  http://ftp.gnu.org/gnu/libidn/libidn-1.25.tar.gz.sig
 
 Here are the SHA-1 and SHA-224 signatures:
 
-4251c108966375ede4df15d76a1bd9a4440f44ee  libidn-1.24.tar.gz
-71599952df85af90915310a6a7660edac062965e83c01fe3ca0cfa4e  libidn-1.24.tar.gz
+92e64fd5a6428bda6ade2c3cde475b76455cd7dd  libidn-1.25.tar.gz
+99c62bb5fe91b3d04b6c8b1a1971c02ed9b383375f85644ad510e315  libidn-1.25.tar.gz
 
 We also provide Windows binaries built using MinGW-w64 with the build
 script win32/libidn4win.mk, for 32-bit and 64-bit x86 architecures:
 
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24-win32.zip
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24-win32.zip.sig
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24-win64.zip
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24-win64.zip.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25-win32.zip
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25-win32.zip.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25-win64.zip
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25-win64.zip.sig
 
 Here are the SHA-1 and SHA-224 signatures:
 
-994ffd7059ecc6a758fa9fc1b5735279d29bcca1  libidn-1.24-win32.zip
-a276074ae3c9b234375b94a8b639a0c45020cc01bfa98079a74c1cf0  libidn-1.24-win32.zip
+c2a736922059891ee8f99de9298b9cecda395a0b  libidn-1.25-win32.zip
+10f61aff34f2fbe6c04b142def549cce4636db4e9df261397fc27f13  libidn-1.25-win32.zip
 
-d22700214317f3ee9be7cec4a3fe6c31c135d3fa  libidn-1.24-win64.zip
-c144d02490709aaba114226bd120d33f97dd7eac21c38aef5c3f8e7e  libidn-1.24-win64.zip
+a0201ce2305ac9e38d9849dab6eac075d5eaaca1  libidn-1.25-win64.zip
+520d8e841c6f378422b2c667d4fdbf856d16b50b1b750522f74b44d3  libidn-1.25-win64.zip
 
 The software is cryptographically signed by the author using an OpenPGP
 key identified by the following information:
diff --git a/lib/stringprep.h b/lib/stringprep.h
index 1ff4db0..0d12a1e 100644
--- a/lib/stringprep.h
+++ b/lib/stringprep.h
@@ -51,7 +51,7 @@ extern "C"
 {
 # endif
 
-# define STRINGPREP_VERSION "1.25"
+# define STRINGPREP_VERSION "1.26"
 
 /* Error codes. */
   typedef enum
diff --git a/tests/tst_stringprep.c b/tests/tst_stringprep.c
index a55f30b..499bd2d 100644
--- a/tests/tst_stringprep.c
+++ b/tests/tst_stringprep.c
@@ -207,11 +207,16 @@ doit (void)
   size_t i;
 
   if (!stringprep_check_version (STRINGPREP_VERSION))
-    fail ("stringprep_check_version(%s) failed\n", STRINGPREP_VERSION);
+    fail ("stringprep_check_version failed (header %s runtime %s)\n",
+	  STRINGPREP_VERSION, stringprep_check_version (NULL));
 
   if (!stringprep_check_version (NULL))
     fail ("stringprep_check_version(NULL) failed\n");
 
+  if (strcmp (stringprep_check_version (NULL), STRINGPREP_VERSION) != 0)
+    fail ("stringprep_check_version failure (header %s runtime %s)\n",
+	  STRINGPREP_VERSION, stringprep_check_version (NULL));
+
   if (stringprep_check_version ("100.100"))
     fail ("stringprep_check_version(\"100.100\") failed\n");
 


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Thu May 31 15:54:57 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SaBST-0001Nj-IW
	for mharc-libidn-commit@gnu.org; Thu, 31 May 2012 15:54:57 -0400
Received: from eggs.gnu.org ([208.118.235.92]:48695)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SaBSQ-0001Nc-SD
	for libidn-commit@gnu.org; Thu, 31 May 2012 15:54:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SaBSO-00012J-UO
	for libidn-commit@gnu.org; Thu, 31 May 2012 15:54:54 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51538)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SaBSO-00012C-Qj
	for libidn-commit@gnu.org; Thu, 31 May 2012 15:54:52 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1SaBSL-0001M6-VO
	for libidn-commit@gnu.org; Thu, 31 May 2012 19:54:50 +0000
Date: Thu, 31 May 2012 19:54:49 +0000
Message-Id: <E1SaBSL-0001M6-VO@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-25-5-ge984640
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f0f88a30f9536bcaac26967d11a0e66f0984f40e
X-Git-Newrev: e9846400044601fb2aa10cde67fefd389d2dbf5a
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 31 May 2012 19:54:56 -0000

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=e9846400044601fb2aa10cde67fefd389d2dbf5a

The branch, master has been updated
       via  e9846400044601fb2aa10cde67fefd389d2dbf5a (commit)
      from  f0f88a30f9536bcaac26967d11a0e66f0984f40e (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 e9846400044601fb2aa10cde67fefd389d2dbf5a
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu May 31 21:54:44 2012 +0200

    Use https URLs.

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

Summary of changes:
 README |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index cf1fc8c..d71461e 100644
--- a/README
+++ b/README
@@ -14,9 +14,9 @@ the manual, or make a monetary donation.
 
 If you need help to use Libidn, or wish to help others, you are
 invited to join our mailing list help-libidn@gnu.org, see
-<http://lists.gnu.org/mailman/listinfo/help-libidn>.
+<https://lists.gnu.org/mailman/listinfo/help-libidn>.
 
-For more information, see <http://www.gnu.org/software/libidn/>.
+For more information, see <https://www.gnu.org/software/libidn/>.
 
 For any copyright year range specified as YYYY-ZZZZ in this package
 note that the range specifies every single year in that closed interval.


hooks/post-receive
-- 
GNU libidn


