Add cyrus-imapd 2.0.12, the cyrus mail server, supporting POP3 and

IMAP4 protocols.

PR:		ports/25597
Submitted by:	Christopher K Davis <ckd@ckdhr.com>

19 files changed, 123 insertions, 152 deletions

diff --git a/mail/cyrus-imapd2/files/imapd.conf b/mail/cyrus-imapd2/files/imapd.conf
index 8c657589f69f..eaae8d05ad8a 100644
--- a/mail/cyrus-imapd2/files/imapd.conf
+++ b/mail/cyrus-imapd2/files/imapd.conf
@@ -7,7 +7,7 @@
 
 # The pathname of the IMAP configuration directory
 #
-configdirectory: /usr/local/etc/imap
+configdirectory: /var/imap
 
 # The partition name used by default for new mailboxes
 #
@@ -115,9 +115,9 @@ 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).
+# sieve directory (ie. /var/imap/sieve/u/user).
 #
-sievedir: /usr/local/etc/imap/sieve
+sievedir: /var/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
diff --git a/mail/cyrus-imapd2/files/imapd.sh b/mail/cyrus-imapd2/files/imapd.sh
new file mode 100644
index 000000000000..e190969bf571
--- /dev/null
+++ b/mail/cyrus-imapd2/files/imapd.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+case "$1" in
+start)
+	if [ -x /usr/local/cyrus/bin/master -a \
+	     -f /usr/local/etc/cyrus.conf -a \
+	     -f /usr/local/etc/imapd.conf ]; then
+		/usr/local/cyrus/bin/master &
+		echo -n ' imapd'
+	fi
+	;;
+stop)
+	killall -u cyrus master && echo -n ' imapd'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/mail/cyrus-imapd2/files/inetd.conf.cyrus b/mail/cyrus-imapd2/files/inetd.conf.cyrus
deleted file mode 100644
index a38c90ac5ee9..000000000000
--- a/mail/cyrus-imapd2/files/inetd.conf.cyrus
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Example entry for inetd.conf for the Cyrus IMAP server.
-# $FreeBSD$
-#
-# Replace /usr/local with the path where you've installed the package.
-#
-# The IMAP-4 server.
-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   stream  tcp     nowait  cyrus   /usr/local/cyrus/bin/timsieved  sieve
-
diff --git a/mail/cyrus-imapd2/files/patch-ac b/mail/cyrus-imapd2/files/patch-ac
index ab7854846479..c9a2a9eb6353 100644
--- a/mail/cyrus-imapd2/files/patch-ac
+++ b/mail/cyrus-imapd2/files/patch-ac
@@ -1,11 +1,13 @@
---- configure	Thu Jan  6 22:28:51 2000
-+++ /tmp/configure.new	Sat Apr  8 20:55:29 2000
-@@ -4951,7 +4951,7 @@
-     # try the user-specified path --- too lazy to test for it right now
-     LIB_SASL="-L$sasldir/lib -lsasl"
-     
--    SASLFLAGS="-I$sasldir/include"
-+    SASLFLAGS="-I$sasldir/include/sasl"
-         
-   fi
+Index: configure
+diff -u configure.orig configure
+--- configure.orig	Thu Dec 21 06:39:31 2000
++++ configure	Thu Jan  4 23:22:47 2001
+@@ -4178,7 +4178,7 @@
+ 	cmu_saved_LIBS=$LIBS
+ 	if test -d ${with_sasl}; then
+           ac_cv_sasl_where_lib=${with_sasl}/lib
+-          ac_cv_sasl_where_inc=${with_sasl}/include
++          ac_cv_sasl_where_inc=${with_sasl}/include/sasl
  
