From c5c19bc784360f2c7c9c2eed4889f84e0527e515 Mon Sep 17 00:00:00 2001 From: obache Date: Wed, 5 Oct 2011 01:32:31 +0000 Subject: Update cyrus-imapd24 to 2.4.12. Changes to the Cyrus IMAP Server since 2.4.11 * Bug #3150 - fix issue with overview and messages without a References header * fixed nntp login with tab and space in password * Bug #3501 - be more relaxed about names of DELETED folders * Bug #3553 - fix QRESYNC passing to murder backend - thanks alec * Bug #3554 - only show ENABLED response the first time each option is ENABLEd * Lots of cleanup of build process and backporting of APIs * Bug #3502 - make configure.in more portable - thanks OBATA Akio * Bug #3533 - add missing break statements in sieve - thanks Thomas Jarosch * Bug #3550 - support wildcards for ACLS in cyradm - thanks * Bug #3556 - print remote server in mbpath - thanks Wolfgang Breyha * Bug #3559 - make XFER work with unlimited quota - thanks Wolfgang Breyha * Bug #3547 - use strconcat() in writefile() * fixed a case where skiplist library could write error messages directly to stdout * Bug #3545 - fix sign extension in squat_decode_64 * Bug #3558 - return error if backend doesn't support LIST-EXTENDED * Bug #3565 - clean up in preparation for automake * fixed incomplete authentication checks in nntpd, reported by Secunia as SA46093 --- mail/cyrus-imapd24/Makefile | 4 ++-- mail/cyrus-imapd24/distinfo | 10 ++++------ mail/cyrus-imapd24/patches/patch-aa | 29 ----------------------------- mail/cyrus-imapd24/patches/patch-ab | 31 ------------------------------- 4 files changed, 6 insertions(+), 68 deletions(-) delete mode 100644 mail/cyrus-imapd24/patches/patch-aa delete mode 100644 mail/cyrus-imapd24/patches/patch-ab (limited to 'mail') diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 4e08dc35579..ff601ea6db1 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2011/09/09 12:09:34 obache Exp $ +# $NetBSD: Makefile,v 1.13 2011/10/05 01:32:31 obache Exp $ -DISTNAME= cyrus-imapd-2.4.11 +DISTNAME= cyrus-imapd-2.4.12 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 8a533a33c0b..8197294b4b4 100644 --- a/mail/cyrus-imapd24/distinfo +++ b/mail/cyrus-imapd24/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.12 2011/09/09 12:09:34 obache Exp $ +$NetBSD: distinfo,v 1.13 2011/10/05 01:32:31 obache Exp $ -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 (cyrus-imapd-2.4.12.tar.gz) = c7a1e1dee9f32891c64499945915e8c4e99ce183 +RMD160 (cyrus-imapd-2.4.12.tar.gz) = 5c481d5ce295667eed1c90bc1d0572946caaae29 +Size (cyrus-imapd-2.4.12.tar.gz) = 2450099 bytes 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 deleted file mode 100644 index fff163649f1..00000000000 --- a/mail/cyrus-imapd24/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2011/09/09 12:09:34 obache Exp $ - ---- configure.in.orig 2011-09-08 18:57:42.000000000 +0000 -+++ configure.in -@@ -403,7 +403,7 @@ if test "$sievedir" != "no"; then - - 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 - #ifndef REG_UTF8 -@@ -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"; - 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" - AC_DEFINE(ENABLE_REGEX, [], - [Do we have a regex library?]) diff --git a/mail/cyrus-imapd24/patches/patch-ab b/mail/cyrus-imapd24/patches/patch-ab deleted file mode 100644 index 032141a9860..00000000000 --- a/mail/cyrus-imapd24/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2011/09/09 12:09:34 obache Exp $ - ---- 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 - - -- 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 ${cyrus_cv_pcre_utf8+:} false; then : -@@ -7229,7 +7229,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 -@@ -7250,7 +7250,7 @@ fi - - done - -- if test "$ac_cv_header_rxposix_h" == "yes"; then -+ if test "$ac_cv_header_rxposix_h" = "yes"; then - LIBS="$LIBS -lrx" - - $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h -- cgit v1.2.3