[SCM] GNU libidn branch, master, updated. libidn-1-25-4-gf0f88a3

[Simon Josefsson]

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

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=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 <address@hidden>
Date:   Mon May 28 18:28:12 2012 +0200

    Update for 1.25.

commit 89c8392556bbfde03812082b776297f2ffa1eabe
Author: Simon Josefsson <address@hidden>
Date:   Fri May 25 15:06:18 2012 +0200

    Improve debug output from version comparisons.

commit 25977e74836ee31720c7b60414f96ce91efb3616
Author: Simon Josefsson <address@hidden>
Date:   Wed May 23 10:53:40 2012 +0200

    Bump versions.

commit 01543d2dd1e6d049853101560df08d7a005e30e3
Author: Simon Josefsson <address@hidden>
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], address@hidden)
+AC_INIT([GNU Libidn], [1.26], address@hidden)
 AC_COPYRIGHT([Copyright (c) 2002-2012 Simon Josefsson <address@hidden>.])
 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: address@hidden, address@hidden
-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 <address@hidden>.
 
-** build: Fix parallel Windows builds.
-Reported by René Berber <address@hidden>.
+** examples: Fix compiler warning about ignoring return value from fgets.
 
-** libidn: Fix potential infloop in pr29 code.
-Reported by Jon Nelson <address@hidden> 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