Update cyrus-imapd24 to 2.4.9.

while here, expunge old sites from MASTER_SITES, and add the http site in
release announcement.

Changes to the Cyrus IMAP Server since 2.4.8

      * fixed crashes in seen handling
      * Bug #3453 - fixed LSUB replication
      * Bug #3442 - allow disabling PCRE if it's buggy at your site
      * Bug #3443 - LSUB response fixes
      * Bug #3448 - XFER error handling (murder)
      * Bug #3437 - fixed regression: quotaroot wasn't being updated on
        rename
      * Bug #3456 - fixed crash on rename user.foo user.foo without
        partition change
      * config update: database paths for most databases are now
        configurable in imapd.conf
      * Bug #3303 - fixed index lock breaking on XFER (thanks Julien
        Coloos)
      * Bug #3457 - fixed ESEARCH parsing (was breaking iPhones)
      * Bug #3188 - fixed XFER with unlimited quota (thanks again Julien
        Coloos)
      * Misc other quota fixes (there are still known bugs with the quota
        system)
      * Bug #3169 - fixed GETQUOTAROOT for domain quotaroots
      * Bug #3465 - fixed compilation with Perl 5.14 (thanks
        hsk@imb-jena.de, and also thanks to Ondrej Sury who reported it
        separately)
      * Bug #3464 - fix for sendmail exec failure. This was a nasty one,

5 files changed, 41 insertions, 45 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index e1c62880f13..e20cc907823 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2011/06/10 21:57:08 obache Exp $
+# $NetBSD: Makefile,v 1.9 2011/06/22 01:05:36 obache Exp $
 
-DISTNAME=	cyrus-imapd-2.4.8
-PKGREVISION=	1
+DISTNAME=	cyrus-imapd-2.4.9
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
-		ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/ \
-		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ \
-		http://www.t.ring.gr.jp/archives/net/mail/cyrus-mail/ \
-		ftp://ftp.t.ring.gr.jp/pub/net/mail/cyrus-mail/
+MASTER_SITES=	http://cyrusimap.org/releases/ \
+		ftp://ftp.cyrusimap.org/cyrus-imapd/ \
+		ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.cyrusimap.org/
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 715caf7591b..af0f1394023 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2011/05/15 12:04:24 obache Exp $
+$NetBSD: distinfo,v 1.10 2011/06/22 01:05:36 obache Exp $
 
-SHA1 (cyrus-imapd-2.4.8.tar.gz) = 4dfc328aff482c9ebb4efdce4b140f69564880e8
-RMD160 (cyrus-imapd-2.4.8.tar.gz) = 72f9afbf7893b3449a1a76b7050ea6d7c9b003c9
-Size (cyrus-imapd-2.4.8.tar.gz) = 2424151 bytes
-SHA1 (patch-aa) = c17dc4d5ebdd38fa31b7035feb2b233f19560c52
-SHA1 (patch-ab) = e685a3c3fc106135318378d020860f0a25bc1d9f
+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 (patch-aa) = c6dc9d4df5b5f49e1aaaf7a554764ff857638829
+SHA1 (patch-ab) = c7e422d9f41a82aa7c7e0c9a260d021517a5059f
 SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323
 SHA1 (patch-ad) = 9c97c99996271c5a123d58e94eb7b16bc9086ebb
 SHA1 (patch-ae) = 9bee786ad3f0237ee15302c2954e3e90b6fe69fb
@@ -16,7 +16,7 @@ SHA1 (patch-aj) = 14f293489a816d2282f0d1a7b289d5a775c74c24
 SHA1 (patch-ak) = 2e8a105b30d2c0c38f523020bf79d7e26cfa235b
 SHA1 (patch-al) = 0eaef55760e9a071802bba157a00bdacc84c1932
 SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
-SHA1 (patch-an) = 31d008c732f71e0b6960f8e4206ce466a689c558
+SHA1 (patch-an) = 94aac408657e2315246c7cdaac2524c68eeb7c24
 SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
 SHA1 (patch-aq) = e364a2904db59f29f8adc1a0d4981a7bfd54e767
 SHA1 (patch-ar) = 4ac95c029794afba0f4d398643f354b71efd9ac3
diff --git a/mail/cyrus-imapd24/patches/patch-aa b/mail/cyrus-imapd24/patches/patch-aa
index 5ea94521fe0..da39d489b8b 100644
--- a/mail/cyrus-imapd24/patches/patch-aa
+++ b/mail/cyrus-imapd24/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.4 2011/05/15 12:04:24 obache Exp $
+$NetBSD: patch-aa,v 1.5 2011/06/22 01:05:37 obache Exp $
 
