3 files changed, 43 insertions, 0 deletions
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;
+ 		}
+ 	    }