Update cyrus-imapd24 to 2.4.13.

While here, remove paches for ancient Darwin.

Changes to the Cyrus IMAP Server since 2.4.12

      * Bug #3565 - fix gcc compiler warnings - thanks Dilyan Palauzov
        <dilyan.palauzov@aegee.org>
      * Bug #2685 - rename annots in delayed folder delete. Avoids
        annotations "reappearing" when a folder is recreated
      * Bug #3566 - actually fix in a backward compatible way. 2.4.12 broke
        older versions of bison
      * Lots of small cleanups from CMU as they prepared to build RSS into
        their 2.4 build. Thanks Ken
      * Bug #3591/#3609 - fix crash in mupdate on partition move
      * Bug #3610 - fix replication of partition move
      * Bug #3564 - document the way prefork interacts with multiple
        network protocols
      * Bug #3586 - allow rename of "\Noselect" if subfolders exist
      * A handful of small cleanups (#3593, #3594, #3595) from David Carter
        <dpc22@cam.ac.uk>. Very much appreciated
      * Disabled duplicate_check DEBUG level log messages by default.
        Thanks Philip Prindeville <philipp@redfish-solutions.com>
      * Bug #3608 - log mailbox name in more sync failure cases
      * Bug #3615 - fix proxyd_disable_mailbox_referrals. Thanks Andrew
        Morgan <morgan@orst.edu>
      * Bug #3611 - fix crash in sync_mailbox_full if expunge fails
      * Backported some nice fixes from master, including safer thread/sort
        (there were some crashes on bad messages before)
      * Fixed infinite loop on suppress_capabilities with substrings of
        other capabilities. Ouch.
      * Fixed LIST and LSUB again - this time to make LIST "" "*%" work
        without breaking other things
      * Bug #3588 - make XFER not break if the wrong server name was used.
        The start of making murder safer
      * Bug #3603 - tidied up usage of kick_mupdate so it never gets called
        on standard murder backends
      * Bug #3604 - always suppress the DELETED.* mailbox names, even if
        delete_mode is immediate. It means a config change or different
        frontend won't show undeletable mailboxes
      * Bug #3602 - allow UpperCase in service names to work

10 files changed, 8 insertions, 126 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index f960b7c0315..619d12eed34 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2011/12/17 07:29:49 sbd Exp $
+# $NetBSD: Makefile,v 1.17 2011/12/31 03:03:07 obache Exp $
 
-DISTNAME=	cyrus-imapd-2.4.12
+DISTNAME=	cyrus-imapd-2.4.13
 CATEGORIES=	mail
 MASTER_SITES=	http://cyrusimap.org/releases/ \
 		ftp://ftp.cyrusimap.org/cyrus-imapd/ \
diff --git a/mail/cyrus-imapd24/PLIST b/mail/cyrus-imapd24/PLIST
index 64f60b4f25a..f2c2cb83113 100644
--- a/mail/cyrus-imapd24/PLIST
+++ b/mail/cyrus-imapd24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2010/12/20 14:05:32 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/12/31 03:03:07 obache Exp $
 bin/imtest
 bin/installsieve
 bin/lmtptest
@@ -90,6 +90,7 @@ include/cyrus/prot.h
 include/cyrus/retry.h
 include/cyrus/rfc822date.h
 include/cyrus/signals.h
+include/cyrus/strarray.h
 include/cyrus/strhash.h
 include/cyrus/stristr.h
 include/cyrus/sysexits.h
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 8197294b4b4..ef3b62c57d0 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,18 +1,11 @@
-$NetBSD: distinfo,v 1.13 2011/10/05 01:32:31 obache Exp $
+$NetBSD: distinfo,v 1.14 2011/12/31 03:03:07 obache Exp $
 
-SHA1 (cyrus-imapd-2.4.12.tar.gz) = c7a1e1dee9f32891c64499945915e8c4e99ce183
-RMD160 (cyrus-imapd-2.4.12.tar.gz) = 5c481d5ce295667eed1c90bc1d0572946caaae29
-Size (cyrus-imapd-2.4.12.tar.gz) = 2450099 bytes
+SHA1 (cyrus-imapd-2.4.13.tar.gz) = df06d6d4b2b24d631cbbf1aa6f77a94381ce6bb7
+RMD160 (cyrus-imapd-2.4.13.tar.gz) = 4665d7aa49acb5a5f3d9746ef4cf2c15292a6ff6
+Size (cyrus-imapd-2.4.13.tar.gz) = 2472668 bytes
 SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323
-SHA1 (patch-ad) = 9c97c99996271c5a123d58e94eb7b16bc9086ebb
-SHA1 (patch-ae) = 9bee786ad3f0237ee15302c2954e3e90b6fe69fb
-SHA1 (patch-af) = 51ffc6cc37822ea4828eb987039593900f2f1ef0
-SHA1 (patch-ag) = 533f146e9ee276af7b8ab716da2f3d4af5f60639
 SHA1 (patch-ah) = 4bc62dfdeafdca83ddac02aff0ffd05db28fe0b9
 SHA1 (patch-ai) = 9167678988f411479d187b232eb10ad8622b4151
-SHA1 (patch-aj) = 14f293489a816d2282f0d1a7b289d5a775c74c24
-SHA1 (patch-ak) = 2e8a105b30d2c0c38f523020bf79d7e26cfa235b
-SHA1 (patch-al) = 0eaef55760e9a071802bba157a00bdacc84c1932
 SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
 SHA1 (patch-an) = 94aac408657e2315246c7cdaac2524c68eeb7c24
 SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
diff --git a/mail/cyrus-imapd24/patches/patch-ad b/mail/cyrus-imapd24/patches/patch-ad
deleted file mode 100644
index 1c46325bdec..00000000000
--- a/mail/cyrus-imapd24/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
-
---- imap/cvt_cyrusdb.c.orig	2010-10-19 03:08:28.000000000 +0000
-+++ imap/cvt_cyrusdb.c
-@@ -59,7 +59,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-imapd24/patches/patch-ae b/mail/cyrus-imapd24/patches/patch-ae
deleted file mode 100644
index 02e8c1aa999..00000000000
--- a/mail/cyrus-imapd24/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
-
---- imap/mboxlist.c.orig	2010-10-19 03:08:28.000000000 +0000
-+++ imap/mboxlist.c
-@@ -59,7 +59,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-imapd24/patches/patch-af b/mail/cyrus-imapd24/patches/patch-af
deleted file mode 100644
index 9f655ed67b2..00000000000
--- a/mail/cyrus-imapd24/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
-
---- imap/message.c.orig	2010-10-19 03:08:28.000000000 +0000
-+++ imap/message.c
-@@ -76,6 +76,10 @@
- #include "global.h"
- #include "retry.h"
- 
-+#ifdef __APPLE__
-+struct et_list *_et_list = NULL;
-+#endif
-+
- /* Message being parsed */
- struct msg {
-     const char *base;
diff --git a/mail/cyrus-imapd24/patches/patch-ag b/mail/cyrus-imapd24/patches/patch-ag
deleted file mode 100644
index c527504b55c..00000000000
--- a/mail/cyrus-imapd24/patches/patch-ag
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
-
---- imtest/imtest.c.orig	2010-10-19 03:08:28.000000000 +0000
-+++ imtest/imtest.c
-@@ -49,7 +49,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>
- 
-@@ -74,6 +76,10 @@
- #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-imapd24/patches/patch-aj b/mail/cyrus-imapd24/patches/patch-aj
deleted file mode 100644
index 321acb39dc4..00000000000
--- a/mail/cyrus-imapd24/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
-
---- perl/sieve/lib/request.c.orig	2010-10-19 03:08:28.000000000 +0000
-+++ perl/sieve/lib/request.c
-@@ -52,7 +52,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>
diff --git a/mail/cyrus-imapd24/patches/patch-ak b/mail/cyrus-imapd24/patches/patch-ak
deleted file mode 100644
index 06a3a75d14d..00000000000
--- a/mail/cyrus-imapd24/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
-
---- sieve/sievec.c.orig	2010-10-19 03:08:28.000000000 +0000
-+++ sieve/sievec.c
-@@ -63,6 +63,10 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-+#ifdef __APPLE__
-+struct et_list *_et_list = NULL;
-+#endif
-+
- /* config.c stuff */
- const int config_need_data = 0;
- 
diff --git a/mail/cyrus-imapd24/patches/patch-al b/mail/cyrus-imapd24/patches/patch-al
deleted file mode 100644
index 4144574e4b4..00000000000
--- a/mail/cyrus-imapd24/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
-
---- sieve/sieved.c.orig	2010-10-19 03:08:28.000000000 +0000
-+++ sieve/sieved.c
-@@ -63,6 +63,10 @@
- 
- #include "map.h"
- 
-+#ifdef __APPLE__
-+struct et_list *_et_list = NULL;
-+#endif
-+
- /* config.c stuff */
- const int config_need_data = 0;
-