Update cyrus-imapd24 to 2.4.10.

While here,
* Exactly enable/disable PCRE support with package option, enabled by default.
* Add workaround patches for PR#44275, sizeof(time_t) > sizeof(unsigned long).

Changes to the Cyrus IMAP Server since 2.4.9

      * fixed handling of unparsable emails during append (which would
        cause invalid cyrus.index records otherwise)
      * quota: fix a pile of bugs. #1801, virtdomain support; #2728, slow
        user delete; #3178, "file name too long" with big mailbox names;
        #3179, quota -f doubles usage.
      * Bug #3043 - parse multiple groups in headers correctly
      * Bug #3158 - lmtp backend connection timeout
      * Bug #3223 - limit MIME parsing depth to avoid stack overflows
      * Bug #3273 - add SORT=DISPLAY support (but note: still questions
        about correctness of unicode sorting)
      * Bug #3504 - convert all sieve scripts to \r\n line endings on
        upload
      * Bug #3402 - options to munge 8bit characters in headers during lmtp
        delivery to avoid backscatter
      * sync_client: fix broken keepalive TCP options (I doubt anyone ever
        tried to use it)
      * Bug #3482 - add "-o" option to ipurge to only purge messages with
        \Deleted flag set

6 files changed, 61 insertions, 20 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index e20cc907823..7343eed7e6c 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2011/06/22 01:05:36 obache Exp $
+# $NetBSD: Makefile,v 1.10 2011/07/06 09:45:45 obache Exp $
 
-DISTNAME=	cyrus-imapd-2.4.9
+DISTNAME=	cyrus-imapd-2.4.10
 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 af0f1394023..4b71100d8dc 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2011/06/22 01:05:36 obache Exp $
+$NetBSD: distinfo,v 1.11 2011/07/06 09:45:45 obache Exp $
 
-SHA1 (cyrus-imapd-2.4.9.tar.gz) = 3cc8cf54d43baeda6822f84efec6ab95f3d1c49f
-RMD160 (cyrus-imapd-2.4.9.tar.gz) = 37727502f8b080a1e3205360c048abd47e76e878
-Size (cyrus-imapd-2.4.9.tar.gz) = 2425065 bytes
+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) = c7e422d9f41a82aa7c7e0c9a260d021517a5059f
+SHA1 (patch-ab) = a692ae6d85b7121bb9af32cb12ae17417b12affe
 SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323
 SHA1 (patch-ad) = 9c97c99996271c5a123d58e94eb7b16bc9086ebb
 SHA1 (patch-ae) = 9bee786ad3f0237ee15302c2954e3e90b6fe69fb
@@ -18,5 +18,6 @@ SHA1 (patch-al) = 0eaef55760e9a071802bba157a00bdacc84c1932
 SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
 SHA1 (patch-an) = 94aac408657e2315246c7cdaac2524c68eeb7c24
 SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
-SHA1 (patch-aq) = e364a2904db59f29f8adc1a0d4981a7bfd54e767
+SHA1 (patch-aq) = db1741cfaaf155d60ac446945be1e54f271e602b
 SHA1 (patch-ar) = 4ac95c029794afba0f4d398643f354b71efd9ac3
+SHA1 (patch-imap_mailbox.c) = 9f71ae5df3a6ebf024e9bd9e4dfb0c140d0d3d95
diff --git a/mail/cyrus-imapd24/options.mk b/mail/cyrus-imapd24/options.mk
index 0c2044a6da5..093b4e1f002 100644
--- a/mail/cyrus-imapd24/options.mk
+++ b/mail/cyrus-imapd24/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.2 2010/11/09 08:18:56 obache Exp $
+# $NetBSD: options.mk,v 1.3 2011/07/06 09:45:45 obache Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-imapd
-PKG_SUPPORTED_OPTIONS=	gssapi kerberos kerberos4 ldap snmp
+PKG_SUPPORTED_OPTIONS=	gssapi kerberos kerberos4 ldap pcre snmp
 PKG_SUPPORTED_OPTIONS+=	bdb mysql pgsql sqlite
-PKG_SUGGESTED_OPTIONS=	bdb
+PKG_SUGGESTED_OPTIONS=	bdb pcre
 
 .include "../../mk/bsd.options.mk"
 