---- configure.in.orig	2011-04-13 14:35:22.000000000 +0000
+--- configure.in.orig	2011-06-21 19:50:39.000000000 +0000
 +++ configure.in
-@@ -395,7 +395,7 @@ if test "$sievedir" != "no"; then
- 	AC_CHECK_LIB(fl,main)
+@@ -403,7 +403,7 @@ if test "$sievedir" != "no"; then
  
- 	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>
+ 	if test "$testpcre" != "no"; then
+ 	    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
-@@ -405,13 +405,13 @@ if test "$sievedir" != "no"; then
- 	else
- 		cyrus_cv_pcre_utf8="no"
+@@ -415,13 +415,13 @@ if test "$sievedir" != "no"; then
+ 	    fi
  	fi
+ 
 -	if test "$cyrus_cv_pcre_utf8" == "yes"; then
 +	if test "$cyrus_cv_pcre_utf8" = "yes"; then
  		LIBS="$LIBS -lpcre -lpcreposix";
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.4 2011/05/15 12:04:24 obache Exp $
  			LIBS="$LIBS -lrx"
  			AC_DEFINE(ENABLE_REGEX, [],
  				  [Do we have a regex library?])
-@@ -1161,7 +1161,7 @@ dnl add perl cccdlflags when building li
+@@ -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
diff --git a/mail/cyrus-imapd24/patches/patch-ab b/mail/cyrus-imapd24/patches/patch-ab
index 0511d9f6df5..57532080ee6 100644
--- a/mail/cyrus-imapd24/patches/patch-ab
+++ b/mail/cyrus-imapd24/patches/patch-ab
@@ -1,26 +1,26 @@
-$NetBSD: patch-ab,v 1.3 2011/04/14 12:23:40 obache Exp $
+$NetBSD: patch-ab,v 1.4 2011/06/22 01:05:37 obache Exp $
 
---- configure.orig	2011-04-13 14:53:15.000000000 +0000
+--- configure.orig	2011-06-21 19:51:34.000000000 +0000
 +++ configure
-@@ -7179,7 +7179,7 @@ if test "x$ac_cv_header_pcreposix_h" = x
+@@ -7191,7 +7191,7 @@ if test "x$ac_cv_header_pcreposix_h" = x
  fi
  
  
--	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
+-	    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 :
-@@ -7205,7 +7205,7 @@ $as_echo "$cyrus_cv_pcre_utf8" >&6; }
- 	else
- 		cyrus_cv_pcre_utf8="no"
+ 		    if test "${cyrus_cv_pcre_utf8+set}" = set; then :
+@@ -7219,7 +7219,7 @@ $as_echo "$cyrus_cv_pcre_utf8" >&6; }
+ 	    fi
  	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
-@@ -7226,7 +7226,7 @@ fi
+@@ -7240,7 +7240,7 @@ fi
  
  done
  
@@ -29,12 +29,12 @@ $NetBSD: patch-ab,v 1.3 2011/04/14 12:23:40 obache Exp $
  			LIBS="$LIBS -lrx"
  
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
-@@ -10469,7 +10469,7 @@ elif test "${with_perl}" != "no"; then
+@@ -10483,7 +10483,7 @@ elif test "${with_perl}" != "no"; then
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
      case "${target_os}" in
 -        linux*|netbsd*)
-+        linux*|netbsd*|dragonfly*)
++        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-an b/mail/cyrus-imapd24/patches/patch-an
index 9013b4eb056..f6047777fbc 100644
--- a/mail/cyrus-imapd24/patches/patch-an
+++ b/mail/cyrus-imapd24/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+$NetBSD: patch-an,v 1.2 2011/06/22 01:05:37 obache Exp $
 
---- imap/tls.c.orig	2010-10-19 03:08:28.000000000 +0000
+--- imap/tls.c.orig	2011-06-21 19:50:39.000000000 +0000
 +++ imap/tls.c
 @@ -223,7 +223,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu
      return (rsa_tmp);
@@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
  /* Logic copied from OpenSSL apps/s_server.c: give the TLS context
   * DH params to work with DHE-* cipher suites. Hardcoded fallback
   * in case no DH params in tls_key_file or tls_cert_file.
-@@ -734,7 +734,7 @@ int     tls_init_serverengine(const char
+@@ -741,7 +741,7 @@ int     tls_init_serverengine(const char
      }
      SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);