+ 	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
+ 	  LIB_SASL="-L$ac_cv_sasl_where_lib"
diff --git a/mail/cyrus-imapd2/files/patch-ad b/mail/cyrus-imapd2/files/patch-ad
deleted file mode 100644
index bcd310e991d3..000000000000
--- a/mail/cyrus-imapd2/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sun Apr  9 01:13:23 2000
-+++ configure.in	Sun Apr  9 01:13:43 2000
-@@ -528,7 +528,7 @@
-       # filename, it should be safe to add it (to the front of the line --
-       # somef vendors have older, badly installed tclshs that we want to avoid
-       # if we can)
--      AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown")
-+      AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown")
-     fi
- 
-     # Do we know where to get a tclsh?
diff --git a/mail/cyrus-imapd2/files/patch-ae b/mail/cyrus-imapd2/files/patch-ae
deleted file mode 100644
index dde3c7177004..000000000000
--- a/mail/cyrus-imapd2/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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",
diff --git a/mail/cyrus-imapd2/files/patch-af b/mail/cyrus-imapd2/files/patch-af
new file mode 100644
index 000000000000..0a8d78f88d0c
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-af
@@ -0,0 +1,13 @@
+Index: imap/lmtpd.c
+diff -u imap/lmtpd.c.orig imap/lmtpd.c
+--- imap/lmtpd.c.orig	Wed Dec 20 04:31:41 2000
++++ imap/lmtpd.c	Thu Jan  4 23:26:22 2001
+@@ -407,7 +407,7 @@
+     }
+ }
+ 
+-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
+ #define DEFAULT_POSTMASTER ("postmaster")
+ 
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd2/files/patch-ag b/mail/cyrus-imapd2/files/patch-ag
new file mode 100644
index 000000000000..d22ee0d59350
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-ag
@@ -0,0 +1,13 @@
+Index: imap/lmtpproxyd.c
+diff -u imap/lmtpproxyd.c.orig imap/lmtpproxyd.c
+--- imap/lmtpproxyd.c.orig	Wed Dec 20 04:31:41 2000
++++ imap/lmtpproxyd.c	Thu Jan  4 23:26:48 2001
+@@ -398,7 +398,7 @@
+     }
+ }
+ 
+-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
+ #define DEFAULT_POSTMASTER ("postmaster")
+ 
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd2/files/patch-bb b/mail/cyrus-imapd2/files/patch-bb
deleted file mode 100644
index 11f8698c92eb..000000000000
--- a/mail/cyrus-imapd2/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- cyradm/Makefile.in.orig	Fri Aug  7 08:48:26 1998
-+++ cyradm/Makefile.in	Mon May 10 02:40:06 1999
-@@ -33,8 +33,8 @@
- RANLIB = @RANLIB@
- 
- DEFS = @DEFS@ @TCL_DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@
--LIBS =  @TCL_LIBS@ @IMAP_LIBS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@
-+LIBS =  @TCL_LIBS@ -lm @IMAP_LIBS@
- DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
- 
- CFLAGS = @CFLAGS@
diff --git a/mail/cyrus-imapd2/files/patch-bc b/mail/cyrus-imapd2/files/patch-bc
index 5310441ee96c..f31ed31d722f 100644
--- a/mail/cyrus-imapd2/files/patch-bc
+++ b/mail/cyrus-imapd2/files/patch-bc
@@ -1,19 +1,13 @@
-*** imap/Makefile.in.orig	Fri Nov  5 01:00:34 1999
---- imap/Makefile.in	Thu Mar  9 18:59:14 2000
-***************
-*** 45,51 ****
-  CYRUS_USER=@cyrus_user@
-  CYRUS_GROUP=@cyrus_group@
-  
-! DEFS = @DEFS@ @LOCALDEFS@
-  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-  IMAP_LIBS = @IMAP_LIBS@
-  SIEVE_LIBS = @SIEVE_LIBS@
---- 45,51 ----
-  CYRUS_USER=@cyrus_user@
-  CYRUS_GROUP=@cyrus_group@
-  
-! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
-  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-  IMAP_LIBS = @IMAP_LIBS@
-  SIEVE_LIBS = @SIEVE_LIBS@
+Index: imap/Makefile.in
+diff -u imap/Makefile.in.orig imap/Makefile.in
+--- imap/Makefile.in.orig	Tue Dec 19 05:27:14 2000
++++ imap/Makefile.in	Thu Jan  4 23:30:15 2001
+@@ -64,7 +64,7 @@
+ CYRUS_USER=@cyrus_user@
+ CYRUS_GROUP=@cyrus_group@
+ 
+-DEFS = @DEFS@ @LOCALDEFS@
++DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
+ CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @ZEPHYR_CPPFLAGS@ @SASLFLAGS@
+ IMAP_LIBS = @IMAP_LIBS@
+ SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd2/files/patch-bf b/mail/cyrus-imapd2/files/patch-bf
deleted file mode 100644
index 0252ec589130..000000000000
--- a/mail/cyrus-imapd2/files/patch-bf
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Fri Dec  4 11:34:53 1998
-+++ configure.in	Sun Apr  9 12:16:24 2000
-@@ -698,6 +698,8 @@
- 
-     dnl Kerberos wants this so we might as well check on it first
-     AC_CHECK_FUNC(res_search,,AC_CHECK_LIB(resolv,res_search))
-+    dnl Kerberos IV on FreeBSD depends on libcom_err, so check for it
-+    AC_CHECK_LIB(com_err, init_error_table)
- 
-     dnl gotta do this: crypt is used by sasl_krb_server.c
-     AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt, crypt))
diff --git a/mail/cyrus-imapd2/files/patch-bg b/mail/cyrus-imapd2/files/patch-bg
deleted file mode 100644
index 964814930475..000000000000
--- a/mail/cyrus-imapd2/files/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Fri Dec  4 12:03:58 1998
-+++ configure	Sat Apr 15 11:44:42 2000
-@@ -3348,6 +3348,9 @@
- 
- fi
- 
-+# Kerberos IV on FreeBSD depends on libcom_err.
-+LIBS="-lcom_err $LIBS" 
-+echo '#define HAVE_LIBCOM_ERR 1' >> confdefs.h
- 
-         echo $ac_n "checking for crypt""... $ac_c" 1>&6
- echo "configure:3354: checking for crypt" >&5
diff --git a/mail/cyrus-imapd2/files/patch-bh b/mail/cyrus-imapd2/files/patch-bh
deleted file mode 100644
index d9fcb4716f4d..000000000000
--- a/mail/cyrus-imapd2/files/patch-bh
+++ /dev/null
@@ -1,11 +0,0 @@
---- timsieved/Makefile.in.orig	Sun Apr  9 01:52:10 2000
-+++ timsieved/Makefile.in	Sun Apr  9 01:52:37 2000
-@@ -34,7 +34,7 @@
- CYRUS_GROUP=@cyrus_group@
- 
- DEFS = @DEFS@ @LOCALDEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- 
diff --git a/mail/cyrus-imapd2/files/patch-bi b/mail/cyrus-imapd2/files/patch-bi
deleted file mode 100644
index 38f5bb4ad0e7..000000000000
--- a/mail/cyrus-imapd2/files/patch-bi
+++ /dev/null
@@ -1,11 +0,0 @@
---- installsieve/Makefile.in.orig	Sun Apr  9 01:58:03 2000
-+++ installsieve/Makefile.in	Sun Apr  9 01:58:35 2000
-@@ -28,7 +28,7 @@
- CC = @CC@
- 
- DEFS = @DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- 
diff --git a/mail/cyrus-imapd2/files/patch-bj b/mail/cyrus-imapd2/files/patch-bj
deleted file mode 100644
index adc8e7e3274d..000000000000
--- a/mail/cyrus-imapd2/files/patch-bj
+++ /dev/null
@@ -1,11 +0,0 @@
---- timsieved/config.c	Sun Apr  9 07:58:37 2000
-+++ config.c	Sun Apr  9 07:58:47 2000
-@@ -41,7 +41,7 @@
- 
- extern int errno;
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#define CONFIG_FILENAME "/usr/local/etc/imapd.conf"
- 
- struct configlist {
-     char *key;
diff --git a/mail/cyrus-imapd2/files/patch-ca b/mail/cyrus-imapd2/files/patch-ca
deleted file mode 100644
index 87ec8c6c0aaa..000000000000
--- a/mail/cyrus-imapd2/files/patch-ca
+++ /dev/null
@@ -1,10 +0,0 @@
---- sieve/comparator.h.orig	Sun Nov 12 18:00:13 2000
-+++ sieve/comparator.h	Sun Nov 12 18:00:19 2000
-@@ -31,6 +31,7 @@
- #ifdef HAVE_RX
- #include <rxposix.h>
- #else
-+#include <sys/types.h>
- #include <regex.h>
- #endif
- #endif
diff --git a/mail/cyrus-imapd2/files/patch-dc b/mail/cyrus-imapd2/files/patch-dc
new file mode 100644
index 000000000000..c913dc4f35ee
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-dc
@@ -0,0 +1,13 @@
+Index: master/Makefile.in
+diff -u master/Makefile.in.orig master/Makefile.in
+--- master/Makefile.in.orig	Fri Dec 15 04:26:50 2000
++++ master/Makefile.in	Sat Jan  6 06:08:21 2001
+@@ -52,7 +52,7 @@
+ CYRUS_USER=@cyrus_user@
+ CYRUS_GROUP=@cyrus_group@
+ 
+-DEFS = @DEFS@ @LOCALDEFS@
++DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
+ CPPFLAGS = -I. -I.. -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
+ DEPLIBS = @DEPLIBS@
+ 
diff --git a/mail/cyrus-imapd2/files/patch-dd b/mail/cyrus-imapd2/files/patch-dd
new file mode 100644
index 000000000000..94c0d694fa90
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-dd
@@ -0,0 +1,14 @@
+Index: master/masterconf.c
+diff -u master/masterconf.c.orig master/masterconf.c
+--- master/masterconf.c.orig	Wed May 24 05:56:30 2000
++++ master/masterconf.c	Sat Jan  6 06:07:22 2001
+@@ -60,7 +60,9 @@
+ 
+ extern int errno;
+ 
++#if !defined(CONFIG_FILENAME)
+ #define CONFIG_FILENAME "/etc/cyrus.conf"
++#endif
+ 
+ struct configlist {
+     char *key;
diff --git a/mail/cyrus-imapd2/files/patch-df b/mail/cyrus-imapd2/files/patch-df
new file mode 100644
index 000000000000..93540e209402
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-df
@@ -0,0 +1,22 @@
+Index: master/service.c
+===================================================================
+RCS file: /usr/home/ume/ncvs/src/cyrus-imapd/master/service.c,v
+retrieving revision 1.2
+diff -u -r1.2 service.c
+--- master/service.c	2001/02/01 14:11:43	1.2
++++ master/service.c	2001/02/01 22:10:35
+@@ -99,7 +99,13 @@
+     
+     /* is this a connection from the local host? */
+     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
+-	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
++	switch (((struct sockaddr *)&sin)->sa_family) {
++	case AF_INET:
++#ifdef INET6
++	case AF_INET6:
++#endif
++	    break;
++	default:
+ 	    return 1;
+ 	}
+     }