Update gsasl to 0.2.15, based on patch provided by PR 33638.

* Version 0.2.15 (released 2006-08-22)

** Changed libgsasl shared library version.
The shared library version was not incremented correctly in the last
release, even though new APIs were added.

* Version 0.2.14 (released 2006-08-19)

** New section "Requirements" in the manual, lists the external components.
Suggested by James Mansion.

** Update of gnulib files.

* Version 0.2.13 (released 2006-06-14)

** Update of gnulib files.
Further improves portability to MinGW.

** Various improvements in the manuals.

** The tests are run under valgrind, if it is installed.
Use --disable-valgrind-tests to unconditionally disable this.  It is
disabled by default for cross compiles.

** Various minor fixes.

* Version 0.2.12 (released 2006-03-08)

** Update of gnulib files.
Improves portability to Mingw32.

* Version 0.2.11 (released 2006-02-07)

** Ported to Windows by cross-compiling using Mingw32.
Using Debian's mingw32 compiler, you can build it for Windows by invoking
`./configure --host=i586-mingw32msvc --disable-gssapi'.

** Update of gnulib files.

* Version 0.2.10 (released 2005-10-23)

** Work around bug in GnuTLS that made the command line tool exit after
** failing to write a zero length message to the peer.

** Don't use GnuTLS if gnutls_certificate_verify_peers2 isn't present.

** Update of gnulib files.

* Version 0.2.9 (released 2005-10-07)

** Update of gnulib files.

* Version 0.2.8 (released 2005-09-08)

** The gsasl tool now support STARTTLS for IMAP and SMTP using GnuTLS.

** The --client and --server parameters for the gsasl tool now work properly.

** The --client and --server stdin/stdout modes now use the readline library.

** Fixed build problems in getpass on uClibc and Mingw32 platforms.

** Kinyarwanda translation added.

* Version 0.2.7 (released 2005-08-25)

** Fix build problems when cross-compiling to uClibc and Mingw32 platforms.

** Detecting and using the readline library has been improved.

* Version 0.2.6 (released 2005-08-08)

** The gsasl tool now try to connect to all addresses for a server name.

** The help-gsasl@gnu.org mailing list is now mentioned in documentation.

** The license template in files were updated with the new FSF address.

** Update of gnulib files.

4 files changed, 22 insertions, 16 deletions

diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 136b46b6219..03d2d6b886c 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2006/04/13 18:23:37 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/09 14:06:13 obache Exp $
 
-DISTNAME=		gsasl-0.2.5
-PKGREVISION=		1
+DISTNAME=		gsasl-0.2.15
 CATEGORIES=		security
 MASTER_SITES=		http://josefsson.org/gsasl/releases/ \
-			${MASTER_SITE_GNU:=gsasl/}
+			ftp://alpha.gnu.org/pub/gnu/gsasl/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/gsasl/
@@ -18,14 +17,20 @@ TEST_TARGET=		check
 
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-libgcrypt
+CONFIGURE_ARGS+=	--enable-gssapi=${GSSIMPL.${KRB5_TYPE}}
+GSSIMPL.heimdal=	heimdal
+GSSIMPL.mit-krb5=	mit
 
-PKGCONFIG_OVERRIDE+=    libgsasl.pc.in
-INFO_FILES=		# PLIST
+PKGCONFIG_OVERRIDE+=	lib/libgsasl.pc.in
+INFO_FILES=		YES
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/libntlm/buildlink3.mk"
-.include "../../security/gss/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
+.include "../../mk/krb5.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gsasl/PLIST b/security/gsasl/PLIST
index b1e54746da4..bd299fa927b 100644
--- a/security/gsasl/PLIST
+++ b/security/gsasl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/12/09 14:06:13 obache Exp $
 bin/gsasl
 include/gsasl-compat.h
 include/gsasl-mech.h
@@ -108,6 +108,8 @@ man/man3/gsasl_server_step.3
 man/man3/gsasl_server_step_base64.3
 man/man3/gsasl_server_suggest_mechanism.3
 man/man3/gsasl_server_support_p.3
+man/man3/gsasl_session_hook_get.3
+man/man3/gsasl_session_hook_set.3
 man/man3/gsasl_simple_getpass.3
 man/man3/gsasl_step.3
 man/man3/gsasl_step64.3
diff --git a/security/gsasl/buildlink3.mk b/security/gsasl/buildlink3.mk
index 683735b3360..b94fe95929b 100644
--- a/security/gsasl/buildlink3.mk
+++ b/security/gsasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/12/09 14:06:13 obache Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GSASL_BUILDLINK3_MK:=	${GSASL_BUILDLINK3_MK}+
@@ -12,15 +12,14 @@ BUILDLINK_PACKAGES+=	gsasl
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsasl
 
 .if !empty(GSASL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gsasl+=	gsasl>=0.2.3
-BUILDLINK_ABI_DEPENDS.gsasl?=	gsasl>=0.2.5nb1
+BUILDLINK_API_DEPENDS.gsasl+=	gsasl>=0.2.15
 BUILDLINK_PKGSRCDIR.gsasl?=	../../security/gsasl
 .endif	# GSASL_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/libntlm/buildlink3.mk"
-.include "../../security/gss/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
+.include "../../mk/krb5.buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gsasl/distinfo b/security/gsasl/distinfo
index 264628af990..fa55bf7dd8c 100644
--- a/security/gsasl/distinfo
+++ b/security/gsasl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/28 13:29:31 wiz Exp $
+$NetBSD: distinfo,v 1.6 2006/12/09 14:06:13 obache Exp $
 
-SHA1 (gsasl-0.2.5.tar.gz) = 50efa73bb7f0cfd3da67c8d294d7ab5cc02dc9ad
-RMD160 (gsasl-0.2.5.tar.gz) = b9168c7629427c9e8d6af8525473f7aeb725f7fe
-Size (gsasl-0.2.5.tar.gz) = 2620281 bytes
+SHA1 (gsasl-0.2.15.tar.gz) = b0a043d086423a3eb538cfae15e383fb6f4126d0
+RMD160 (gsasl-0.2.15.tar.gz) = 454d5671ecb1f040f78939c7ac3878a78f4fc8ee
+Size (gsasl-0.2.15.tar.gz) = 2859611 bytes