Update mail/qmail-ldap to 20120221

- SMTPAUTHUSER option removed as it is now in upstream
- Apply upstream fixes from mailing lists

Changes:	http://www.nrg4u.com/qmail/QLDAPNEWS

3 files changed, 103 insertions, 2 deletions

diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index cd34f3d9a52b..c334e8d8ce39 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${LDAP_PATCH_DATE}
-PORTREVISION=	6
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-ldap
 
@@ -21,7 +21,7 @@ EXTRA_PATCHES+=	${MASTERDIR}/files/patch-Makefile \
 USE_OPENLDAP=	yes
 SLAVE_LDAP=	yes
 
-LDAP_PATCH_DATE=	20060201
+LDAP_PATCH_DATE=	20120221
 
 MASTERDIR=	${.CURDIR}/../qmail
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/mail/qmail-ldap/files/patch-20120221-fixes b/mail/qmail-ldap/files/patch-20120221-fixes
new file mode 100644
index 000000000000..3d91e7db5174
--- /dev/null
+++ b/mail/qmail-ldap/files/patch-20120221-fixes
@@ -0,0 +1,37 @@
+http://marc.info/?l=qmail-ldap&m=133012503615968&q=raw
+
+List:       qmail-ldap
+Subject:    Re: qmail-ldap-1.03-20120221.patch
+From:       Claudio Jeker <jeker () n-r-g ! com>
+Date:       2012-02-24 23:09:56
+
+Index: auth_dovecot.c
+===================================================================
+RCS file: /home/cvs-djbware/CVS/qmail-ldap/auth_dovecot.c,v
+retrieving revision 1.2
+diff -u -p -r1.2 auth_dovecot.c
+--- auth_dovecot.c	17 Apr 2009 19:51:58 -0000	1.2
++++ auth_dovecot.c	25 Feb 2012 00:08:05 -0000
+@@ -127,7 +127,9 @@ auth_setup(struct credentials *c)
+ void
+ auth_init(int argc, char **argv, stralloc *login, stralloc *authdata)
+ {
++#ifdef DEBUG
+ 	extern unsigned long loglevel;
++#endif
+ 	char		*l, *p;
+ 	unsigned int	uplen, u;
+ 	int		n, opt;
+@@ -140,10 +142,12 @@ auth_init(int argc, char **argv, strallo
+ 		case 'd':
+ 			pbstool = optarg;
+ 			break;
++#ifdef DEBUG
+ 		case 'D':
+ 			scan_ulong(optarg, &loglevel);
+ 			loglevel &= ~256;	/* see auth_mod.c */
+ 			break;
++#endif
+ 		default:
+ 			auth_error(AUTH_CONF);
+ 		}
diff --git a/mail/qmail-ldap/files/patch-20120221-fixes-2 b/mail/qmail-ldap/files/patch-20120221-fixes-2
new file mode 100644
index 000000000000..92291e2db8cd
--- /dev/null
+++ b/mail/qmail-ldap/files/patch-20120221-fixes-2
@@ -0,0 +1,64 @@
+http://marc.info/?l=qmail-ldap&m=133193764313080&q=raw
+
+List:       qmail-ldap
+Subject:    Re: Re: qmail-ldaplookup: fatal: qldap_filter: unspecified error
+From:       Claudio Jeker <jeker () n-r-g ! com>
+Date:       2012-03-16 22:39:36
+Message-ID: 20120316223936.GC2808 () diehard ! n-r-g ! com
+
+
+Index: qldap-filter.c
+===================================================================
+RCS file: /home/cvs-djbware/CVS/qmail-ldap/qldap-filter.c,v
+retrieving revision 1.10
+diff -u -p -r1.10 qldap-filter.c
+--- qldap-filter.c	10 Nov 2009 22:46:06 -0000	1.10
++++ qldap-filter.c	16 Mar 2012 23:37:23 -0000
+@@ -107,7 +107,7 @@ filter_uid(char *uid)
+ 		return 0;
+ 
+ 	if (!filter_start(&filter)  ||
+-	    !stralloc_copys(&filter,"(") ||
++	    !stralloc_cats(&filter,"(") ||
+ 	    !stralloc_cats(&filter, LDAP_UID) ||
+ 	    !stralloc_cats(&filter, "=") ||
+ 	    !filter_escape(&filter, uid, str_len(uid)) ||
+@@ -179,7 +179,6 @@ filter_mail(char *mail, int *done)
+ 		}
+ 		extcnt--;
+ #else
+-#error XXX XXX 
+ 		/* basic qmail-ldap behavior test for username@domain.com and
+ 		   catchall@domain.com */
+ 		ext = 0;
+@@ -193,7 +192,7 @@ filter_mail(char *mail, int *done)
+ 			/* build the search string for the email address */
+ 			/* mail address */
+ 			if (!filter_start(&filter) ||
+-			    !stralloc_copys(&filter, "(|(") ||
++			    !stralloc_cats(&filter, "(|(") ||
+ 			    !stralloc_cats(&filter, LDAP_MAIL) ||
+ 			    !stralloc_cats(&filter, "="))
+ 				return 0;
+Index: qmail-ldaplookup.c
+===================================================================
+RCS file: /home/cvs-djbware/CVS/qmail-ldap/qmail-ldaplookup.c,v
+retrieving revision 1.39
+diff -u -p -r1.39 qmail-ldaplookup.c
+--- qmail-ldaplookup.c	10 Nov 2009 22:43:06 -0000	1.39
++++ qmail-ldaplookup.c	16 Mar 2012 23:37:23 -0000
+@@ -223,12 +223,12 @@ int main(int argc, char **argv)
+ 		switch (mode) {
+ 		case mail:
+ 			f = filter_mail(value, &done);
+-			if (value == 0)
++			if (f == 0)
+ 				strerr_die2sys(1, FATAL, "building filter: ");
+ 			break;
+ 		case uid:
+ 			f = filter_uid(value);
+-			if (value == 0)
++			if (f == 0)
+ 				strerr_die2sys(1, FATAL, "building filter: ");
+ 			done = 1;
+ 			break;