Update cyrus-imapd24 to 2.4.3.

Changes to the Cyrus IMAP Server since 2.4.2

      * Many fixes to replication edge case handling
      * Added missing flags to reconstruct
      * Replicate DELETED.user folders in sync_client -u (matches XFER
        behaviour now)
      * Make sync_client only connect after forking in rolling mode. Fixes
        two things - ssl crashes due to shared resource conflicts, and also
        means master will start up even if the replica is not contactable
      * Fixed crash on cyr_expire and ipurge annotation based expiry
      * Many XFER fixes for compatibility across versions:

          * allowing XFER in from delayed_expunge mailboxes
          * allowing XFER back all the way to Cyrus 2.2.12. This was
            accomplished by adding logic that can generate
            backwards-compatible older version indexes, and version
            detection from the imapd banner.
          * correctly fixing seen information for sub-mailboxes on XFER in

      * Multi-target replication. Strictly this is a new feature - there
        was a broken implementation in 2.4.0, which is how this snuck in to
        the bugfix release. It's not super-well documented yet, but it
        works by creating a separate log file for each destination
        "channel", and then running one sync_client process per channel, so
        replication can fall behind on one without affecting replication to
        the other.
      * Fixed some crashes and errors which occured when upgrading and
        opening corrupted mailboxes
      * Modified AFS ptloader configure options to allow building on more
        modern systems

4 files changed, 9 insertions, 10 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index fe4f213158d..e56a11e3781 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/09 08:18:56 obache Exp $
 
-DISTNAME=	cyrus-imapd-2.4.2
+DISTNAME=	cyrus-imapd-2.4.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/ \
diff --git a/mail/cyrus-imapd24/PLIST b/mail/cyrus-imapd24/PLIST
index 327e4d85a82..2fd20dd990f 100644
--- a/mail/cyrus-imapd24/PLIST
+++ b/mail/cyrus-imapd24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/11/09 08:18:56 obache Exp $
 bin/imtest
 bin/installsieve
 bin/lmtptest
@@ -67,6 +67,7 @@ include/cyrus/bsearch.h
 include/cyrus/byteorder64.h
 include/cyrus/charset.h
 include/cyrus/crc32.h
+include/cyrus/cyr_lock.h
 include/cyrus/cyrusdb.h
 include/cyrus/glob.h
 include/cyrus/gmtoff.h
@@ -79,7 +80,6 @@ include/cyrus/imparse.h
 include/cyrus/iptostring.h
 include/cyrus/libconfig.h
 include/cyrus/libcyr_cfg.h
-include/cyrus/lock.h
 include/cyrus/lsort.h
 include/cyrus/map.h
 include/cyrus/md5.h
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 44bf2a554aa..5a34739e1a3 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+$NetBSD: distinfo,v 1.2 2010/11/09 08:18:56 obache Exp $
 
-SHA1 (cyrus-imapd-2.4.2.tar.gz) = 8281785b2ba00dbe440e9d3ed3a104d13a0635b0
-RMD160 (cyrus-imapd-2.4.2.tar.gz) = 0988df34fe2080fcc4215737074d5a2012b63a42
-Size (cyrus-imapd-2.4.2.tar.gz) = 2360589 bytes
+SHA1 (cyrus-imapd-2.4.3.tar.gz) = f4e5e881501cb592e78510522622077704129717
+RMD160 (cyrus-imapd-2.4.3.tar.gz) = cfe891ee2d0b663996ec40c78569084ce987b900
+Size (cyrus-imapd-2.4.3.tar.gz) = 2369737 bytes
 SHA1 (patch-aa) = a4f15e5f07327037219f7ef2169edb9d795ff167
 SHA1 (patch-ab) = bab504f2cf2cf9b9901e253bf6cf6d6d0954371a
 SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323
diff --git a/mail/cyrus-imapd24/options.mk b/mail/cyrus-imapd24/options.mk
index 36fc7ed579f..0c2044a6da5 100644
--- a/mail/cyrus-imapd24/options.mk
+++ b/mail/cyrus-imapd24/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+# $NetBSD: options.mk,v 1.2 2010/11/09 08:18:56 obache Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-imapd
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+=	--with-krb=/usr
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}
 CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
-CONFIGURE_ARGS+=	--enable-krb5afspts
 GSSIMPL.heimdal=	heimdal
 GSSIMPL.mit-krb5=	mit
 CONFIGURE_ENV+=		COMPILE_ET=${KRB5BASE}/bin/compile_et