@@ -87,3 +87,10 @@ CONFIGURE_ARGS+=	--with-sqlite=${BUILDLINK_PREFIX.sqlite3}
 .else
 CONFIGURE_ARGS+=	--without-sqlite
 .endif
+
+.if !empty(PKG_OPTIONS:Mpcre)
+.  include "../../devel/pcre/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-pcre
+.else
+CONFIGURE_ARGS+=	--disable-pcre
+.endif
diff --git a/mail/cyrus-imapd24/patches/patch-ab b/mail/cyrus-imapd24/patches/patch-ab
index 57532080ee6..c79ee7d7d84 100644
--- a/mail/cyrus-imapd24/patches/patch-ab
+++ b/mail/cyrus-imapd24/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2011/06/22 01:05:37 obache Exp $
+$NetBSD: patch-ab,v 1.5 2011/07/06 09:45:45 obache Exp $
 
---- configure.orig	2011-06-21 19:51:34.000000000 +0000
+--- configure.orig	2011-07-04 15:06:30.000000000 +0000
 +++ configure
-@@ -7191,7 +7191,7 @@ if test "x$ac_cv_header_pcreposix_h" = x
+@@ -7201,7 +7201,7 @@ if test "x$ac_cv_header_pcreposix_h" = x
  fi
  
  
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.4 2011/06/22 01:05:37 obache Exp $
 +	    if test "$ac_cv_header_pcreposix_h" = "yes"; then
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8 enabled pcre" >&5
  $as_echo_n "checking for utf8 enabled pcre... " >&6; }
- 		    if test "${cyrus_cv_pcre_utf8+set}" = set; then :
-@@ -7219,7 +7219,7 @@ $as_echo "$cyrus_cv_pcre_utf8" >&6; }
+ 		    if ${cyrus_cv_pcre_utf8+:} false; then :
+@@ -7229,7 +7229,7 @@ $as_echo "$cyrus_cv_pcre_utf8" >&6; }
  	    fi
  	fi
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.4 2011/06/22 01:05:37 obache Exp $
  		LIBS="$LIBS -lpcre -lpcreposix";
  
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
-@@ -7240,7 +7240,7 @@ fi
+@@ -7250,7 +7250,7 @@ fi
  
  done
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.4 2011/06/22 01:05:37 obache Exp $
  			LIBS="$LIBS -lrx"
  
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
-@@ -10483,7 +10483,7 @@ elif test "${with_perl}" != "no"; then
+@@ -10493,7 +10493,7 @@ elif test "${with_perl}" != "no"; then
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
      case "${target_os}" in
diff --git a/mail/cyrus-imapd24/patches/patch-aq b/mail/cyrus-imapd24/patches/patch-aq
index 579015ac3f4..629f1a8d77b 100644
--- a/mail/cyrus-imapd24/patches/patch-aq
+++ b/mail/cyrus-imapd24/patches/patch-aq
@@ -1,6 +1,11 @@
-$NetBSD: patch-aq,v 1.2 2011/04/14 02:18:27 obache Exp $
+$NetBSD: patch-aq,v 1.3 2011/07/06 09:45:45 obache Exp $
 
---- imap/sync_client.c.orig	2011-04-13 14:35:22.000000000 +0000
+* 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"
@@ -13,3 +18,12 @@ $NetBSD: patch-aq,v 1.2 2011/04/14 02:18:27 obache Exp $
  /* 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-imap_mailbox.c b/mail/cyrus-imapd24/patches/patch-imap_mailbox.c
new file mode 100644
index 00000000000..b5c0a6eac98
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-imap_mailbox.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-imap_mailbox.c,v 1.1 2011/07/06 09:45:45 obache Exp $
+
+* cast to unsigned long for platform sizeof(time_t) > sizeof(unsigned long).
+  https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376
+
+--- imap/mailbox.c.orig	2011-07-04 15:05:01.000000000 +0000
++++ imap/mailbox.c
+@@ -1918,9 +1918,9 @@ bit32 make_sync_crc(struct mailbox *mail
+     }
+ 
+     snprintf(buf, 4096, "%u " MODSEQ_FMT " %lu (%u) %lu %s",
+-	    record->uid, record->modseq, record->last_updated,
++	    record->uid, record->modseq, (unsigned long)record->last_updated,
+ 	    flagcrc,
+-	    record->internaldate,
++	    (unsigned long)record->internaldate,
+ 	    message_guid_encode(&record->guid));
+ 
+     return crc32_cstring(buf);