update to cyrus-imapd-2.2.10.

Patch by adrianp@.
While at it also make it build on OSX.

Changes to the Cyrus IMAP Server since 2.2.9

Fix 0 termination in mysasl_canon_user.
Check for imap magic plus buffer overflow in proxyd also (CAN-2004-1015).

Changes to the Cyrus IMAP Server since 2.2.8

Change ACLs correctly when renaming a user
Do not abandon std{in,out,err} file descriptors; syslog assumes it can
use stderr if syslogd isn't running.
Clean up imap magic plus to avoid buffer overrun (CAN-2004-1011)
Fix lack of bounds checking in PARTIAL and FETCH (CAN-2004-1012, CAN-2004-10
13)
Do not attempt to reuse a freed connection in lmtpproxyd.
Allow login without authentication with -N switch in proxyd.
Fix use of xrealloc and fold pointers in lmtpengine.

13 files changed, 78 insertions, 119 deletions

diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index d682b738698..cb60f5a076d 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2004/11/25 19:34:03 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2004/11/28 14:34:07 recht Exp $
 
-DISTNAME=	cyrus-imapd-2.2.8
-PKGREVISION=	4
+DISTNAME=	cyrus-imapd-2.2.10
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index 120ff7d7eaf..20479d0ff52 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.14 2004/11/17 21:16:45 jlam Exp $
+$NetBSD: distinfo,v 1.15 2004/11/28 14:34:07 recht Exp $
 
-SHA1 (cyrus-imapd-2.2.8.tar.gz) = ee9e52598728d77d69850db3781aa4388d9a453a
-Size (cyrus-imapd-2.2.8.tar.gz) = 1937828 bytes
-SHA1 (patch-aa) = cc69d4b39d53e14ba142a11f5da32c3e63075e11
-SHA1 (patch-ab) = ffaf8c21ca79b5f2dec22790b9e9005cf0ca641d
-SHA1 (patch-ac) = 923d93e0ee4679959619c7aa1714bf6e697a74b9
-SHA1 (patch-af) = 57ae4ef1a5ab39dfe22472945f4eccd29d70fb88
-SHA1 (patch-al) = a0e4d20bd11bf78f6ed2e8ee9e3cc7b8d7ba35c1
-SHA1 (patch-am) = 1508cc8520632628fba6f8a5658fe10ff801ecdd
-SHA1 (patch-an) = 4269f1c3be1ffb015bccb71c9d4f3d1347276b34
-SHA1 (patch-ao) = 155fd49ccba19e7324c87beef234e749d9d28b3a
+SHA1 (cyrus-imapd-2.2.10.tar.gz) = 460ff6e9fb9a69190661516a5a2217f14366dd15
+Size (cyrus-imapd-2.2.10.tar.gz) = 1946803 bytes
+SHA1 (patch-af) = 3bd6217395161e84b0191c24fbe93ad28d6291f0
+SHA1 (patch-al) = 6fa8967eb97f7cfdb93de86a45aa90ab3a1bd129
+SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b
 SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b
