>Number:         33638
>Category:       pkg
>Synopsis:       patch to update security/gsasl to 0.2.12 and add more features
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Jun 03 00:45:00 +0000 2006
>Originator:     Jonathan A. Kollasch
>Release:        NetBSD 3.0
>Environment:
System: NetBSD kirkkit.kollasch.net 3.0 NetBSD 3.0 (GENERIC) #0: Mon Dec 19 01:04:02 UTC 2005 builds@works.netbsd.org:/home/builds/ab/netbsd-3-0-RELEASE/i386/200512182024Z-obj/home/builds/ab/netbsd-3-0-RELEASE/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
 The security/gsasl package in pkgsrc is outdated and doesn't work
with a "real" Kerberos implementation.
>How-To-Repeat:
 Try to use msmtp (which depends on gsasl) to authenticate to
a gssapi-enabled smtp server using your Kerberos tickets from
heimdal or mit-krb5.
>Fix:

Only tested with the base heimdal.  Removes support for GNU GSS
(which relys on Kerberos tickets from GNU Shishi)

It seemed that (according to configure output) libgcrypt wasn't
actually being used unless I told configure to use it, so I told
configure to look for it.


Against a recent pkgsrc-current:

diff -ur gsasl.orig/Makefile gsasl/Makefile
--- gsasl.orig/Makefile	2006-06-02 18:21:22.000000000 -0500
+++ gsasl/Makefile	2006-05-31 22:17:46.000000000 -0500
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.17 2006/03/31 23:56:29 jlam Exp $
 
-DISTNAME=		gsasl-0.2.5
-PKGREVISION=		1
+DISTNAME=		gsasl-0.2.12
+#PKGREVISION=
 CATEGORIES=		security
 MASTER_SITES=		http://josefsson.org/gsasl/releases/ \
 			${MASTER_SITE_GNU:=gsasl/}
@@ -18,6 +18,10 @@
 
 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
@@ -25,7 +29,7 @@
 .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"
 
 .include "../../mk/bsd.pkg.mk"
diff -ur gsasl.orig/buildlink3.mk gsasl/buildlink3.mk
--- gsasl.orig/buildlink3.mk	2006-06-02 18:21:22.000000000 -0500
+++ gsasl/buildlink3.mk	2006-06-01 00:04:21.000000000 -0500
@@ -12,14 +12,14 @@
 
 .if !empty(GSASL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gsasl+=	gsasl>=0.2.3
-BUILDLINK_ABI_DEPENDS.gsasl?=	gsasl>=0.2.5nb1
+BUILDLINK_ABI_DEPENDS.gsasl?=	gsasl>=0.2.12
 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 -ur gsasl.orig/distinfo gsasl/distinfo
--- gsasl.orig/distinfo	2006-06-02 18:21:22.000000000 -0500
+++ gsasl/distinfo	2006-05-31 21:54:15.000000000 -0500
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.4 2005/02/24 13:10:06 agc 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.12.tar.gz) = 8221e923d37dde93549ba911df5fbb4631341605
+RMD160 (gsasl-0.2.12.tar.gz) = 327e237fdd933ba1d410e1b6e37b0351d2f977ee
+Size (gsasl-0.2.12.tar.gz) = 2725477 bytes