Re: pkg/33638: patch to update security/gsasl to 0.2.12

["Jonathan A. Kollasch" <jakllsch%kollasch.net@localhost>]

updated fix with 0.2.15


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/gsasl/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile    13 Apr 2006 18:23:37 -0000      1.18
+++ Makefile    7 Oct 2006 19:40:51 -0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2006/04/13 18:23:37 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/31 23:56:29 jlam 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@localhost
 HOMEPAGE=              http://www.gnu.org/software/gsasl/
@@ -18,14 +17,18 @@
 
 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
+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 "../../security/libgcrypt/buildlink3.mk"
+.include "../../mk/krb5.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/security/gsasl/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- PLIST       17 Apr 2006 07:07:33 -0000      1.8
+++ PLIST       7 Oct 2006 19:40:51 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:33 jlam Exp $
+@comment $NetBSD$
 bin/gsasl
 include/gsasl-compat.h
 include/gsasl-mech.h
@@ -108,6 +108,8 @@
 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
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/gsasl/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- buildlink3.mk       8 Jul 2006 23:11:06 -0000       1.11
+++ buildlink3.mk       7 Oct 2006 19:40:51 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:36 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GSASL_BUILDLINK3_MK:=  ${GSASL_BUILDLINK3_MK}+
@@ -12,15 +12,15 @@
 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_ABI_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/+$//}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/gsasl/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo    28 Feb 2005 13:29:31 -0000      1.5
+++ distinfo    7 Oct 2006 19:40:51 -0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/28 13:29:31 wiz Exp $
+$NetBSD$
 
-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