+SHA1 (patch-ba) = 98bea064fa4d97b0bb1ba2d1fcb4d30611ac706e
+SHA1 (patch-bb) = 8725d9008617acb392b904d76a353b8829fdfb33
+SHA1 (patch-bc) = 3266d52067aef8f4835670cba1be6c190ff94f15
diff --git a/mail/cyrus-imapd22/patches/patch-aa b/mail/cyrus-imapd22/patches/patch-aa
deleted file mode 100644
index 2df7412b729..00000000000
--- a/mail/cyrus-imapd22/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/10/17 22:07:32 recht Exp $
-
---- imap/imapd.c.orig	Thu Jul 15 18:19:18 2004
-+++ imap/imapd.c	Sun Oct 17 15:38:27 2004
-@@ -2447,10 +2447,6 @@
- 	    r = IMAP_PROTOCOL_ERROR;
- 	    goto done;
- 	}
--	if (size < 2) {
--	    r = IMAP_MESSAGE_NOBLANKLINE;
--	    goto done;
--	}
- 
- 	if (!isnowait) {
- 	    /* Tell client to send the message */
diff --git a/mail/cyrus-imapd22/patches/patch-ab b/mail/cyrus-imapd22/patches/patch-ab
deleted file mode 100644
index ef8e0e5745b..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/10/17 22:07:32 recht Exp $
-
---- imap/message.c.orig	Fri Feb 27 18:44:55 2004
-+++ imap/message.c	Sun Oct 17 15:38:34 2004
-@@ -285,7 +285,9 @@
-     /* Go back and check headers */
-     sawnl = 1;
-     for (;;) {
--	if (!fgets(buf, sizeof(buf), to)) return IMAP_MESSAGE_NOBLANKLINE;
-+	if (!fgets(buf, sizeof(buf), to)) {
-+	    return sawnl ? 0 : IMAP_MESSAGE_BADHEADER;
-+	}
- 
- 	/* End of header section */
- 	if (sawnl && buf[0] == '\r') return 0;
diff --git a/mail/cyrus-imapd22/patches/patch-ac b/mail/cyrus-imapd22/patches/patch-ac
deleted file mode 100644
index 9318a7a84bd..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/10/17 22:07:32 recht Exp $
-
---- imap/spool.c.orig	Thu Mar  4 17:09:34 2004
-+++ imap/spool.c	Sun Oct 17 15:38:41 2004
-@@ -165,7 +165,7 @@
- 		
- 		if (peek == '\r' || peek == '\n') {
- 		    /* just reached the end of message */
--		    r = IMAP_MESSAGE_NOBLANKLINE;
-+		    r = 0;
- 		    goto ph_error;
- 		}
- 	    }
diff --git a/mail/cyrus-imapd22/patches/patch-af b/mail/cyrus-imapd22/patches/patch-af
index 6b85f21040b..def399bd4dc 100644
--- a/mail/cyrus-imapd22/patches/patch-af
+++ b/mail/cyrus-imapd22/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2004/07/27 13:28:38 recht Exp $
+$NetBSD: patch-af,v 1.5 2004/11/28 14:34:07 recht Exp $
 
---- configure.orig	2004-07-26 20:11:28.000000000 +0200
-+++ configure	2004-07-27 15:00:10.000000000 +0200
-@@ -13576,6 +13576,7 @@
+--- configure.orig	Tue Nov 23 19:55:47 2004
++++ configure	Sun Nov 28 14:34:29 2004
+@@ -13532,6 +13532,7 @@
      EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
diff --git a/mail/cyrus-imapd22/patches/patch-al b/mail/cyrus-imapd22/patches/patch-al
index b339cd558b1..2a49c6cbe66 100644
--- a/mail/cyrus-imapd22/patches/patch-al
+++ b/mail/cyrus-imapd22/patches/patch-al
@@ -1,15 +1,25 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+$NetBSD: patch-al,v 1.2 2004/11/28 14:34:07 recht Exp $
 
---- imtest/imtest.c~	2003-10-22 20:50:10.000000000 +0200
-+++ imtest/imtest.c	2003-11-03 11:09:41.000000000 +0100
-@@ -72,6 +72,10 @@
+--- imtest/imtest.c.orig	Wed Aug  4 15:03:18 2004
++++ imtest/imtest.c	Sun Nov 28 15:12:44 2004
+@@ -47,7 +47,9 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+@@ -71,6 +73,10 @@
+ #include <sys/file.h>
  #include <netinet/in.h>
  #include <netdb.h>
- 
++
 +#ifdef HAVE_SYS_PARAM_H
 +#include <sys/param.h>
 +#endif
-+
+ 
  #include <sasl/sasl.h>
  #include <sasl/saslutil.h>
- 
diff --git a/mail/cyrus-imapd22/patches/patch-am b/mail/cyrus-imapd22/patches/patch-am
index 49870b8c351..c74a5908852 100644
--- a/mail/cyrus-imapd22/patches/patch-am
+++ b/mail/cyrus-imapd22/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.3 2004/07/27 13:28:38 recht Exp $
+$NetBSD: patch-am,v 1.4 2004/11/28 14:34:07 recht Exp $
 
---- configure.in.orig	2004-07-05 20:18:02.000000000 +0200
-+++ configure.in	2004-07-27 15:00:18.000000000 +0200
-@@ -943,7 +943,7 @@
+--- configure.in.orig	Mon Nov 22 22:27:07 2004
++++ configure.in	Sun Nov 28 14:36:32 2004
+@@ -944,7 +944,7 @@
  dnl add perl cccdlflags when building libraries -- this ensures that the
  dnl libraries will be compiled as PIC if perl requires PIC objects
  dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
diff --git a/mail/cyrus-imapd22/patches/patch-an b/mail/cyrus-imapd22/patches/patch-an
deleted file mode 100644
index 922727e2070..00000000000
--- a/mail/cyrus-imapd22/patches/patch-an
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/08/11 22:09:04 jlam Exp $
-
---- sieve/bc_generate.c.orig	Wed Oct 22 14:03:24 2003
-+++ sieve/bc_generate.c
-@@ -347,11 +347,11 @@ static int bc_test_generate(int codep, b
- 	}
- 
- 	/*headers*/
--	codep = bc_stringlist_generate(codep, retval, t->u.h.sl);
-+	codep = bc_stringlist_generate(codep, retval, t->u.ae.sl);
- 	if (codep == -1) return -1;
- 
- 	/*patterns*/
--	codep = bc_stringlist_generate(codep, retval, t->u.h.pl);
-+	codep = bc_stringlist_generate(codep, retval, t->u.ae.pl);
- 	if (codep == -1) return -1;
-      
- 	break;
diff --git a/mail/cyrus-imapd22/patches/patch-ao b/mail/cyrus-imapd22/patches/patch-ao
deleted file mode 100644
index 417abd5e8fa..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ao
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/09/26 20:40:37 seb Exp $
-
---- master/service.c.orig	2004-03-22 20:05:47.000000000 +0000
-+++ master/service.c
-@@ -68,6 +68,7 @@
- #include <limits.h>
- 
- #include "service.h"
-+#include "libconfig.h"
- #include "xmalloc.h"
- 
- extern int optind, opterr;
-@@ -145,7 +146,6 @@ static int libwrap_ask(struct request_in
- #endif
- 
- extern void cyrus_init(const char *, const char *, unsigned);
--extern const char *config_getstring(const char *key, const char *def);
- extern const char *config_dir;
- 
- static int getlockfd(char *service, int id)
-@@ -365,7 +365,7 @@ int main(int argc, char **argv, char **e
-     if (call_debugger) {
- 	char debugbuf[1024];
- 	int ret;
--	const char *debugger = config_getstring("debug_command", NULL);
-+	const char *debugger = config_getstring(IMAPOPT_DEBUG_COMMAND);
- 	if (debugger) {
- 	    snprintf(debugbuf, sizeof(debugbuf), debugger, 
- 		     argv[0], getpid(), service);
diff --git a/mail/cyrus-imapd22/patches/patch-ba b/mail/cyrus-imapd22/patches/patch-ba
new file mode 100644
index 00000000000..ef5365bd6a1
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ba
@@ -0,0 +1,14 @@
+$NetBSD: patch-ba,v 1.3 2004/11/28 14:34:07 recht Exp $
+
+--- imap/mboxlist.c.orig	Sun Nov 28 15:04:44 2004
++++ imap/mboxlist.c	Sun Nov 28 15:05:06 2004
+@@ -60,7 +60,9 @@
+ #include <syslog.h>
+ 
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+ 
+ #include "acl.h"
+ #include "annotate.h"
diff --git a/mail/cyrus-imapd22/patches/patch-bb b/mail/cyrus-imapd22/patches/patch-bb
new file mode 100644
index 00000000000..26d6243bf8a
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-bb
@@ -0,0 +1,14 @@
+$NetBSD: patch-bb,v 1.3 2004/11/28 14:34:07 recht Exp $
+
+--- imap/cvt_cyrusdb.c.orig	Sun Nov 28 15:09:29 2004
++++ imap/cvt_cyrusdb.c	Sun Nov 28 15:10:33 2004
+@@ -60,7 +60,9 @@
+ #include <syslog.h>
+ 
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+ 
+ #include "acl.h"
+ #include "assert.h"
diff --git a/mail/cyrus-imapd22/patches/patch-bc b/mail/cyrus-imapd22/patches/patch-bc
new file mode 100644
index 00000000000..8aadf72c711
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-bc
@@ -0,0 +1,14 @@
+$NetBSD: patch-bc,v 1.1 2004/11/28 14:34:07 recht Exp $
+
+--- perl/sieve/lib/request.c.orig	Sun Nov 28 15:14:46 2004
++++ perl/sieve/lib/request.c	Sun Nov 28 15:14:47 2004
+@@ -51,7 +51,9 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+ 
+ #include <stdlib.h>
+ #include <stdio.h>