- Chase checksum for sasl-1.5.27-ldap-ssl-filter-mysql-patch4.tgz

  author fixed bug in patch but didn't increment version.
- Fix problem when openldap v1 is selected.
- Bump PORTREVISION

PR:		ports/39800
Submitted by:	maintainer

4 files changed, 25 insertions, 5 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index d1c85bae5e90..410e5e3a1a00 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-sasl
 PORTVERSION=	1.5.27
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		http://www.surf.org.uk/downloads/ \
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 74e0806a812f..d11c5893e6e9 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,4 +1,4 @@
 MD5 (cyrus-sasl-1.5.27.tar.gz) = 76ea426e2e2da3b8d2e3a43af5488f3b
-MD5 (sasl-1.5.27-ldap-ssl-filter-mysql-patch4.tgz) = 3dc800b8a173adb419b6ea9ed8ba5f20
+MD5 (sasl-1.5.27-ldap-ssl-filter-mysql-patch4.tgz) = 3e2b5cf7c5f8f0e8551f28a8d83391bb
 MD5 (sasl_apop_patch.gz) = 6bf7a34b73d1c8d139d2269069d1ba4c
 MD5 (cyrus-sasl-1.5.27-ipv6-20020106.diff.gz) = b2956a084954a46ba2d751f56a80a275
diff --git a/security/cyrus-sasl/files/patch-lib::checkpw.c b/security/cyrus-sasl/files/patch-lib::checkpw.c
new file mode 100644
index 000000000000..3bc40e300107
--- /dev/null
+++ b/security/cyrus-sasl/files/patch-lib::checkpw.c
@@ -0,0 +1,17 @@
+--- lib/checkpw.c.orig	Mon Jun 17 18:28:29 2002
++++ lib/checkpw.c	Mon Jun 17 18:31:44 2002
+@@ -1667,12 +1667,14 @@
+     return SASL_FAIL;
+   }
+   /* setting dereferensing aliases mode */
++#ifdef LDAP_OPT_DEREF
+   if (ldap_set_option(ld, LDAP_OPT_DEREF, (void *) &ldap_deref) != LDAP_OPT_SUCCESS) {
+     if (reply) {
+       *reply = "cannot set deref options";
+     }
+     return SASL_FAIL;
+   }
++#endif
+   /* set ssl mode if needed */
+ #ifdef LDAP_OPT_X_TLS
+   if ( ldap_ssl_flag ) {
diff --git a/security/cyrus-sasl/pkg-install b/security/cyrus-sasl/pkg-install
index 2c1c68c35df0..3e0c005656de 100644
--- a/security/cyrus-sasl/pkg-install
+++ b/security/cyrus-sasl/pkg-install
@@ -67,9 +67,12 @@ create_user() {
 		fi
 		echo "*** Updated user \`${USER}'."
 	fi
-	if ! ${PW} group mod ${USER} -m daemon; then
-		echo "*** can't add user \`${USER}' to group \`${GROUP}'"
-	fi
+# Don't know why we need the daemon user in the cyrus group
+# hopefully this doesn't affect anyone. It's a leftover from
+# the pre-SASL cyrus-imapd server.
+#	if ! ${PW} group mod ${GROUP} -m daemon; then
+#		echo "*** can't add user \`daemon' to group \`${GROUP}'"
+#	fi
 }
 
 create_sasldb() {