Update cyrus-imapd24 to 2.4.11.

Changes to the Cyrus IMAP Server since 2.4.10

      * fixed replication recovery from different messages at the each end
      * Bug #3489 - fixed quotalegacy handling of prefixes so only exact
        subfolders match
      * Bug #3498 - fixed deletion of users quota files with
        unixheriarchysep enabled, thanks Leena Heino
      * Bug #3491 - NOOP and UNAUTHENTICATE for timsieved, thanks Dilyan
        Palauzov
      * Bug #3492 - better response codes for timsieved, thanks Dilyan
        Palauzov
      * Bug #3497 - fix cmd syslog from master, thanks Kristof Katus
      * Bug #3503 - compilation of perl libraries on dragonfly and freebsd,
        thanks OBATA Akio
      * Bug #3451 - allow CC to have spaces
      * Bug #3505 - fix sync_reset, thanks David Carter
      * Bug #3506 - use literal+ for sync_(client|server), thanks David
        Carter
      * Bug #3300 - use portable function for TCP constants, thanks OBATA
        Akio
      * Bug #3507 - fix replication recovery with non-delayed expunge,
        thanks Julien Coloos
      * Bug #3495 - improved duplicate suppression, thanks Kristof Katus
      * Bug #2772/3463 - fixed crashes in THREAD by correcting folding of
        references headers
      * Bug #3439 - fix ugly syslog message for vacation
      * Bug #3499 - options to disable namespaces to reduce load on big
        servers with no shared folders. Thanks Olivier ROLAND
      * Changed skiplist to truncate old files after checkpoint, which can
        save disk space on tmpfs or small ssds when old copies were held
        open by other processes
      * Made Cyrus more robust against corruption in mailboxes.db data, so
        it will return an error rather than crashing on invalid entries
      * Fix for CVE-2011-3208, a remotely exploitable buffer overflow in
        nntpd - thanks Coverity

6 files changed, 12 insertions, 77 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 38777b69934..4e08dc35579 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2011/08/14 13:25:21 obache Exp $
+# $NetBSD: Makefile,v 1.12 2011/09/09 12:09:34 obache Exp $
 
-DISTNAME=	cyrus-imapd-2.4.10
-PKGREVISION=	1
+DISTNAME=	cyrus-imapd-2.4.11
 CATEGORIES=	mail
 MASTER_SITES=	http://cyrusimap.org/releases/ \
 		ftp://ftp.cyrusimap.org/cyrus-imapd/ \
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 4b71100d8dc..8a533a33c0b 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2011/07/06 09:45:45 obache Exp $
+$NetBSD: distinfo,v 1.12 2011/09/09 12:09:34 obache Exp $
 
-SHA1 (cyrus-imapd-2.4.10.tar.gz) = b6cb51d67f2b49536ba92daae471d7817929c482
-RMD160 (cyrus-imapd-2.4.10.tar.gz) = d7ffe3ad56b9e565dc7e1b764d4bb0a597ce9696
-Size (cyrus-imapd-2.4.10.tar.gz) = 2430196 bytes
-SHA1 (patch-aa) = c6dc9d4df5b5f49e1aaaf7a554764ff857638829
-SHA1 (patch-ab) = a692ae6d85b7121bb9af32cb12ae17417b12affe
+SHA1 (cyrus-imapd-2.4.11.tar.gz) = 24fdaf0e57d5c3bdb63b7dcca29fe6df535c6102
+RMD160 (cyrus-imapd-2.4.11.tar.gz) = 0bb30f7d8c655a03366a8ce59f5a708c30d34ec1
+Size (cyrus-imapd-2.4.11.tar.gz) = 2446611 bytes
+SHA1 (patch-aa) = c0bd73b9443dc34755428ff7f0813341dd11c448
+SHA1 (patch-ab) = 2c5c1f695bfba9ac310d7a441097399e260e12e9
 SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323
 SHA1 (patch-ad) = 9c97c99996271c5a123d58e94eb7b16bc9086ebb
 SHA1 (patch-ae) = 9bee786ad3f0237ee15302c2954e3e90b6fe69fb
@@ -18,6 +18,4 @@ SHA1 (patch-al) = 0eaef55760e9a071802bba157a00bdacc84c1932
 SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
 SHA1 (patch-an) = 94aac408657e2315246c7cdaac2524c68eeb7c24
 SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
-SHA1 (patch-aq) = db1741cfaaf155d60ac446945be1e54f271e602b
-SHA1 (patch-ar) = 4ac95c029794afba0f4d398643f354b71efd9ac3
 SHA1 (patch-imap_mailbox.c) = 9f71ae5df3a6ebf024e9bd9e4dfb0c140d0d3d95
