enable use of sasl2

3 files changed, 45 insertions, 3 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 438e1d673d7..9fa003e972d 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2003/10/02 10:39:12 martti Exp $
+# $NetBSD: Makefile,v 1.104 2003/10/03 15:04:52 christos Exp $
 
 DISTNAME=	postfix-2.0.16
 CATEGORIES=	mail
@@ -77,13 +77,26 @@ BUILD_DEFS+=	POSTFIX_USE_MYSQL
 .endif
 
 .if defined(USE_SASL) && ${USE_SASL} == "YES"
+USING_SASL=YES
 .include "../../security/cyrus-sasl/buildlink2.mk"
 CCARGS+=	-DUSE_SASL_AUTH
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib		\
 		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
 		-lsasl
 BUILD_DEFS+=	USE_SASL
+.endif
+
+.if defined(USE_SASL2) && ${USE_SASL2} == "YES"
+USING_SASL=YES
+.include "../../security/cyrus-sasl2/buildlink2.mk"
+CCARGS+=	-DUSE_SASL2_AUTH
+AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl2}/lib		\
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl2}/lib	\
+		-lsasl2
+BUILD_DEFS+=	USE_SASL2
+.endif
 
+.if defined(USING_SASL)
 PLIST_SRC+=	${WRKDIR}/PLIST.sasl
 MESSAGE_SRC+=	${PKGDIR}/MESSAGE.sasl
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
@@ -146,11 +159,16 @@ pre-install:
 	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${SHAREDIR} ${LIBEXECDIR}
 	${CHMOD} 755 ${SHAREDIR} ${LIBEXECDIR}
 	-${RM} -f ${WRKSRC}/conf/*.orig
-.if defined(USE_SASL) && ${USE_SASL} == "YES"
+.if defined(USING_SASL)
 	${ECHO} "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf
+.if defined(USE_SASL2)
+	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${PREFIX}/lib/sasl2
+	${ECHO} lib/sasl2/smtpd.conf > ${WRKDIR}/PLIST.sasl
+.else
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${PREFIX}/lib/sasl
 	${ECHO} lib/sasl/smtpd.conf > ${WRKDIR}/PLIST.sasl
 .endif
+.endif
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${SHAREDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${SHAREDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${SHAREDIR}
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index fcb7441fd38..ce4b1838916 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2003/10/02 10:39:12 martti Exp $
+$NetBSD: distinfo,v 1.48 2003/10/03 15:04:52 christos Exp $
 
 SHA1 (postfix/postfix-2.0.16.tar.gz) = 6272be8b87df1142a467f2a4e13c4e27d00bf952
 Size (postfix/postfix-2.0.16.tar.gz) = 1353520 bytes
@@ -9,3 +9,4 @@ SHA1 (patch-ad) = 2f83cc6108eea4a1c401fe9e549d93430166f7fa
 SHA1 (patch-ae) = daa160ef54d725ca156f29322d45efcf4af6c02a
 SHA1 (patch-af) = 4d3a6c21d284dce1c75dcd4fc537af17a28a5e66
 SHA1 (patch-ag) = 7c59f4bee987dedc2fd5f193a8d5c980ac09ae82
+SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
diff --git a/mail/postfix/patches/patch-ah b/mail/postfix/patches/patch-ah
new file mode 100644
index 00000000000..b74ced4e727
--- /dev/null
+++ b/mail/postfix/patches/patch-ah
@@ -0,0 +1,23 @@
+$NetBSD: patch-ah,v 1.5 2003/10/03 15:04:52 christos Exp $
+
+--- src/smtpd/smtpd.h.orig	2003-10-02 06:48:30.000000000 -0400
++++ src/smtpd/smtpd.h	2003-10-02 06:48:31.000000000 -0400
+@@ -16,10 +16,18 @@
+  /*
+   * SASL library.
+   */
++#ifdef USE_SASL2_AUTH
++#ifndef USE_SASL_AUTH
++#define USE_SASL_AUTH
++#endif
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
++#else
+ #ifdef USE_SASL_AUTH
+ #include <sasl.h>
+ #include <saslutil.h>
+ #endif
++#endif
+ 
+  /*
+   * Utility library.