[SCM] GNU gsasl branch, master, updated. gsasl-1-4-1-93-g3d8f799

[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=3d8f799094342713a5ca2a8d0401a5eb856b53d6

The branch, master has been updated
       via  3d8f799094342713a5ca2a8d0401a5eb856b53d6 (commit)
       via  714fbcc03f104b4d8b76d31b3af79f45569aae3c (commit)
       via  9bf8c09171ba3df290d90c0e8d53450246966e39 (commit)
      from  2ad7ed5fb03d39b78ef50c4dc906bce57d2d32e8 (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 3d8f799094342713a5ca2a8d0401a5eb856b53d6
Author: Simon Josefsson <address@hidden>
Date:   Tue Mar 30 12:52:11 2010 +0200

    Require GNU GSS version 1.0.0 or later.

commit 714fbcc03f104b4d8b76d31b3af79f45569aae3c
Author: Simon Josefsson <address@hidden>
Date:   Tue Mar 30 12:46:56 2010 +0200

    Drop GS2 README.

commit 9bf8c09171ba3df290d90c0e8d53450246966e39
Author: Simon Josefsson <address@hidden>
Date:   Tue Mar 30 12:44:39 2010 +0200

    Typo.

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

Summary of changes:
 lib/NEWS            |    4 ++--
 lib/configure.ac    |   16 ++++++++++++++--
 lib/gs2/Makefile.am |    2 --
 lib/gs2/README      |   21 ---------------------
 4 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 lib/gs2/README

diff --git a/lib/NEWS b/lib/NEWS
index 6582793..0c348be 100644
--- a/lib/NEWS
+++ b/lib/NEWS
@@ -6,8 +6,8 @@ See the end for copying conditions.
 
 ** GS2-KRB5: New mechanism GS2 with support for Kerberos V5.
 The supported GSS-API implementations are GNU GSS, MIT Kerberos or
-Heimdal.  The GS2-KRB5-PLUS variant with TLS channel bindings are not
-supported.
+Heimdal.  The GS2-KRB5-PLUS variant with TLS channel bindings is not
+supported.  GNU GSS version 1.0.0 or later is required.
 
 ** DIGEST-MD5: The server code now returns GSASL_OK after the final token.
 
diff --git a/lib/configure.ac b/lib/configure.ac
index cb11d8f..8e8db00 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -194,7 +194,13 @@ fi
 
 if test "$gssapi_impl" = "gss"; then
   AC_MSG_NOTICE([trying GSS])
-  AC_LIB_HAVE_LINKFLAGS(gss,, [#include <gss.h>], [gss_check_version (0);])
+  AC_LIB_HAVE_LINKFLAGS(gss,, [#include <gss.h>], [
+#if GSS_VERSION_NUMBER < 0x010000
+too old version
+#else
+gss_check_version (0);
+#endif
+])
   if test "$ac_cv_libgss" != yes; then
     gssapi_impl=no
     AC_MSG_WARN([GNU GSS not found, disabling GSSAPI.])
@@ -223,7 +229,13 @@ elif test "$gssapi_impl" != "no"; then
   AC_MSG_NOTICE([auto-detecing GSS/MIT/Heimdal])
   AC_MSG_NOTICE([use --with-gssapi-impl=IMPL to hard code])
   AC_MSG_NOTICE([where IMPL is `gss', `mit', or `heimdal'])
-  AC_LIB_HAVE_LINKFLAGS(gss,, [#include <gss.h>], [gss_check_version (0);])
+  AC_LIB_HAVE_LINKFLAGS(gss,, [#include <gss.h>], [
+#if GSS_VERSION_NUMBER < 0x010000
+too old version
+#else
+gss_check_version (0);
+#endif
+])
   if test "$ac_cv_libgss" = yes; then
     gssapi_impl=gss
     AC_MSG_NOTICE([GNU GSS found])
diff --git a/lib/gs2/Makefile.am b/lib/gs2/Makefile.am
index 4350ba6..c92276a 100644
--- a/lib/gs2/Makefile.am
+++ b/lib/gs2/Makefile.am
@@ -23,8 +23,6 @@ AM_CFLAGS += $(CFLAG_VISIBILITY)
 AM_CPPFLAGS = -I$(srcdir)/../src -I../src -I$(srcdir)/../gl -I../gl \
        $(GSS_CFLAGS)
 
-EXTRA_DIST = README
-
 noinst_LTLIBRARIES = libgsasl-gs2.la
 libgsasl_gs2_la_SOURCES = gs2.h mechinfo.c \
        gs2helper.h gs2helper.c
diff --git a/lib/gs2/README b/lib/gs2/README
deleted file mode 100644
index 3e45583..0000000
--- a/lib/gs2/README
+++ /dev/null
@@ -1,21 +0,0 @@
-GS2 README -- Notes on the implementation
-Copyright (C) 2006, 2007 Simon Josefsson
-See the end for copying conditions.
-
-This directory holds an unfinished implementation of GS2, pending
-finalization of the standard.
-
-This module is written in portable C89.  It may be used as a
-stand-alone implementation, outside of the framework that GNU SASL
-provide.
-
-The files CLIENT.C and SERVER.C contain the glue between GNU SASL and
-the stand-alone implementation.  Currently it is the best (only)
-example on how to use the module.
-
-For updates to the project, see <http://www.gnu.org/software/gsasl/>.
-
-----------------------------------------------------------------------
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.


hooks/post-receive
-- 
GNU gsasl