Updte cyrus-imapd24 to 2.4.5.

Changes to the Cyrus IMAP Server since 2.4.4

  * Tidy up of the git version number added to the ID response
  * Fixed incorrect time field in date searches (Bug #3339) - thanks Greg Banks
    for noticing this one
  * Fixed reconstruct crash and other potential issues (Bug #3353) - first
    reported Paul Dekkers
  * Fixed ACL passing for rename/delete on murder backends (Bug #3342) - first
    reported by Robert Spellman
  * Fixed corruption of long (>1024 byte) seen records on replica (Bug #3344) -
    found at FastMail by Bron Gondwana
  * Made all perl utilities use /usr/bin/perl in the #! line (Bug #2275) -
    reported by Yann Rouillard over 5 years ago!
  * Fixed crash on message with incomplete final boundary (Bug #3345) - found
    at FastMail by Bron Gondwana
  * Regression: sync_crc was being set to 00000000 on repack - introduced in
    2.4.4 (Bug #3347) - first found at FastMail, but also seen at multiple
    other sites
  * Always print [CLOSED] response when selecting a new mailbox, even if a
    CONDSTORE enabling command has not been sent (Bug #3352) - reported by Jan
    Kundra't, author of the Trojita IMAP client
  * Fixed crash with reconstruct -rf and missing mailboxes.db entries (Bug #
    3351) - reported by Giles Malet
  * Made sync_server report errors earlier if there are extra records on the
    master which aren't present on the replica (Bug #3355) - thanks to David
    Carter for finding it and a first pass at a fix
  * Stopped expunges to never-reported-messages being showed (basically if the
    'EXPUNGE' command was run, and it expunged a message that the client had
    never even seen - seriously rare race condition, Bug #3356) - discovered by
    Bron Gondwana hammering a testbed with Dovecot's imaptest tool
  * Fixed compile with old PCRE (Bug #3358) - found and fixed by Simon Matter
  * Fixed missing quota usage after XFER (Buf #3349) - found by Dave McMurtrie

4 files changed, 39 insertions, 17 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 701a02722eb..5bfacaeda77 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2010/11/12 03:49:56 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/11/30 00:45:55 obache Exp $
 
-DISTNAME=	cyrus-imapd-2.4.4
+DISTNAME=	cyrus-imapd-2.4.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/ \
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index d85430deaad..aecbba0fcce 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2010/11/12 03:49:56 obache Exp $
+$NetBSD: distinfo,v 1.4 2010/11/30 00:45:55 obache Exp $
 
-SHA1 (cyrus-imapd-2.4.4.tar.gz) = 22a7643f9248351c263561f9bf27e9ba244cb123
-RMD160 (cyrus-imapd-2.4.4.tar.gz) = b09489087049c6797529d89f45c3bbcec7034d59
-Size (cyrus-imapd-2.4.4.tar.gz) = 2413958 bytes
-SHA1 (patch-aa) = a4f15e5f07327037219f7ef2169edb9d795ff167
-SHA1 (patch-ab) = bab504f2cf2cf9b9901e253bf6cf6d6d0954371a
+SHA1 (cyrus-imapd-2.4.5.tar.gz) = c6ea692f75f0785b5017ab55b645314e8679ffe4
+RMD160 (cyrus-imapd-2.4.5.tar.gz) = b056b826bf6b74bac68f99655e2fa7fd4344048e
+Size (cyrus-imapd-2.4.5.tar.gz) = 2371680 bytes
+SHA1 (patch-aa) = 68bc0f58dd6afd585dcfb1d38e4d131457cddb12
+SHA1 (patch-ab) = f4762aaf7b8b929c28d63c666e6e8ea700681974
 SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323
 SHA1 (patch-ad) = 9c97c99996271c5a123d58e94eb7b16bc9086ebb
 SHA1 (patch-ae) = 9bee786ad3f0237ee15302c2954e3e90b6fe69fb
diff --git a/mail/cyrus-imapd24/patches/patch-aa b/mail/cyrus-imapd24/patches/patch-aa
index d6f529132d6..48a2dc83410 100644
--- a/mail/cyrus-imapd24/patches/patch-aa
+++ b/mail/cyrus-imapd24/patches/patch-aa
@@ -1,16 +1,27 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+$NetBSD: patch-aa,v 1.2 2010/11/30 00:45:56 obache Exp $
 
---- configure.in.orig	2010-10-19 03:08:28.000000000 +0000
+--- configure.in.orig	2010-11-29 13:28:06.000000000 +0000
 +++ configure.in
-@@ -391,11 +391,11 @@ if test "$sievedir" != "no"; then
+@@ -391,7 +391,7 @@ if test "$sievedir" != "no"; then
  	AC_CHECK_LIB(fl,main)
  
- 	AC_CHECK_HEADERS(pcreposix.h rxposix.h)
+ 	AC_CHECK_HEADER(pcreposix.h)
 -	if test "$ac_cv_header_pcreposix_h" == "yes"; then
 +	if test "$ac_cv_header_pcreposix_h" = "yes"; then
+ 		AC_MSG_CHECKING(for utf8 enabled pcre)
+ 		AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include <pcreposix.h>
+ #ifndef REG_UTF8
+@@ -401,13 +401,13 @@ if test "$sievedir" != "no"; then
+ 	else
+ 		cyrus_cv_pcre_utf8="no"
+ 	fi
+-	if test "$cyrus_cv_pcre_utf8" == "yes"; then
++	if test "$cyrus_cv_pcre_utf8" = "yes"; then
  		LIBS="$LIBS -lpcre -lpcreposix";
  		AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
+ 		AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
  	else 
+ 		AC_CHECK_HEADERS(rxposix.h)
 -		if test "$ac_cv_header_rxposix_h" == "yes"; then
 +		if test "$ac_cv_header_rxposix_h" = "yes"; then
  			LIBS="$LIBS -lrx"
diff --git a/mail/cyrus-imapd24/patches/patch-ab b/mail/cyrus-imapd24/patches/patch-ab
index 8a592f11387..e61b12d517b 100644
--- a/mail/cyrus-imapd24/patches/patch-ab
+++ b/mail/cyrus-imapd24/patches/patch-ab
@@ -1,18 +1,29 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+$NetBSD: patch-ab,v 1.2 2010/11/30 00:45:56 obache Exp $
 
---- configure.orig	2010-10-19 09:58:48.000000000 +0000
+--- configure.orig	2010-11-29 13:29:23.000000000 +0000
 +++ configure
-@@ -7145,13 +7145,13 @@ fi
+@@ -7156,7 +7156,7 @@ if test "x$ac_cv_header_pcreposix_h" = x
+ fi
  
- done
  
 -	if test "$ac_cv_header_pcreposix_h" == "yes"; then
 +	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 :
+@@ -7182,7 +7182,7 @@ $as_echo "$cyrus_cv_pcre_utf8" >&6; }
+ 	else
+ 		cyrus_cv_pcre_utf8="no"
+ 	fi
+-	if test "$cyrus_cv_pcre_utf8" == "yes"; then
++	if test "$cyrus_cv_pcre_utf8" = "yes"; then
  		LIBS="$LIBS -lpcre -lpcreposix";
  
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
+@@ -7203,7 +7203,7 @@ fi
+ 
+ done
  
- 	else
 -		if test "$ac_cv_header_rxposix_h" == "yes"; then
 +		if test "$ac_cv_header_rxposix_h" = "yes"; then
  			LIBS="$LIBS -lrx"