Update to 1.6.24. Fix /var/pwcheck handling since that's moved to the

security/cyrus-sasl port.  Fix deliver.c so it uses the correct location
of sendmail (/usr/sbin/sendmail vs. /usr/lib/sendmail).  Open the port up
to the world after previous maintainer showed no interest in the port for
nearly 2 years.

PR:		22791, 22465
Submitted by:	Martti Kuparinen <martti.kuparinen@piuha.net>
		Scot W. Hetzel <hetzels@westbend.net>

4 files changed, 45 insertions, 27 deletions

diff --git a/mail/cyrus-imapd2/files/cyrus.sh b/mail/cyrus-imapd2/files/cyrus.sh
deleted file mode 100644
index 9248623a8fe2..000000000000
--- a/mail/cyrus-imapd2/files/cyrus.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-PREFIX=%%PREFIX%%
-
-case "$1" in
-
-start)
-	if [ -x ${PREFIX}/cyrus/bin/pwcheck ]
-	then
-		${PREFIX}/cyrus/bin/pwcheck & && echo -n " pwcheck"
-	fi
-	;;
-
-stop)
-	if [ -r /var/run/pwcheck.pid ]
-	then
-		kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
-	fi
-	;;
-
-*)
-	echo "usage: $0 {start|stop}" 1>&2
-	exit 64
-	;;
-
-esac
-
diff --git a/mail/cyrus-imapd2/files/imapd.conf b/mail/cyrus-imapd2/files/imapd.conf
index f9ff5924f0af..8c657589f69f 100644
--- a/mail/cyrus-imapd2/files/imapd.conf
+++ b/mail/cyrus-imapd2/files/imapd.conf
@@ -108,5 +108,32 @@ partition-default: /var/spool/imap
 #
 #loginuseacl: no
 
+# If enabled, deliver wil look for Sieve scripts in user's home directories:
+# ~user/.sieve.
+#
+sieveusehomedir: false
+
+# If sieveusehomedir is false, this directory is searched for Sieve scripts.
+# The active Sieve script is s called "default", placed in the users sieve
+# sieve directory (ie. /usr/local/etc/imap/sieve/u/user).
+#
+sievedir: /usr/local/etc/imap/sieve
+
+# If enabled, the partitions will also be hashed, in addition to the hashing
+# done on configuration directories.  This is recommended if one partition has
+# a very bushy mailbox tree.
+#
+#hashimapspool: false
+
+# The mechanism used by the server to verify plaintext passwords.  Possible
+# values include "PAM", "kerberos_v4", "passwd", and "shadow"
+#
+sasl_pwcheck_method: pwcheck
+
+# If  enabled,  the  SASL library will automatically create authentication
+# secrets when given a plaintext password.  See the SASL documentation.
+#
+#sasl_auto_transition: no
+
 #
 # EOF
diff --git a/mail/cyrus-imapd2/files/inetd.conf.cyrus b/mail/cyrus-imapd2/files/inetd.conf.cyrus
index f2878fac7aa6..c3dbb754aec3 100644
--- a/mail/cyrus-imapd2/files/inetd.conf.cyrus
+++ b/mail/cyrus-imapd2/files/inetd.conf.cyrus
@@ -10,3 +10,10 @@ imap4	stream	tcp	nowait	cyrus	/usr/local/cyrus/bin/imapd	imapd
 # To be able to access the IMAP mailbox by POP-3, use this line.
 pop3	stream	tcp	nowait	cyrus	/usr/local/cyrus/bin/pop3d	pop3d
 #
+# Program to upload user sieve scripts to the IMAP server.
+#
+# NOTE: you will need to add "sieve" to /etc/services.
+#       timsieved uses port 2000.
+#
+sieve   strean  tcp     nowait  cyrus   /usr/local/cyrus/bin/timsieved  sieve
+
diff --git a/mail/cyrus-imapd2/files/patch-ae b/mail/cyrus-imapd2/files/patch-ae
new file mode 100644
index 000000000000..dde3c7177004
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-ae
@@ -0,0 +1,11 @@
+--- imap/deliver.c.orig	Tue Jan  4 17:49:02 2000
++++ imap/deliver.c	Tue Oct 31 22:49:37 2000
+@@ -821,7 +821,7 @@
+     }
+ }
+ 
+-#define SENDMAIL "/usr/lib/sendmail"
++#define SENDMAIL "/usr/sbin/sendmail"
+ #define POSTMASTER "postmaster"
+ 
+ static char *month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",