Apply patches from CVS to accept messages with missing body (valid according to RFC 2822).

Patches forwarded by Jukka Salmi in PR 27239

Bump PKGVERSION to 4.

5 files changed, 49 insertions, 3 deletions

diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 39f66349557..11a826af526 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/10/03 00:12:52 tv Exp $
+# $NetBSD: Makefile,v 1.23 2004/10/17 22:07:32 recht Exp $
 
 DISTNAME=	cyrus-imapd-2.2.8
-PKGREVISION=	3
+PKGREVISION=	4
 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 6a34f4b4cab..afdc7f3242f 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.12 2004/09/26 20:40:37 seb Exp $
+$NetBSD: distinfo,v 1.13 2004/10/17 22:07:32 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
diff --git a/mail/cyrus-imapd22/patches/patch-aa b/mail/cyrus-imapd22/patches/patch-aa
new file mode 100644
index 00000000000..2df7412b729
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-aa
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..ef8e0e5745b
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ab
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..9318a7a84bd
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ac
@@ -0,0 +1,13 @@
+$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;
+ 		}
+ 	    }