diff --git a/mail/cyrus-imapd24/patches/patch-aa b/mail/cyrus-imapd24/patches/patch-aa
index da39d489b8b..fff163649f1 100644
--- a/mail/cyrus-imapd24/patches/patch-aa
+++ b/mail/cyrus-imapd24/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2011/06/22 01:05:37 obache Exp $
+$NetBSD: patch-aa,v 1.6 2011/09/09 12:09:34 obache Exp $
 
---- configure.in.orig	2011-06-21 19:50:39.000000000 +0000
+--- configure.in.orig	2011-09-08 18:57:42.000000000 +0000
 +++ configure.in
 @@ -403,7 +403,7 @@ if test "$sievedir" != "no"; then
  
@@ -27,12 +27,3 @@ $NetBSD: patch-aa,v 1.5 2011/06/22 01:05:37 obache Exp $
  			LIBS="$LIBS -lrx"
  			AC_DEFINE(ENABLE_REGEX, [],
  				  [Do we have a regex library?])
-@@ -1171,7 +1171,7 @@ dnl add perl cccdlflags when building li
- dnl libraries will be compiled as PIC if perl requires PIC objects
- dnl -- this is needed on NetBSD and Linux, but seems to cause problems on atleast Solaris --
-     case "${target_os}" in
--        linux*|netbsd*)
-+        linux*|netbsd*|freebsd*|dragonfly*)
-             AC_MSG_CHECKING(for perl cccdlflags needed on "${target_os}")
-             eval `${PERL} -V:cccdlflags`
-             PERL_CCCDLFLAGS="$cccdlflags"
diff --git a/mail/cyrus-imapd24/patches/patch-ab b/mail/cyrus-imapd24/patches/patch-ab
index c79ee7d7d84..032141a9860 100644
--- a/mail/cyrus-imapd24/patches/patch-ab
+++ b/mail/cyrus-imapd24/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2011/07/06 09:45:45 obache Exp $
+$NetBSD: patch-ab,v 1.6 2011/09/09 12:09:34 obache Exp $
 
---- configure.orig	2011-07-04 15:06:30.000000000 +0000
+--- configure.orig	2011-09-08 19:03:38.000000000 +0000
 +++ configure
 @@ -7201,7 +7201,7 @@ if test "x$ac_cv_header_pcreposix_h" = x
  fi
@@ -29,12 +29,3 @@ $NetBSD: patch-ab,v 1.5 2011/07/06 09:45:45 obache Exp $
  			LIBS="$LIBS -lrx"
  
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
-@@ -10493,7 +10493,7 @@ elif test "${with_perl}" != "no"; then
-     PERL_SUBDIRS="imap"
-     PERL="${with_perl}"
-     case "${target_os}" in
--        linux*|netbsd*)
-+        linux*|netbsd*|freebsd*|dragonfly*)
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
- $as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
-             eval `${PERL} -V:cccdlflags`
diff --git a/mail/cyrus-imapd24/patches/patch-aq b/mail/cyrus-imapd24/patches/patch-aq
deleted file mode 100644
index 629f1a8d77b..00000000000
--- a/mail/cyrus-imapd24/patches/patch-aq
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2011/07/06 09:45:45 obache Exp $
-
-* use IPPROTO_TCP for SOL_TCP if it is not defined
-  https://bugzilla.cyrusimap.org/show_bug.cgi?id=3300
-* cast to unsigned long for platform sizeof(time_t) > sizeof(unsigned long).
-  https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376
-
---- imap/sync_client.c.orig	2011-07-04 15:05:01.000000000 +0000
-+++ imap/sync_client.c
-@@ -93,6 +93,10 @@
- #include "signals.h"
- #include "cyrusdb.h"
- 
-+#ifndef SOL_TCP
-+#define SOL_TCP IPPROTO_TCP
-+#endif
-+
- /* signal to config.c */
- const int config_need_data = CONFIG_NEED_PARTITION_DATA;
- 
-@@ -911,7 +915,7 @@ static void log_record(const char *name,
-     syslog(LOG_NOTICE, "SYNCNOTICE: %s uid:%u modseq:" MODSEQ_FMT " "
- 	  "last_updated:%lu internaldate:%lu flags:(%s)",
- 	   name, record->uid, record->modseq,
--	   record->last_updated, record->internaldate,
-+	   (unsigned long)record->last_updated, (unsigned long)record->internaldate,
- 	   make_flags(mailbox, record));
- }
- 
diff --git a/mail/cyrus-imapd24/patches/patch-ar b/mail/cyrus-imapd24/patches/patch-ar
deleted file mode 100644
index 08d346dc56b..00000000000
--- a/mail/cyrus-imapd24/patches/patch-ar
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
-
---- master/service.c.orig	2010-10-19 03:08:28.000000000 +0000
-+++ master/service.c
-@@ -76,6 +76,10 @@
- #include "xstrlcat.h"
- #include "signals.h"
- 
-+#ifndef SOL_TCP
-+#define SOL_TCP IPPROTO_TCP
-+#endif
-+
- extern int optind, opterr;
- extern char *optarg;
-