[SCM] GNU gsasl branch, gsasl_1_4_x, updated. gsasl-1-4-3-2-g5c13f5c

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

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=5c13f5ca39258b9be2c57c2da7129fba2a87f640

The branch, gsasl_1_4_x has been updated
       via  5c13f5ca39258b9be2c57c2da7129fba2a87f640 (commit)
       via  5618c6fbf55a426f45f04f61b293f37f277bb72f (commit)
      from  d1dbbf823646da440217254deeba56ec4cb140da (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 5c13f5ca39258b9be2c57c2da7129fba2a87f640
Author: Simon Josefsson <address@hidden>
Date:   Thu Mar 25 11:26:00 2010 +0100

    Bump versions.

commit 5618c6fbf55a426f45f04f61b293f37f277bb72f
Author: Simon Josefsson <address@hidden>
Date:   Thu Mar 25 11:24:42 2010 +0100

    Add strnlen for portability.

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

Summary of changes:
 NEWS                           |    4 ++++
 configure.ac                   |    2 +-
 lib/NEWS                       |    7 +++++++
 lib/configure.ac               |    4 ++--
 lib/gl/Makefile.am             |   11 ++++++++++-
 lib/gl/m4/gnulib-cache.m4      |    3 ++-
 lib/gl/m4/gnulib-comp.m4       |    4 ++++
 lib/gl/m4/strnlen.m4           |   32 ++++++++++++++++++++++++++++++++
 lib/gl/{memxor.c => strnlen.c} |   26 +++++++++++---------------
 lib/src/gsasl.h                |    6 +++---
 10 files changed, 76 insertions(+), 23 deletions(-)
 create mode 100644 lib/gl/m4/strnlen.m4
 copy lib/gl/{memxor.c => strnlen.c} (60%)

diff --git a/NEWS b/NEWS
index 66fcb4d..b1a04ef 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ Note that changes to the GNU SASL Library is documented in 
lib/NEWS.
 This file track changes to the remaining, non-library, parts of GNU
 SASL.  That include the manual, the command line tool, and self tests.
 
+* Version 1.4.4 (unreleased) [stable]
+
+** See lib/NEWS.
+
 * Version 1.4.3 (released 2010-03-25) [stable]
 
 ** See lib/NEWS.
diff --git a/configure.ac b/configure.ac
index 1c4cc64..015662b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([GNU SASL], [1.4.3], address@hidden, [gsasl])
+AC_INIT([GNU SASL], [1.4.4], address@hidden, [gsasl])
 AC_CONFIG_AUX_DIR([lib/build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/NEWS b/lib/NEWS
index ff50563..607949a 100644
--- a/lib/NEWS
+++ b/lib/NEWS
@@ -2,6 +2,13 @@ GNU SASL LIBRARY NEWS -- History of user-visible changes.
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon 
Josefsson
 See the end for copying conditions.
 
+* Version 1.4.4 (unreleased) [stable]
+
+** SCRAM: Fix build error on platforms without strnlen.
+
+** API and ABI modifications.
+No changes since last version.
+
 * Version 1.4.3 (released 2010-03-25) [stable]
 
 ** SCRAM: Don't read out of bounds when parsing tokens.
diff --git a/lib/configure.ac b/lib/configure.ac
index d15b947..c135ca6 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # MA 02110-1301, USA.
 
 AC_PREREQ(2.61)
-AC_INIT([libgsasl], [1.4.3], address@hidden)
+AC_INIT([libgsasl], [1.4.4], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -29,7 +29,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
 AC_SUBST(LT_CURRENT, 14)
-AC_SUBST(LT_REVISION, 5)
+AC_SUBST(LT_REVISION, 6)
 AC_SUBST(LT_AGE, 7)
 
 # Used when creating libgsasl-XX.def.
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am
index ac51721..992c5e5 100644
--- a/lib/gl/Makefile.am
+++ b/lib/gl/Makefile.am
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgl --source-base=gl --m4-base=gl/m4 --doc-base=doc 
--tests-base=gltests --aux-dir=build-aux --with-tests 
--avoid=vc-list-files-tests --lgpl=2 --libtool --macro-prefix=gl --no-vc-files 
base64 crypto/gc crypto/gc-hmac-md5 crypto/gc-hmac-sha1 crypto/gc-md5 
crypto/gc-pbkdf2-sha1 crypto/gc-random crypto/gc-sha1 getline gettext 
lib-msvc-compat lib-symbol-versions lib-symbol-visibility maintainer-makefile 
memmem memxor minmax strverscmp vasprintf
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgl --source-base=gl --m4-base=gl/m4 --doc-base=doc 
--tests-base=gltests --aux-dir=build-aux --with-tests 
--avoid=vc-list-files-tests --lgpl=2 --libtool --macro-prefix=gl --no-vc-files 
base64 crypto/gc crypto/gc-hmac-md5 crypto/gc-hmac-sha1 crypto/gc-md5 
crypto/gc-pbkdf2-sha1 crypto/gc-random crypto/gc-sha1 getline gettext 
lib-msvc-compat lib-symbol-versions lib-symbol-visibility maintainer-makefile 
memmem memxor minmax strnlen strverscmp vasprintf
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
@@ -658,6 +658,15 @@ EXTRA_DIST += string.in.h
 
 ## end   gnulib module string
 
+## begin gnulib module strnlen
+
+
+EXTRA_DIST += strnlen.c
+
+EXTRA_libgl_la_SOURCES += strnlen.c
+
+## end   gnulib module strnlen
+
 ## begin gnulib module strverscmp
 
 
diff --git a/lib/gl/m4/gnulib-cache.m4 b/lib/gl/m4/gnulib-cache.m4
index 8b54b15..94ba128 100644
--- a/lib/gl/m4/gnulib-cache.m4
+++ b/lib/gl/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgl 
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests 
--aux-dir=build-aux --with-tests --avoid=vc-list-files-tests --lgpl=2 --libtool 
--macro-prefix=gl --no-vc-files base64 crypto/gc crypto/gc-hmac-md5 
crypto/gc-hmac-sha1 crypto/gc-md5 crypto/gc-pbkdf2-sha1 crypto/gc-random 
crypto/gc-sha1 getline gettext lib-msvc-compat lib-symbol-versions 
lib-symbol-visibility maintainer-makefile memmem memxor minmax strverscmp 
vasprintf
+#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgl 
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests 
--aux-dir=build-aux --with-tests --avoid=vc-list-files-tests --lgpl=2 --libtool 
--macro-prefix=gl --no-vc-files base64 crypto/gc crypto/gc-hmac-md5 
crypto/gc-hmac-sha1 crypto/gc-md5 crypto/gc-pbkdf2-sha1 crypto/gc-random 
crypto/gc-sha1 getline gettext lib-msvc-compat lib-symbol-versions 
lib-symbol-visibility maintainer-makefile memmem memxor minmax strnlen 
strverscmp vasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl/override])
@@ -37,6 +37,7 @@ gl_MODULES([
   memmem
   memxor
   minmax
+  strnlen
   strverscmp
   vasprintf
 ])
diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4
index ed3defc..9a638df 100644
--- a/lib/gl/m4/gnulib-comp.m4
+++ b/lib/gl/m4/gnulib-comp.m4
@@ -101,6 +101,8 @@ AC_DEFUN([gl_INIT],
   gl_STDIO_H
   gl_STDLIB_H
   gl_HEADER_STRING_H
+  gl_FUNC_STRNLEN
+  gl_STRING_MODULE_INDICATOR([strnlen])
   gl_FUNC_STRVERSCMP
   gl_STRING_MODULE_INDICATOR([strverscmp])
   gl_UNISTD_H
@@ -297,6 +299,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/stdlib.in.h
   lib/str-two-way.h
   lib/string.in.h
+  lib/strnlen.c
   lib/strverscmp.c
   lib/unistd.in.h
   lib/vasnprintf.c
@@ -367,6 +370,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/stdio_h.m4
   m4/stdlib_h.m4
   m4/string_h.m4
+  m4/strnlen.m4
   m4/strverscmp.m4
   m4/threadlib.m4
   m4/uintmax_t.m4
diff --git a/lib/gl/m4/strnlen.m4 b/lib/gl/m4/strnlen.m4
new file mode 100644
index 0000000..cd48948
--- /dev/null
+++ b/lib/gl/m4/strnlen.m4
@@ -0,0 +1,32 @@
+# strnlen.m4 serial 10
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software Foundation,
+dnl 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.
+
+AC_DEFUN([gl_FUNC_STRNLEN],
+[
+  dnl Persuade glibc <string.h> to declare strnlen().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
+  AC_CHECK_DECLS_ONCE([strnlen])
+  if test $ac_cv_have_decl_strnlen = no; then
+    HAVE_DECL_STRNLEN=0
+  fi
+
+  AC_FUNC_STRNLEN
+  if test $ac_cv_func_strnlen_working = no; then
+    # This is necessary because automake-1.6.1 doesn't understand
+    # that the above use of AC_FUNC_STRNLEN means we may have to use
+    # lib/strnlen.c.
+    #AC_LIBOBJ([strnlen])
+    AC_DEFINE([strnlen], [rpl_strnlen],
+      [Define to rpl_strnlen if the replacement function should be used.])
+    gl_PREREQ_STRNLEN
+  fi
+])
+
+# Prerequisites of lib/strnlen.c.
+AC_DEFUN([gl_PREREQ_STRNLEN], [:])
diff --git a/lib/gl/memxor.c b/lib/gl/strnlen.c
similarity index 60%
copy from lib/gl/memxor.c
copy to lib/gl/strnlen.c
index 7fec454..ab55e5b 100644
--- a/lib/gl/memxor.c
+++ b/lib/gl/strnlen.c
@@ -1,5 +1,6 @@
-/* memxor.c -- perform binary exclusive OR operation of two memory blocks.
-   Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+/* Find the length of STRING, but scan at most MAXLEN characters.
+   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,21 +16,16 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-/* Written by Simon Josefsson.  The interface was inspired by memxor
-   in Niels Möller's Nettle. */
-
 #include <config.h>
 
-#include "memxor.h"
-
-void *
-memxor (void *restrict dest, const void *restrict src, size_t n)
-{
-  char const *s = src;
-  char *d = dest;
+#include <string.h>
 
-  for (; n > 0; n--)
-    *d++ ^= *s++;
+/* Find the length of STRING, but scan at most MAXLEN characters.
+   If no '\0' terminator is found in that many characters, return MAXLEN.  */
 
-  return dest;
+size_t
+strnlen (const char *string, size_t maxlen)
+{
+  const char *end = memchr (string, '\0', maxlen);
+  return end ? (size_t) (end - string) : maxlen;
 }
diff --git a/lib/src/gsasl.h b/lib/src/gsasl.h
index b2479aa..8172151 100644
--- a/lib/src/gsasl.h
+++ b/lib/src/gsasl.h
@@ -51,7 +51,7 @@ extern "C"
    * version number.  Used together with gsasl_check_version() to
    * verify header file and run-time library consistency.
    */
-# define GSASL_VERSION "1.4.3"
+# define GSASL_VERSION "1.4.4"
 
   /**
    * GSASL_VERSION_MAJOR
@@ -84,7 +84,7 @@ extern "C"
    *
    * Since: 1.1
    */
-# define GSASL_VERSION_PATCH 3
+# define GSASL_VERSION_PATCH 4
 
   /**
    * GSASL_VERSION_NUMBER
@@ -95,7 +95,7 @@ extern "C"
    *
    * Since: 1.1
    */
-# define GSASL_VERSION_NUMBER 0x010403
+# define GSASL_VERSION_NUMBER 0x010404
 
   /* RFC 2222: SASL mechanisms are named by strings, from 1 to 20
    * characters in length, consisting of upper-case letters, digits,


hooks/post-receive
-- 
GNU gsasl