Updated cyrus-imapd to 2.1.13

* New IPv6 patch

* Add maxfds= option in cyrus.conf
* "The shutdown() Patch"
* Now report both built-with and running-with OpenSSL versions
* Misc other small bugfixes
* Security Appraisers and Bynari review of the majority of the modules in imap/

Approved by chris.

4 files changed, 21 insertions, 21 deletions

diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index f546df2ccb7..eec69ba07df 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/02/27 13:21:51 seb Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/26 06:53:06 martti Exp $
 
-DISTNAME=		cyrus-imapd-2.1.12
+DISTNAME=		cyrus-imapd-2.1.13
 SVR4_PKGNAME=		cimap
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -20,7 +20,7 @@ AUTOCONF_REQD=		2.13
 
 .if defined(CYRUS_USE_INET6) && ${CYRUS_USE_INET6} == "YES"
 PATCH_SITES=		http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=		${DISTNAME}-ipv6-20030204.diff.gz
+PATCHFILES=		${DISTNAME}-ipv6-20030503.diff.gz
 .endif
 
 # CYRUS_USER		username of the Cyrus administrator
diff --git a/mail/cyrus-imapd21/distinfo b/mail/cyrus-imapd21/distinfo
index c4bef24cf0b..b5e79b568a9 100644
--- a/mail/cyrus-imapd21/distinfo
+++ b/mail/cyrus-imapd21/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.6 2003/02/27 13:21:51 seb Exp $
+$NetBSD: distinfo,v 1.7 2003/05/26 06:53:06 martti Exp $
 
-SHA1 (cyrus-imapd-2.1.12.tar.gz) = f77c7328faba7bdb6b2af55ec562433a29255e4a
-Size (cyrus-imapd-2.1.12.tar.gz) = 1664202 bytes
-SHA1 (cyrus-imapd-2.1.12-ipv6-20030204.diff.gz) = e361074cdcd4aac37988c75b96f011c1613a619e
-Size (cyrus-imapd-2.1.12-ipv6-20030204.diff.gz) = 32582 bytes
+SHA1 (cyrus-imapd-2.1.13.tar.gz) = 21dd5bf5685692cf63b95a36753fdcea9f75892d
+Size (cyrus-imapd-2.1.13.tar.gz) = 1664658 bytes
+SHA1 (cyrus-imapd-2.1.13-ipv6-20030503.diff.gz) = 93bdfdc2e797a31951799c9bb5034ba3002bd97e
+Size (cyrus-imapd-2.1.13-ipv6-20030503.diff.gz) = 32684 bytes
 SHA1 (patch-aa) = ef3630c2bafc752eb3af56815c44b3a2037d221a
-SHA1 (patch-ac) = dd29b77fefee4c61dd1fac6d16284e0d1505d4ae
-SHA1 (patch-ad) = 3e07a4e5bd1e496e33f555c9a4004a0097595551
-SHA1 (patch-ae) = 371df78750ef75fba2ff42a17785aea4e3aea724
-SHA1 (patch-af) = 4594ac4fd6aa63f7e0236929ef0744561ba3a315
+SHA1 (patch-ac) = dc1bf6f9e8587887f5763379bc39202f56f5230c
+SHA1 (patch-ad) = 80329b5a72cb7aa6890304cd89912096f3a66df3
+SHA1 (patch-ae) = 003d6ecc2caf0bf2985a871691ba970c6a6f4755
+SHA1 (patch-af) = 511d304315c9bdeb0f770181b1fdd9c13b0f2020
 SHA1 (patch-ag) = 55e7bbd00f8fe4b47d48fad3a06e3ad0aa835a4a
 SHA1 (patch-ah) = 99e25634852897f8df72b9af5f35789a0ef4b892
 SHA1 (patch-ai) = df0551cd295d660dcd12601cb1aa2d930f85d2f1
diff --git a/mail/cyrus-imapd21/patches/patch-ac b/mail/cyrus-imapd21/patches/patch-ac
index c90667e7d69..33b12fd3c76 100644
--- a/mail/cyrus-imapd21/patches/patch-ac
+++ b/mail/cyrus-imapd21/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/10/27 16:08:53 chris Exp $
+$NetBSD: patch-ac,v 1.2 2003/05/26 06:53:07 martti Exp $
 
---- imap/imapd.c.orig	Fri Aug 30 16:34:24 2002
-+++ imap/imapd.c	Sat Aug 31 17:57:56 2002
-@@ -5801,7 +5801,7 @@
+--- imap/imapd.c.orig	2003-04-22 19:02:06.000000000 +0300
++++ imap/imapd.c	2003-05-21 10:19:38.000000000 +0300
+@@ -5837,7 +5837,7 @@
  {
      int i=0, j=0;
      char tagbuf[128];
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/10/27 16:08:53 chris Exp $
      struct buf tag, cmd, tmp, user;
      int r = 0;
  
-@@ -5916,7 +5916,7 @@
+@@ -5952,7 +5952,7 @@
  		   char *mailbox, char *acl_in) 
  {
      int r = 0;
diff --git a/mail/cyrus-imapd21/patches/patch-ad b/mail/cyrus-imapd21/patches/patch-ad
index c59ee7d79ac..acb26f2a2c6 100644
--- a/mail/cyrus-imapd21/patches/patch-ad
+++ b/mail/cyrus-imapd21/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/10/27 16:08:53 chris Exp $
+$NetBSD: patch-ad,v 1.2 2003/05/26 06:53:07 martti Exp $
 
---- imap/mbpath.c.orig	Sat Aug 31 17:59:21 2002
-+++ imap/mbpath.c	Sat Aug 31 17:59:35 2002
-@@ -97,7 +97,7 @@
+--- imap/mbpath.c.orig	2003-02-13 22:15:28.000000000 +0200
++++ imap/mbpath.c	2003-05-21 10:20:05.000000000 +0300
+@@ -96,7 +96,7 @@
  {
    char *path;
    int rc, i, quiet = 0, stop_on_error=0;