[pkgsrc/trunk]: pkgsrc/mail/cyrus-imapd22 Apply patches from CVS to accept me...

[recht <recht%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/162ac2ec8910
branches:  trunk
changeset: 482012:162ac2ec8910
user:      recht <recht%pkgsrc.org@localhost>
date:      Sun Oct 17 22:07:32 2004 +0000

description:
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.

diffstat:

 mail/cyrus-imapd22/Makefile         |   4 ++--
 mail/cyrus-imapd22/distinfo         |   5 ++++-
 mail/cyrus-imapd22/patches/patch-aa |  15 +++++++++++++++
 mail/cyrus-imapd22/patches/patch-ab |  15 +++++++++++++++
 mail/cyrus-imapd22/patches/patch-ac |  13 +++++++++++++
 5 files changed, 49 insertions(+), 3 deletions(-)

diffs (83 lines):

diff -r 6688080def68 -r 162ac2ec8910 mail/cyrus-imapd22/Makefile
--- a/mail/cyrus-imapd22/Makefile       Sun Oct 17 20:12:06 2004 +0000
+++ b/mail/cyrus-imapd22/Makefile       Sun Oct 17 22:07:32 2004 +0000
@@ -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 -r 6688080def68 -r 162ac2ec8910 mail/cyrus-imapd22/distinfo
--- a/mail/cyrus-imapd22/distinfo       Sun Oct 17 20:12:06 2004 +0000
+++ b/mail/cyrus-imapd22/distinfo       Sun Oct 17 22:07:32 2004 +0000
@@ -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 -r 6688080def68 -r 162ac2ec8910 mail/cyrus-imapd22/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cyrus-imapd22/patches/patch-aa       Sun Oct 17 22:07:32 2004 +0000
@@ -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 -r 6688080def68 -r 162ac2ec8910 mail/cyrus-imapd22/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cyrus-imapd22/patches/patch-ab       Sun Oct 17 22:07:32 2004 +0000
@@ -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 -r 6688080def68 -r 162ac2ec8910 mail/cyrus-imapd22/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cyrus-imapd22/patches/patch-ac       Sun Oct 17 22:07:32 2004 +0000
@@ -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;
+               }
+           }