From 9a9f99ab21b26e4159eca4dab333666104880fdd Mon Sep 17 00:00:00 2001 From: obache Date: Sun, 16 Dec 2012 02:55:46 +0000 Subject: Update cyrus-imapd24 to 2.4.17. Changes to the Cyrus IMAP Server since 2.4.16 * A bunch of cleanups and fixes to compiling * A bunch of sieve cleanups * Fixed bug #3691: unixhierarchysep is now obeyed when printing the mailbox name in unexpunge * Fixed bug #3718: crashes fetching message parts * Fixed bug #3719: pop3 seen update of final message in a mailbox * Improved documentation of "proxyservers" option * Fixed bug #3737: lost emails in XFER delivery race * Fixed bug #3725: inefficient statuscache use in some cases * Fixed bug #3484: use of sasl property types (compile fix) * Fixed bug #3754: failure to support binary append. This was found by a popular library switching to using binary appends * Fixed bug #3735: user prefix searching now works with fulldirhash * Fixed bug #3696: can no longer rename the same mailbox twice, which left things in a corrupted state if you caught the race. * Fixed bug #3715: using berkeley for mailboxes.db was very broken. It now works. * Fixed bug #3733: reconstruct with missing cyrus.index will use file timestamps for internaldate rather than setting it to NOW if internaldate_heuristic is set to standard * Fixed bug #3729: better documentation for xlist-* in 2.4. * Fixed bug #2717: fetches of individual messages or short ranges no longer need to parse over the entire index. * Fixed bug #3742: reconstruct can now fix multiple folders with the same uniqueid again (regression from 2.3) and also sync_client avoids a crash in that broken case. * Fixed bug #3711: detect the buggy /usr/bin/compile_et shipped on MacOS X and fall back to our bundled copy. --- mail/cyrus-imapd24/Makefile | 5 ++--- mail/cyrus-imapd24/distinfo | 8 ++++---- mail/cyrus-imapd24/options.mk | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 8 deletions(-) (limited to 'mail') diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index ee9032e7dff..0aa6637bc3d 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2012/12/16 01:52:20 obache Exp $ +# $NetBSD: Makefile,v 1.25 2012/12/16 02:55:46 obache Exp $ -DISTNAME= cyrus-imapd-2.4.16 -PKGREVISION= 3 +DISTNAME= cyrus-imapd-2.4.17 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 500720c0cd3..f96c19d18b7 100644 --- a/mail/cyrus-imapd24/distinfo +++ b/mail/cyrus-imapd24/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.16 2012/04/19 11:18:17 obache Exp $ +$NetBSD: distinfo,v 1.17 2012/12/16 02:55:46 obache Exp $ -SHA1 (cyrus-imapd-2.4.16.tar.gz) = 2d3343798e1788a3d42e9c2825f5dd966a98aae0 -RMD160 (cyrus-imapd-2.4.16.tar.gz) = 78990a7be4691c94781a176e364704300cb7155d -Size (cyrus-imapd-2.4.16.tar.gz) = 2484201 bytes +SHA1 (cyrus-imapd-2.4.17.tar.gz) = cc869dea08ad663fc32d9ab628992a1711cfbb1b +RMD160 (cyrus-imapd-2.4.17.tar.gz) = c28e971515130eea23067b7015047a120edba86f +Size (cyrus-imapd-2.4.17.tar.gz) = 2486355 bytes SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323 SHA1 (patch-ah) = 4bc62dfdeafdca83ddac02aff0ffd05db28fe0b9 SHA1 (patch-ai) = 9167678988f411479d187b232eb10ad8622b4151 diff --git a/mail/cyrus-imapd24/options.mk b/mail/cyrus-imapd24/options.mk index 5265086c9a2..792fc6c9ee0 100644 --- a/mail/cyrus-imapd24/options.mk +++ b/mail/cyrus-imapd24/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2012/01/05 11:52:34 obache Exp $ +# $NetBSD: options.mk,v 1.7 2012/12/16 02:55:46 obache Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd @@ -49,6 +49,19 @@ CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et CONFIGURE_ARGS+= --with-com-err=yes . endif .endif +.if defined(CONFIGURE_ENV) && !empty(CONFIGURE_ENV:MCOMPILE_ET=*) +post-configure: generate-compile-et +.endif + +generate-compile-et: + ${RUN}cd ${WRKSRC}/com_err/et; \ + if ${TEST} ! -f Makefile -a ! -f compile_et; then \ + ${SED} -e 's,@SED@,${SED},g' \ + -e 's,@AWK@,${AWK},g' \ + -e 's,@DIR@,${WRKSRC}/com_err/et,g' \ + < compile_et.sh > compile_et; \ + ${CHMOD} +x compile_et; \ + fi .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" -- cgit v1.2.3