Index: head/mail/dovecot/Makefile =================================================================== --- head/mail/dovecot/Makefile (revision 448696) +++ head/mail/dovecot/Makefile (revision 448697) @@ -1,160 +1,159 @@ # Created by: Nagy, Attila # $FreeBSD$ ###################################################################### # Anytime PORTVERSION changes please bump PORTREVISION of # # mail/dovecot-pigeonhole. See ports/146029 for an explanation. # # # # Please be careful when updating this port as changes to this port # # can break mail/dovecot-pigeonhole. In order to ensure the least # # amount of breakage possible please consult the maintainer of that # # port before updating this one. # ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.2.31 -PORTREVISION= 2 +PORTVERSION= 2.2.32 CATEGORIES= mail ipv6 MASTER_SITES= https://www.dovecot.org/releases/2.2/ MAINTAINER= adamw@FreeBSD.org COMMENT= Secure, fast and powerful IMAP and POP3 server LICENSE= LGPL21 MIT LICENSE_COMB= dual USES= cpe iconv libtool ssl USE_RC_SUBR= dovecot GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ --with-statedir=/var/db/dovecot \ --without-shadow \ --with-ssl=openssl \ --with-docs USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} OPTIONS_DEFINE= KQUEUE LIBWRAP LZ4 VPOPMAIL DOCS EXAMPLES OPTIONS_DEFAULT=KQUEUE GSSAPI_NONE OPTIONS_SUB= yes OPTIONS_GROUP= DB FTS OPTIONS_GROUP_DB= CDB LDAP MYSQL PGSQL SQLITE OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT KQUEUE_DESC= kqueue(2) support LZ4_DESC= LZ4 compression support VPOPMAIL_DESC= vpopmail support DB_DESC= Database support CDB_DESC= CDB database support FTS_DESC= Full text search plugins ICU_DESC= Use libicu for FTS unicode normalization LUCENE_DESC= CLucene FTS support SOLR_DESC= Solr FTS support TEXTCAT_DESC= Libtextcat FTS support GSSAPI_NONE_DESC= Build without GSSAPI support GSSAPI_BASE_DESC= Use GSSAPI from base GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 # General options KQUEUE_CONFIGURE_OFF= --with-ioloop=poll --with-notify=none KQUEUE_CONFIGURE_ON= --with-ioloop=kqueue --with-notify=kqueue LIBWRAP_CONFIGURE_WITH= libwrap LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 VPOPMAIL_BUILD_DEPENDS= vpopmail>=0:mail/vpopmail VPOPMAIL_CONFIGURE_WITH=vpopmail # Databases CDB_CONFIGURE_WITH= cdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql SQLITE_USES= sqlite:3 SQLITE_CONFIGURE_WITH= sqlite # FTS ICU_CONFIGURE_WITH= icu ICU_LIB_DEPENDS= libicui18n.so:devel/icu ICU_USES= pkgconfig LUCENE_CONFIGURE_WITH= lucene LUCENE_LIB_DEPENDS= libclucene-core.so:textproc/clucene SOLR_CONFIGURE_WITH= solr SOLR_LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 TEXTCAT_CONFIGURE_WITH= textcat TEXTCAT_LIB_DEPENDS= libtextcat.so:textproc/libtextcat # GSSAPI GSSAPI_NONE_CONFIGURE_ON= --without-gssapi GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit DOCS= AUTHORS COPYING COPYING.LGPL COPYING.MIT INSTALL NEWS TODO README PORTDOCS= * PORTEXAMPLES= * # Default requirement for dovecot rc script _REQUIRE= LOGIN LDAP_VARS= _REQUIRE+=slapd MYSQL_VARS= _REQUIRE+=mysql PGSQL_VARS= _REQUIRE+=postgresql SUB_LIST+= REQUIRE="${_REQUIRE}" SUB_FILES+= pkg-message CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} post-patch: @${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \ s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \ ${WRKSRC}/doc/example-config/*.conf ${WRKSRC}/doc/example-config/conf.d/* @${REINPLACE_CMD} -e '/^LIBS =/s/$$/ @LTLIBICONV@/' \ ${WRKSRC}/src/lib-mail/Makefile.in # Install the sample config files into ETCDIR/example-config/ @${REINPLACE_CMD} -e '/^exampledir =/s|\$$(docdir)|${ETCDIR}|' \ ${WRKSRC}/doc/example-config/Makefile.in \ ${WRKSRC}/doc/example-config/conf.d/Makefile.in @${REINPLACE_CMD} -e '/^[^#]/s|/usr|${LOCALBASE}|' \ ${WRKSRC}/src/plugins/fts/decode2text.sh post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/dovecot-openssl.cnf ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/mkcert.sh ${STAGEDIR}${EXAMPLESDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/mail/dovecot/distinfo =================================================================== --- head/mail/dovecot/distinfo (revision 448696) +++ head/mail/dovecot/distinfo (revision 448697) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498515382 -SHA256 (dovecot-2.2.31.tar.gz) = 034be40907748128d65088a4f59789b2f99ae7b33a88974eae0b6a68ece376a1 -SIZE (dovecot-2.2.31.tar.gz) = 5993283 +TIMESTAMP = 1503592198 +SHA256 (dovecot-2.2.32.tar.gz) = 160b2151e2af359877f69cb2dcdfe1a3f4138ad3766e3b8562b96616e2f6bc2e +SIZE (dovecot-2.2.32.tar.gz) = 6100268 Index: head/mail/dovecot/files/patch-UPSTREAM-notify =================================================================== --- head/mail/dovecot/files/patch-UPSTREAM-notify (revision 448696) +++ head/mail/dovecot/files/patch-UPSTREAM-notify (nonexistent) @@ -1,84 +0,0 @@ -NOTIFY was broken since 2.2.31, and this patch reverts that breakage, using two -upstream commits: - -* https://github.com/dovecot/core/commit/bcb321bc62117d30bc53a872ca1154c0100aeefd -* https://github.com/dovecot/core/commit/8b2d740b8182c63b76ff7ef0dd5e01710228705a - -From bcb321bc62117d30bc53a872ca1154c0100aeefd Mon Sep 17 00:00:00 2001 -From: Timo Sirainen -Date: Fri, 30 Jun 2017 17:33:15 +0300 -Subject: [PATCH] imap: Fix NOTIFY parameter parsing by reverting earlier - change - -I misread the RFC and wrote broken tests. -Reverts 64d2efdc4b0bdf92249840e9db89b91c8dc0f3a3 - - -From 8b2d740b8182c63b76ff7ef0dd5e01710228705a Mon Sep 17 00:00:00 2001 -From: Timo Sirainen -Date: Fri, 30 Jun 2017 17:51:34 +0300 -Subject: [PATCH] imap: Add more error checking to NOTIFY parameter parsing - -This should make it clearer to realize when invalid syntax is being used -rather than just ignoring the problem. - - ---- src/imap/cmd-notify.c.orig 2017-06-30 21:31:28 UTC -+++ src/imap/cmd-notify.c -@@ -41,6 +41,8 @@ static int - cmd_notify_parse_fetch(struct imap_notify_context *ctx, - const struct imap_arg *list) - { -+ if (list->type == IMAP_ARG_EOL) -+ return -1; /* at least one attribute must be set */ - return imap_fetch_att_list_parse(ctx->client, ctx->pool, list, - &ctx->fetch_ctx, &ctx->error); - } -@@ -59,11 +61,17 @@ cmd_notify_set_selected(struct imap_noti - strcasecmp(str, "NONE") == 0) { - /* no events for selected mailbox. this is also the default - when NOTIFY command doesn't specify it explicitly */ -+ if (events[1].type != IMAP_ARG_EOL) -+ return -1; /* no extra parameters */ - return 0; - } - - if (!imap_arg_get_list(events, &list)) - return -1; -+ if (events[1].type != IMAP_ARG_EOL) -+ return -1; /* no extra parameters */ -+ if (list->type == IMAP_ARG_EOL) -+ return -1; /* at least one event */ - - for (; list->type != IMAP_ARG_EOL; list++) { - if (cmd_notify_parse_event(list, &event) < 0) -@@ -292,10 +300,10 @@ cmd_notify_set(struct imap_notify_contex - ctx->send_immediate_status = TRUE; - args++; - } -+ for (; args->type != IMAP_ARG_EOL; args++) { -+ if (!imap_arg_get_list(args, &event_group)) -+ return -1; - -- if (!imap_arg_get_list(args, &event_group)) -- return -1; -- for (; event_group->type != IMAP_ARG_EOL; event_group++) { - /* filter-mailboxes */ - if (!imap_arg_get_atom(event_group, &filter_mailboxes)) - return -1; -@@ -322,6 +330,15 @@ cmd_notify_set(struct imap_notify_contex - if (event_group->type == IMAP_ARG_EOL) - return -1; - mailboxes = event_group++; -+ /* check that the mailboxes parameter is valid */ -+ if (IMAP_ARG_IS_ASTRING(mailboxes)) -+ ; -+ else if (!imap_arg_get_list(mailboxes, &list)) -+ return -1; -+ else if (list->type == IMAP_ARG_EOL) { -+ /* should have at least one mailbox */ -+ return -1; -+ } - } else { - mailboxes = NULL; - } Property changes on: head/mail/dovecot/files/patch-UPSTREAM-notify ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dovecot/files/patch-UPSTREAM-indexing =================================================================== --- head/mail/dovecot/files/patch-UPSTREAM-indexing (revision 448696) +++ head/mail/dovecot/files/patch-UPSTREAM-indexing (nonexistent) @@ -1,292 +0,0 @@ -From 892d85b7c6c36eb3ae6d0a78e4028a5b88b9f3a5 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen -Date: Sat, 5 Aug 2017 14:07:58 +0900 -Subject: [PATCH] lib-index: Fix modseq tracking for - MAIL_INDEX_MAIL_FLAG_UPDATE_MODSEQ - -This is used to increase modseq for mails when their private flags change. -Use an already existing MAIL_TRANSACTION_FLAG_UPDATE_IS_INTERNAL() that -does this properly. - -(This change preserves another bug, which is fixed in the next commit.) ---- - src/lib-index/mail-transaction-log-file.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/src/lib-index/mail-transaction-log-file.c b/src/lib-index/mail-transaction-log-file.c -index ab412d6ca..520541b8a 100644 ---- src/lib-index/mail-transaction-log-file.c -+++ src/lib-index/mail-transaction-log-file.c -@@ -1013,9 +1013,6 @@ static bool - flag_updates_have_non_internal(const struct mail_transaction_flag_update *u, - unsigned int count, unsigned int version) - { -- const uint8_t internal_flags = -- MAIL_INDEX_MAIL_FLAG_BACKEND | MAIL_INDEX_MAIL_FLAG_DIRTY; -- - /* Hide internal flags from modseqs if the log file's version - is new enough. This allows upgrading without the modseqs suddenly - shrinking. */ -@@ -1023,9 +1020,7 @@ flag_updates_have_non_internal(const struct mail_transaction_flag_update *u, - return TRUE; - - for (unsigned int i = 0; i < count; i++) { -- uint8_t changed_flags = u->add_flags | u->remove_flags; -- -- if ((changed_flags & ~internal_flags) != 0) -+ if (!MAIL_TRANSACTION_FLAG_UPDATE_IS_INTERNAL(u)) - return TRUE; - } - return FALSE; -From ace341ac567376f37ded043c4c0f2c46b9aaecb1 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen -Date: Sat, 5 Aug 2017 14:11:17 +0900 -Subject: [PATCH] lib-index: Fix modseq tracking with multiple flag updates - -The earlier code was checking only the first flag record update. If the -first one had only internal flag changes but (some of) the rest didn't, -the modseq wasn't counted correctly. This was probably pretty rare. ---- - src/lib-index/mail-transaction-log-file.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib-index/mail-transaction-log-file.c b/src/lib-index/mail-transaction-log-file.c -index 520541b8a..094cbb2d5 100644 ---- src/lib-index/mail-transaction-log-file.c -+++ src/lib-index/mail-transaction-log-file.c -@@ -1020,7 +1020,7 @@ flag_updates_have_non_internal(const struct mail_transaction_flag_update *u, - return TRUE; - - for (unsigned int i = 0; i < count; i++) { -- if (!MAIL_TRANSACTION_FLAG_UPDATE_IS_INTERNAL(u)) -+ if (!MAIL_TRANSACTION_FLAG_UPDATE_IS_INTERNAL(&u[i])) - return TRUE; - } - return FALSE; -From 7e78f1cfc10cc0540134b5507e08524a0fdd5c93 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen -Date: Tue, 8 Aug 2017 16:54:42 +0300 -Subject: [PATCH] lib-index: Code cleanup - move code to - get_modseq_next_offset_at() - -In preparation for making the next commit smaller. ---- - src/lib-index/mail-transaction-log-file.c | 80 ++++++++++++++++++------------- - 1 file changed, 47 insertions(+), 33 deletions(-) - -diff --git a/src/lib-index/mail-transaction-log-file.c b/src/lib-index/mail-transaction-log-file.c -index 094cbb2d5..b0512e027 100644 ---- src/lib-index/mail-transaction-log-file.c -+++ src/lib-index/mail-transaction-log-file.c -@@ -1255,15 +1255,57 @@ int mail_transaction_log_file_get_highest_modseq_at( - return 0; - } - -+static int -+get_modseq_next_offset_at(struct mail_transaction_log_file *file, -+ uint64_t modseq, -+ uoff_t *cur_offset, uint64_t *cur_modseq, -+ uoff_t *next_offset_r) -+{ -+ const struct mail_transaction_header *hdr; -+ const char *reason; -+ int ret; -+ -+ /* make sure we've read until end of file. this is especially important -+ with non-head logs which might only have been opened without being -+ synced. */ -+ ret = mail_transaction_log_file_map(file, *cur_offset, (uoff_t)-1, &reason); -+ if (ret <= 0) { -+ mail_index_set_error(file->log->index, -+ "Failed to map transaction log %s for getting offset " -+ "for modseq=%llu with start_offset=%"PRIuUOFF_T": %s", -+ file->filepath, (unsigned long long)modseq, -+ *cur_offset, reason); -+ return -1; -+ } -+ -+ /* check sync_highest_modseq again in case sync_offset was updated */ -+ if (modseq >= file->sync_highest_modseq) { -+ *next_offset_r = file->sync_offset; -+ return 0; -+ } -+ -+ i_assert(*cur_offset >= file->buffer_offset); -+ while (*cur_offset < file->sync_offset) { -+ if (log_get_synced_record(file, cur_offset, &hdr, &reason) < 0) { -+ mail_index_set_error(file->log->index, -+ "%s: %s", file->filepath, reason); -+ return -1; -+ } -+ mail_transaction_update_modseq(hdr, hdr + 1, cur_modseq, -+ MAIL_TRANSACTION_LOG_HDR_VERSION(&file->hdr)); -+ if (*cur_modseq >= modseq) -+ break; -+ } -+ return 1; -+} -+ - int mail_transaction_log_file_get_modseq_next_offset( - struct mail_transaction_log_file *file, - uint64_t modseq, uoff_t *next_offset_r) - { -- const struct mail_transaction_header *hdr; - struct modseq_cache *cache; - uoff_t cur_offset; - uint64_t cur_modseq; -- const char *reason; - int ret; - - if (modseq == file->sync_highest_modseq) { -@@ -1290,37 +1332,9 @@ int mail_transaction_log_file_get_modseq_next_offset( - cur_modseq = cache->highest_modseq; - } - -- /* make sure we've read until end of file. this is especially important -- with non-head logs which might only have been opened without being -- synced. */ -- ret = mail_transaction_log_file_map(file, cur_offset, (uoff_t)-1, &reason); -- if (ret <= 0) { -- mail_index_set_error(file->log->index, -- "Failed to map transaction log %s for getting offset " -- "for modseq=%llu with start_offset=%"PRIuUOFF_T": %s", -- file->filepath, (unsigned long long)modseq, -- cur_offset, reason); -- return -1; -- } -- -- /* check sync_highest_modseq again in case sync_offset was updated */ -- if (modseq >= file->sync_highest_modseq) { -- *next_offset_r = file->sync_offset; -- return 0; -- } -- -- i_assert(cur_offset >= file->buffer_offset); -- while (cur_offset < file->sync_offset) { -- if (log_get_synced_record(file, &cur_offset, &hdr, &reason) < 0) { -- mail_index_set_error(file->log->index, -- "%s: %s", file->filepath, reason); -- return -1; -- } -- mail_transaction_update_modseq(hdr, hdr + 1, &cur_modseq, -- MAIL_TRANSACTION_LOG_HDR_VERSION(&file->hdr)); -- if (cur_modseq >= modseq) -- break; -- } -+ if ((ret = get_modseq_next_offset_at(file, modseq, &cur_offset, -+ &cur_modseq, next_offset_r)) <= 0) -+ return ret; - if (cur_offset == file->sync_offset) { - /* if we got to sync_offset, cur_modseq should be - sync_highest_modseq */ -From f39bde1e1fb00905b71a4f2a793faea4b915e27b Mon Sep 17 00:00:00 2001 -From: Timo Sirainen -Date: Tue, 8 Aug 2017 16:56:02 +0300 -Subject: [PATCH] lib-index: Fix wrong mail_index_modseq_header automatically - -It happens only on the next sync, although that isn't actually guaranteed to -happen. Still, it happens almost always so this should be good enough. ---- - src/lib-index/mail-index-sync.c | 2 +- - src/lib-index/mail-transaction-log-file.c | 26 ++++++++++++++++----- - src/lib-index/mail-transaction-log-private.h | 1 + - src/lib-index/mail-transaction-log.c | 3 +++ - src/lib-index/test-mail-transaction-log-file.c | 32 ++++++++++++++++++++++++++ - 5 files changed, 57 insertions(+), 7 deletions(-) - -diff --git a/src/lib-index/mail-index-sync.c b/src/lib-index/mail-index-sync.c -index 24de5e119..f4d30eb03 100644 ---- src/lib-index/mail-index-sync.c -+++ src/lib-index/mail-index-sync.c -@@ -361,7 +361,7 @@ mail_index_sync_begin_init(struct mail_index *index, - } - - if (!mail_index_need_sync(index, flags, log_file_seq, log_file_offset) && -- !index->index_deleted) { -+ !index->index_deleted && !index->need_recreate) { - if (locked) - mail_transaction_log_sync_unlock(index->log, "syncing determined unnecessary"); - return 0; -diff --git a/src/lib-index/mail-transaction-log-file.c b/src/lib-index/mail-transaction-log-file.c -index 8410865a1..82723fe3a 100644 ---- src/lib-index/mail-transaction-log-file.c -+++ src/lib-index/mail-transaction-log-file.c -@@ -1257,7 +1257,7 @@ int mail_transaction_log_file_get_highest_modseq_at( - - static int - get_modseq_next_offset_at(struct mail_transaction_log_file *file, -- uint64_t modseq, -+ uint64_t modseq, bool use_highest, - uoff_t *cur_offset, uint64_t *cur_modseq, - uoff_t *next_offset_r) - { -@@ -1279,7 +1279,7 @@ get_modseq_next_offset_at(struct mail_transaction_log_file *file, - } - - /* check sync_highest_modseq again in case sync_offset was updated */ -- if (modseq >= file->sync_highest_modseq) { -+ if (modseq >= file->sync_highest_modseq && use_highest) { - *next_offset_r = file->sync_offset; - return 0; - } -@@ -1332,16 +1332,30 @@ int mail_transaction_log_file_get_modseq_next_offset( - cur_modseq = cache->highest_modseq; - } - -- if ((ret = get_modseq_next_offset_at(file, modseq, &cur_offset, -+ if ((ret = get_modseq_next_offset_at(file, modseq, TRUE, &cur_offset, - &cur_modseq, next_offset_r)) <= 0) - return ret; - if (cur_offset == file->sync_offset) { - /* if we got to sync_offset, cur_modseq should be - sync_highest_modseq */ - mail_index_set_error(file->log->index, -- "%s: Transaction log changed unexpectedly, " -- "can't get modseq", file->filepath); -- return -1; -+ "%s: Transaction log modseq tracking is corrupted - fixing", -+ file->filepath); -+ /* retry getting the offset by reading from the beginning -+ of the file */ -+ cur_offset = file->hdr.hdr_size; -+ cur_modseq = file->hdr.initial_modseq; -+ ret = get_modseq_next_offset_at(file, modseq, FALSE, -+ &cur_offset, &cur_modseq, -+ next_offset_r); -+ if (ret < 0) -+ return -1; -+ i_assert(ret != 0); -+ /* get it fixed on the next sync */ -+ file->log->index->need_recreate = TRUE; -+ file->need_rotate = TRUE; -+ /* clear cache, since it's unreliable */ -+ memset(file->modseq_cache, 0, sizeof(file->modseq_cache)); - } - - /* @UNSAFE: cache the value */ -diff --git a/src/lib-index/mail-transaction-log-private.h b/src/lib-index/mail-transaction-log-private.h -index f56434b40..cba0b6b5b 100644 ---- src/lib-index/mail-transaction-log-private.h -+++ src/lib-index/mail-transaction-log-private.h -@@ -81,6 +81,7 @@ struct mail_transaction_log_file { - unsigned int locked:1; - unsigned int locked_sync_offset_updated:1; - unsigned int corrupted:1; -+ unsigned int need_rotate:1; - }; - - struct mail_transaction_log { -diff --git a/src/lib-index/mail-transaction-log.c b/src/lib-index/mail-transaction-log.c -index 1738e367f..16d301f34 100644 ---- src/lib-index/mail-transaction-log.c -+++ src/lib-index/mail-transaction-log.c -@@ -234,6 +234,9 @@ bool mail_transaction_log_want_rotate(struct mail_transaction_log *log) - { - struct mail_transaction_log_file *file = log->head; - -+ if (file->need_rotate) -+ return TRUE; -+ - if (file->hdr.major_version < MAIL_TRANSACTION_LOG_MAJOR_VERSION || - (file->hdr.major_version == MAIL_TRANSACTION_LOG_MAJOR_VERSION && - file->hdr.minor_version < MAIL_TRANSACTION_LOG_MINOR_VERSION)) { Property changes on: head/mail/dovecot/files/patch-UPSTREAM-indexing ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dovecot/pkg-plist =================================================================== --- head/mail/dovecot/pkg-plist (revision 448696) +++ head/mail/dovecot/pkg-plist (revision 448697) @@ -1,811 +1,812 @@ bin/doveadm bin/doveconf bin/dsync %%ETCDIR%%/example-config/conf.d/10-auth.conf %%ETCDIR%%/example-config/conf.d/10-director.conf %%ETCDIR%%/example-config/conf.d/10-logging.conf %%ETCDIR%%/example-config/conf.d/10-mail.conf %%ETCDIR%%/example-config/conf.d/10-master.conf %%ETCDIR%%/example-config/conf.d/10-ssl.conf %%ETCDIR%%/example-config/conf.d/15-lda.conf %%ETCDIR%%/example-config/conf.d/15-mailboxes.conf %%ETCDIR%%/example-config/conf.d/20-imap.conf %%ETCDIR%%/example-config/conf.d/20-lmtp.conf %%ETCDIR%%/example-config/conf.d/20-pop3.conf %%ETCDIR%%/example-config/conf.d/90-acl.conf %%ETCDIR%%/example-config/conf.d/90-plugin.conf %%ETCDIR%%/example-config/conf.d/90-quota.conf %%ETCDIR%%/example-config/conf.d/auth-checkpassword.conf.ext %%ETCDIR%%/example-config/conf.d/auth-deny.conf.ext %%ETCDIR%%/example-config/conf.d/auth-dict.conf.ext %%ETCDIR%%/example-config/conf.d/auth-ldap.conf.ext %%ETCDIR%%/example-config/conf.d/auth-master.conf.ext %%ETCDIR%%/example-config/conf.d/auth-passwdfile.conf.ext %%ETCDIR%%/example-config/conf.d/auth-sql.conf.ext %%ETCDIR%%/example-config/conf.d/auth-static.conf.ext %%ETCDIR%%/example-config/conf.d/auth-system.conf.ext %%ETCDIR%%/example-config/conf.d/auth-vpopmail.conf.ext %%ETCDIR%%/example-config/dovecot-dict-auth.conf.ext %%ETCDIR%%/example-config/dovecot-dict-sql.conf.ext %%ETCDIR%%/example-config/dovecot-ldap.conf.ext %%ETCDIR%%/example-config/dovecot-sql.conf.ext %%ETCDIR%%/example-config/dovecot.conf %%ETCDIR%%/README include/dovecot/abspath.h include/dovecot/access-lookup.h include/dovecot/acl-api-private.h include/dovecot/acl-api.h include/dovecot/acl-cache.h include/dovecot/acl-global-file.h include/dovecot/acl-lookup-dict.h include/dovecot/acl-plugin.h include/dovecot/acl-storage.h include/dovecot/anvil-client.h include/dovecot/aqueue.h include/dovecot/array-decl.h include/dovecot/array.h include/dovecot/askpass.h include/dovecot/auth-cache.h include/dovecot/auth-client-connection.h include/dovecot/auth-client-interface.h include/dovecot/auth-client-private.h include/dovecot/auth-client-request.h include/dovecot/auth-client.h include/dovecot/auth-common.h include/dovecot/auth-fields.h include/dovecot/auth-master-connection.h include/dovecot/auth-master.h include/dovecot/auth-penalty.h include/dovecot/auth-policy.h include/dovecot/auth-postfix-connection.h include/dovecot/auth-request-handler.h include/dovecot/auth-request-stats.h include/dovecot/auth-request-var-expand.h include/dovecot/auth-request.h include/dovecot/auth-server-connection.h include/dovecot/auth-settings.h include/dovecot/auth-stats.h include/dovecot/auth-token.h include/dovecot/auth-worker-client.h include/dovecot/auth-worker-server.h include/dovecot/auth.h include/dovecot/backtrace-string.h include/dovecot/base32.h include/dovecot/base64.h include/dovecot/bits.h include/dovecot/bsearch-insert-pos.h include/dovecot/buffer.h +include/dovecot/byteorder.h include/dovecot/charset-utf8.h include/dovecot/child-wait.h include/dovecot/client-common.h include/dovecot/compat.h include/dovecot/compression.h include/dovecot/config-filter.h include/dovecot/config-parser-private.h include/dovecot/config-parser.h include/dovecot/config-request.h include/dovecot/config.h include/dovecot/connection.h include/dovecot/crc32.h include/dovecot/cydir-storage.h include/dovecot/cydir-sync.h include/dovecot/data-stack.h include/dovecot/dcrypt-iostream.h include/dovecot/dcrypt-private.h include/dovecot/dcrypt.h include/dovecot/db-checkpassword.h include/dovecot/db-dict.h include/dovecot/db-ldap.h include/dovecot/db-oauth2.h include/dovecot/db-passwd-file.h include/dovecot/db-sql.h include/dovecot/dbox-attachment.h include/dovecot/dbox-file.h include/dovecot/dbox-mail.h include/dovecot/dbox-save.h include/dovecot/dbox-storage.h include/dovecot/dict-client.h include/dovecot/dict-private.h include/dovecot/dict-sql-settings.h include/dovecot/dict-sql.h include/dovecot/dict-transaction-memory.h include/dovecot/dict.h include/dovecot/dns-lookup.h include/dovecot/dns-util.h include/dovecot/doveadm-cmd.h include/dovecot/doveadm-dsync.h include/dovecot/doveadm-dump.h include/dovecot/doveadm-mail-iter.h include/dovecot/doveadm-mail.h include/dovecot/doveadm-mailbox-list-iter.h include/dovecot/doveadm-print-private.h include/dovecot/doveadm-print.h include/dovecot/doveadm-settings.h include/dovecot/doveadm-util.h include/dovecot/doveadm.h include/dovecot/dovecot-version.h include/dovecot/dsasl-client-private.h include/dovecot/dsasl-client.h include/dovecot/dsync-brain.h include/dovecot/dsync-ibc.h include/dovecot/duplicate.h include/dovecot/eacces-error.h include/dovecot/env-util.h include/dovecot/execv-const.h include/dovecot/fail-mail-storage.h include/dovecot/failures.h include/dovecot/fd-close-on-exec.h include/dovecot/fd-set-nonblock.h include/dovecot/fdatasync-path.h include/dovecot/fdpass.h include/dovecot/file-cache.h include/dovecot/file-copy.h include/dovecot/file-create-locked.h include/dovecot/file-dotlock.h include/dovecot/file-lock.h include/dovecot/file-set-size.h include/dovecot/fs-api-private.h include/dovecot/fs-api.h include/dovecot/fs-sis-common.h include/dovecot/fs-test.h include/dovecot/fs-wrapper.h include/dovecot/fsync-mode.h include/dovecot/fts-api-private.h include/dovecot/fts-api.h include/dovecot/fts-common.h include/dovecot/fts-expunge-log.h include/dovecot/fts-filter-common.h include/dovecot/fts-filter-private.h include/dovecot/fts-filter.h include/dovecot/fts-icu.h include/dovecot/fts-indexer.h include/dovecot/fts-language.h include/dovecot/fts-library.h include/dovecot/fts-parser.h include/dovecot/fts-storage.h include/dovecot/fts-tokenizer-common.h include/dovecot/fts-tokenizer-generic-private.h include/dovecot/fts-tokenizer-private.h include/dovecot/fts-tokenizer.h include/dovecot/fts-user.h include/dovecot/guid.h include/dovecot/hash-decl.h include/dovecot/hash-format.h include/dovecot/hash-method.h include/dovecot/hash.h include/dovecot/hash2.h include/dovecot/hex-binary.h include/dovecot/hex-dec.h include/dovecot/hmac-cram-md5.h include/dovecot/hmac.h include/dovecot/home-expand.h include/dovecot/hook-build.h include/dovecot/hostpid.h include/dovecot/http-auth.h include/dovecot/http-client-private.h include/dovecot/http-client.h include/dovecot/http-date.h include/dovecot/http-header-parser.h include/dovecot/http-header.h include/dovecot/http-message-parser.h include/dovecot/http-parser.h include/dovecot/http-request-parser.h include/dovecot/http-request.h include/dovecot/http-response-parser.h include/dovecot/http-response.h include/dovecot/http-server-private.h include/dovecot/http-server.h include/dovecot/http-transfer.h include/dovecot/http-url.h include/dovecot/imap-arg.h include/dovecot/imap-base-subject.h include/dovecot/imap-bodystructure.h include/dovecot/imap-client.h include/dovecot/imap-commands-util.h include/dovecot/imap-commands.h include/dovecot/imap-common.h include/dovecot/imap-date.h include/dovecot/imap-envelope.h include/dovecot/imap-expunge.h include/dovecot/imap-fetch.h include/dovecot/imap-id.h include/dovecot/imap-keepalive.h include/dovecot/imap-list.h include/dovecot/imap-login-client.h include/dovecot/imap-login-commands.h include/dovecot/imap-login-settings.h include/dovecot/imap-master-client.h include/dovecot/imap-match.h include/dovecot/imap-metadata.h include/dovecot/imap-msgpart-url.h include/dovecot/imap-msgpart.h include/dovecot/imap-notify.h include/dovecot/imap-parser.h include/dovecot/imap-quote.h include/dovecot/imap-resp-code.h include/dovecot/imap-search-args.h include/dovecot/imap-search.h include/dovecot/imap-seqset.h include/dovecot/imap-settings.h include/dovecot/imap-state.h include/dovecot/imap-status.h include/dovecot/imap-sync-private.h include/dovecot/imap-sync.h include/dovecot/imap-url.h include/dovecot/imap-urlauth-backend.h include/dovecot/imap-urlauth-connection.h include/dovecot/imap-urlauth-fetch.h include/dovecot/imap-urlauth-private.h include/dovecot/imap-urlauth.h include/dovecot/imap-utf7.h include/dovecot/imap-util.h include/dovecot/imapc-client-private.h include/dovecot/imapc-client.h include/dovecot/imapc-connection.h include/dovecot/imapc-list.h include/dovecot/imapc-mail.h include/dovecot/imapc-msgmap.h include/dovecot/imapc-search.h include/dovecot/imapc-settings.h include/dovecot/imapc-storage.h include/dovecot/imapc-sync.h include/dovecot/imem.h include/dovecot/index-attachment.h include/dovecot/index-mail.h include/dovecot/index-mailbox-size.h include/dovecot/index-pop3-uidl.h include/dovecot/index-rebuild.h include/dovecot/index-search-private.h include/dovecot/index-search-result.h include/dovecot/index-sort-private.h include/dovecot/index-sort.h include/dovecot/index-storage.h include/dovecot/index-sync-changes.h include/dovecot/index-sync-private.h include/dovecot/index-thread-private.h include/dovecot/ioloop-iolist.h include/dovecot/ioloop-notify-fd.h include/dovecot/ioloop-private.h include/dovecot/ioloop.h include/dovecot/iostream-lz4.h include/dovecot/iostream-openssl.h include/dovecot/iostream-private.h include/dovecot/iostream-rawlog-private.h include/dovecot/iostream-rawlog.h include/dovecot/iostream-ssl-private.h include/dovecot/iostream-ssl.h include/dovecot/iostream-temp.h include/dovecot/iostream.h include/dovecot/ipc-client.h include/dovecot/ipc-server.h include/dovecot/ipwd.h include/dovecot/iso8601-date.h include/dovecot/istream-attachment-connector.h include/dovecot/istream-attachment-extractor.h include/dovecot/istream-base64.h include/dovecot/istream-binary-converter.h include/dovecot/istream-callback.h include/dovecot/istream-chain.h include/dovecot/istream-concat.h include/dovecot/istream-crlf.h include/dovecot/istream-decrypt.h include/dovecot/istream-dot.h include/dovecot/istream-failure-at.h include/dovecot/istream-file-private.h include/dovecot/istream-fs-file.h include/dovecot/istream-fs-stats.h include/dovecot/istream-hash.h include/dovecot/istream-header-filter.h include/dovecot/istream-jsonstr.h include/dovecot/istream-mail.h include/dovecot/istream-metawrap.h include/dovecot/istream-nonuls.h include/dovecot/istream-private.h include/dovecot/istream-qp.h include/dovecot/istream-raw-mbox.h include/dovecot/istream-rawlog.h include/dovecot/istream-seekable.h include/dovecot/istream-sized.h include/dovecot/istream-tee.h include/dovecot/istream-timeout.h include/dovecot/istream-unix.h include/dovecot/istream-zlib.h include/dovecot/istream.h include/dovecot/json-parser.h include/dovecot/json-tree.h include/dovecot/lda-settings.h include/dovecot/lib-signals.h include/dovecot/lib.h include/dovecot/llist.h include/dovecot/lmtp-client.h include/dovecot/log-throttle.h include/dovecot/login-common.h include/dovecot/login-proxy-state.h include/dovecot/login-proxy.h include/dovecot/login-settings.h include/dovecot/macros.h include/dovecot/mail-autoexpunge.h include/dovecot/mail-cache-private.h include/dovecot/mail-cache.h include/dovecot/mail-copy.h include/dovecot/mail-deliver.h include/dovecot/mail-error.h include/dovecot/mail-html2text.h include/dovecot/mail-index-alloc-cache.h include/dovecot/mail-index-modseq.h include/dovecot/mail-index-private.h include/dovecot/mail-index-strmap.h include/dovecot/mail-index-sync-private.h include/dovecot/mail-index-transaction-private.h include/dovecot/mail-index-util.h include/dovecot/mail-index-view-private.h include/dovecot/mail-index.h include/dovecot/mail-namespace.h include/dovecot/mail-search-build.h include/dovecot/mail-search-mime-build.h include/dovecot/mail-search-mime-register.h include/dovecot/mail-search-mime.h include/dovecot/mail-search-parser-private.h include/dovecot/mail-search-parser.h include/dovecot/mail-search-register.h include/dovecot/mail-search.h include/dovecot/mail-send.h include/dovecot/mail-storage-hooks.h include/dovecot/mail-storage-private.h include/dovecot/mail-storage-service.h include/dovecot/mail-storage-settings.h include/dovecot/mail-storage.h include/dovecot/mail-thread.h include/dovecot/mail-transaction-log-private.h include/dovecot/mail-transaction-log-view-private.h include/dovecot/mail-transaction-log.h include/dovecot/mail-types.h include/dovecot/mail-user-hash.h include/dovecot/mail-user.h include/dovecot/mailbox-attribute-internal.h include/dovecot/mailbox-attribute-private.h include/dovecot/mailbox-attribute.h include/dovecot/mailbox-guid-cache.h include/dovecot/mailbox-list-delete.h include/dovecot/mailbox-list-fs.h include/dovecot/mailbox-list-index-storage.h include/dovecot/mailbox-list-index-sync.h include/dovecot/mailbox-list-index.h include/dovecot/mailbox-list-iter-private.h include/dovecot/mailbox-list-iter.h include/dovecot/mailbox-list-maildir.h include/dovecot/mailbox-list-notify-tree.h include/dovecot/mailbox-list-notify.h include/dovecot/mailbox-list-private.h include/dovecot/mailbox-list-subscriptions.h include/dovecot/mailbox-list.h include/dovecot/mailbox-log.h include/dovecot/mailbox-recent-flags.h include/dovecot/mailbox-search-result-private.h include/dovecot/mailbox-tree.h include/dovecot/mailbox-uidvalidity.h include/dovecot/mailbox-watch.h include/dovecot/maildir-filename-flags.h include/dovecot/maildir-filename.h include/dovecot/maildir-keywords.h include/dovecot/maildir-settings.h include/dovecot/maildir-storage.h include/dovecot/maildir-sync.h include/dovecot/maildir-uidlist.h include/dovecot/malloc-overflow.h include/dovecot/master-auth.h include/dovecot/master-instance.h include/dovecot/master-interface.h include/dovecot/master-login-auth.h include/dovecot/master-login.h include/dovecot/master-service-private.h include/dovecot/master-service-settings-cache.h include/dovecot/master-service-settings.h include/dovecot/master-service-ssl-settings.h include/dovecot/master-service-ssl.h include/dovecot/master-service.h include/dovecot/mbox-file.h include/dovecot/mbox-from.h include/dovecot/mbox-lock.h include/dovecot/mbox-md5.h include/dovecot/mbox-settings.h include/dovecot/mbox-storage.h include/dovecot/mbox-sync-private.h include/dovecot/md4.h include/dovecot/md5.h include/dovecot/mdbox-file.h include/dovecot/mdbox-map-private.h include/dovecot/mdbox-map.h include/dovecot/mdbox-settings.h include/dovecot/mdbox-storage-rebuild.h include/dovecot/mdbox-storage.h include/dovecot/mdbox-sync.h include/dovecot/mech-otp-skey-common.h include/dovecot/mech-plain-common.h include/dovecot/mech.h include/dovecot/mempool.h include/dovecot/message-address.h include/dovecot/message-binary-part.h include/dovecot/message-date.h include/dovecot/message-decoder.h include/dovecot/message-header-decode.h include/dovecot/message-header-encode.h include/dovecot/message-header-hash.h include/dovecot/message-header-parser.h include/dovecot/message-id.h include/dovecot/message-parser.h include/dovecot/message-part.h include/dovecot/message-part-data.h include/dovecot/message-part-serialize.h include/dovecot/message-search.h include/dovecot/message-size.h include/dovecot/message-snippet.h include/dovecot/mkdir-parents.h include/dovecot/mmap-util.h include/dovecot/module-context.h include/dovecot/module-dir.h include/dovecot/mountpoint-list.h include/dovecot/mountpoint.h include/dovecot/mycrypt.h include/dovecot/net.h include/dovecot/nfs-workarounds.h include/dovecot/notify-plugin-private.h include/dovecot/notify-plugin.h include/dovecot/numpack.h include/dovecot/oauth2.h include/dovecot/ostream-cmp.h include/dovecot/ostream-dot.h include/dovecot/ostream-encrypt.h include/dovecot/ostream-escaped.h include/dovecot/ostream-failure-at.h include/dovecot/ostream-file-private.h include/dovecot/ostream-hash.h include/dovecot/ostream-metawrap.h include/dovecot/ostream-null.h include/dovecot/ostream-private.h include/dovecot/ostream-rawlog.h include/dovecot/ostream-unix.h include/dovecot/ostream-zlib.h include/dovecot/ostream.h include/dovecot/passdb-blocking.h include/dovecot/passdb-cache.h include/dovecot/passdb-template.h include/dovecot/passdb.h include/dovecot/password-scheme.h include/dovecot/pkcs5.h include/dovecot/pop3-capability.h include/dovecot/pop3-client.h include/dovecot/pop3-commands.h include/dovecot/pop3-common.h include/dovecot/pop3-settings.h include/dovecot/pop3c-client.h include/dovecot/pop3c-settings.h include/dovecot/pop3c-storage.h include/dovecot/pop3c-sync.h include/dovecot/primes.h include/dovecot/printf-format-fix.h include/dovecot/priorityq.h include/dovecot/process-title.h include/dovecot/program-client.h include/dovecot/push-notification-drivers.h include/dovecot/push-notification-event-flagsclear.h include/dovecot/push-notification-event-flagsset.h include/dovecot/push-notification-event-mailboxcreate.h include/dovecot/push-notification-event-mailboxdelete.h include/dovecot/push-notification-event-mailboxrename.h include/dovecot/push-notification-event-mailboxsubscribe.h include/dovecot/push-notification-event-mailboxunsubscribe.h include/dovecot/push-notification-event-message-common.h include/dovecot/push-notification-event-messageappend.h include/dovecot/push-notification-event-messageexpunge.h include/dovecot/push-notification-event-messagenew.h include/dovecot/push-notification-event-messageread.h include/dovecot/push-notification-event-messagetrash.h include/dovecot/push-notification-events-rfc5423.h include/dovecot/push-notification-events.h include/dovecot/push-notification-plugin.h include/dovecot/push-notification-triggers.h include/dovecot/push-notification-txn-mbox.h include/dovecot/push-notification-txn-msg.h include/dovecot/qp-decoder.h include/dovecot/qp-encoder.h include/dovecot/quota-fs.h include/dovecot/quota-plugin.h include/dovecot/quota-private.h include/dovecot/quota.h include/dovecot/quoted-printable.h include/dovecot/rand.h include/dovecot/randgen.h include/dovecot/raw-storage.h include/dovecot/raw-sync.h include/dovecot/read-full.h include/dovecot/restrict-access.h include/dovecot/restrict-process-size.h include/dovecot/rfc2231-parser.h include/dovecot/rfc822-parser.h include/dovecot/safe-memset.h include/dovecot/safe-mkdir.h include/dovecot/safe-mkstemp.h include/dovecot/sasl-server.h include/dovecot/sdbox-file.h include/dovecot/sdbox-storage.h include/dovecot/sdbox-sync.h include/dovecot/sendfile-util.h include/dovecot/seq-range-array.h include/dovecot/service-settings.h include/dovecot/settings-parser.h include/dovecot/settings.h include/dovecot/sha-common.h include/dovecot/sha1.h include/dovecot/sha2.h include/dovecot/sha3.h include/dovecot/shared-storage.h include/dovecot/smtp-client.h include/dovecot/sort.h include/dovecot/sql-api-private.h include/dovecot/sql-api.h include/dovecot/sql-db-cache.h include/dovecot/ssl-proxy.h include/dovecot/stats-connection.h include/dovecot/stats-parser.h include/dovecot/stats.h include/dovecot/str-find.h include/dovecot/str-sanitize.h include/dovecot/str-table.h include/dovecot/str.h include/dovecot/strescape.h include/dovecot/strfuncs.h include/dovecot/strnum.h include/dovecot/subscription-file.h include/dovecot/syslog-util.h include/dovecot/test-common.h include/dovecot/time-util.h include/dovecot/timing.h include/dovecot/unichar.h include/dovecot/unix-socket-create.h include/dovecot/unlink-directory.h include/dovecot/unlink-old-files.h include/dovecot/uri-util.h include/dovecot/userdb-blocking.h include/dovecot/userdb-template.h include/dovecot/userdb-vpopmail.h include/dovecot/userdb.h include/dovecot/utc-mktime.h include/dovecot/utc-offset.h include/dovecot/var-expand-private.h include/dovecot/var-expand.h include/dovecot/wildcard-match.h include/dovecot/write-full.h lib/dovecot/auth/lib20_auth_var_expand_crypt.a lib/dovecot/auth/lib20_auth_var_expand_crypt.so lib/dovecot/auth/libauthdb_imap.a lib/dovecot/auth/libauthdb_imap.so lib/dovecot/doveadm/lib10_doveadm_acl_plugin.a lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so lib/dovecot/doveadm/lib10_doveadm_expire_plugin.a lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so lib/dovecot/doveadm/lib10_doveadm_quota_plugin.a lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so lib/dovecot/doveadm/lib20_doveadm_fts_plugin.a lib/dovecot/doveadm/lib20_doveadm_fts_plugin.so lib/dovecot/doveadm/libdoveadm_mail_crypt_plugin.a lib/dovecot/doveadm/libdoveadm_mail_crypt_plugin.so lib/dovecot/dovecot-config lib/dovecot/lib01_acl_plugin.a lib/dovecot/lib01_acl_plugin.so lib/dovecot/lib02_imap_acl_plugin.a lib/dovecot/lib02_imap_acl_plugin.so lib/dovecot/lib02_lazy_expunge_plugin.a lib/dovecot/lib02_lazy_expunge_plugin.so lib/dovecot/lib05_mail_crypt_acl_plugin.a lib/dovecot/lib05_mail_crypt_acl_plugin.so lib/dovecot/lib05_pop3_migration_plugin.a lib/dovecot/lib05_pop3_migration_plugin.so lib/dovecot/lib05_snarf_plugin.a lib/dovecot/lib05_snarf_plugin.so lib/dovecot/lib10_last_login_plugin.a lib/dovecot/lib10_last_login_plugin.so lib/dovecot/lib10_mail_crypt_plugin.a lib/dovecot/lib10_mail_crypt_plugin.so lib/dovecot/lib10_mail_filter_plugin.a lib/dovecot/lib10_mail_filter_plugin.so lib/dovecot/lib10_quota_plugin.a lib/dovecot/lib10_quota_plugin.so lib/dovecot/lib11_imap_quota_plugin.a lib/dovecot/lib11_imap_quota_plugin.so lib/dovecot/lib11_trash_plugin.a lib/dovecot/lib11_trash_plugin.so lib/dovecot/lib15_notify_plugin.a lib/dovecot/lib15_notify_plugin.so lib/dovecot/lib20_autocreate_plugin.a lib/dovecot/lib20_autocreate_plugin.so lib/dovecot/lib20_expire_plugin.a lib/dovecot/lib20_expire_plugin.so lib/dovecot/lib20_fts_plugin.a lib/dovecot/lib20_fts_plugin.so lib/dovecot/lib20_listescape_plugin.a lib/dovecot/lib20_listescape_plugin.so lib/dovecot/lib20_mail_log_plugin.a lib/dovecot/lib20_mail_log_plugin.so lib/dovecot/lib20_mailbox_alias_plugin.a lib/dovecot/lib20_mailbox_alias_plugin.so lib/dovecot/lib20_push_notification_plugin.a lib/dovecot/lib20_push_notification_plugin.so lib/dovecot/lib20_quota_clone_plugin.a lib/dovecot/lib20_quota_clone_plugin.so lib/dovecot/lib20_replication_plugin.a lib/dovecot/lib20_replication_plugin.so lib/dovecot/lib20_var_expand_crypt.a lib/dovecot/lib20_var_expand_crypt.so lib/dovecot/lib20_virtual_plugin.a lib/dovecot/lib20_virtual_plugin.so lib/dovecot/lib20_zlib_plugin.a lib/dovecot/lib20_zlib_plugin.so lib/dovecot/lib21_fts_squat_plugin.a lib/dovecot/lib21_fts_squat_plugin.so lib/dovecot/lib30_imap_zlib_plugin.a lib/dovecot/lib30_imap_zlib_plugin.so lib/dovecot/lib90_stats_plugin.a lib/dovecot/lib90_stats_plugin.so lib/dovecot/lib95_imap_stats_plugin.a lib/dovecot/lib95_imap_stats_plugin.so lib/dovecot/lib99_welcome_plugin.a lib/dovecot/lib99_welcome_plugin.so lib/dovecot/libdcrypt_openssl.a lib/dovecot/libdcrypt_openssl.so lib/dovecot/libdovecot-compression.a lib/dovecot/libdovecot-compression.so lib/dovecot/libdovecot-compression.so.0 lib/dovecot/libdovecot-compression.so.0.0.0 lib/dovecot/libdovecot-dsync.a lib/dovecot/libdovecot-dsync.so lib/dovecot/libdovecot-dsync.so.0 lib/dovecot/libdovecot-dsync.so.0.0.0 lib/dovecot/libdovecot-fts.a lib/dovecot/libdovecot-fts.so lib/dovecot/libdovecot-fts.so.0 lib/dovecot/libdovecot-fts.so.0.0.0 lib/dovecot/libdovecot-lda.a lib/dovecot/libdovecot-lda.so lib/dovecot/libdovecot-lda.so.0 lib/dovecot/libdovecot-lda.so.0.0.0 lib/dovecot/libdovecot-login.a lib/dovecot/libdovecot-login.so lib/dovecot/libdovecot-login.so.0 lib/dovecot/libdovecot-login.so.0.0.0 lib/dovecot/libdovecot-sql.a lib/dovecot/libdovecot-sql.so lib/dovecot/libdovecot-sql.so.0 lib/dovecot/libdovecot-sql.so.0.0.0 lib/dovecot/libdovecot-storage.a lib/dovecot/libdovecot-storage.so lib/dovecot/libdovecot-storage.so.0 lib/dovecot/libdovecot-storage.so.0.0.0 lib/dovecot/libdovecot.a lib/dovecot/libdovecot.so lib/dovecot/libdovecot.so.0 lib/dovecot/libdovecot.so.0.0.0 lib/dovecot/libfs_compress.a lib/dovecot/libfs_compress.so lib/dovecot/libfs_crypt.a lib/dovecot/libfs_crypt.so lib/dovecot/libfs_mail_crypt.a lib/dovecot/libfs_mail_crypt.so lib/dovecot/stats/libstats_auth.a lib/dovecot/stats/libstats_auth.so lib/dovecot/stats/libstats_mail.a lib/dovecot/stats/libstats_mail.so libexec/dovecot/aggregator libexec/dovecot/anvil libexec/dovecot/auth libexec/dovecot/checkpassword-reply libexec/dovecot/config libexec/dovecot/decode2text.sh libexec/dovecot/deliver libexec/dovecot/dict libexec/dovecot/director libexec/dovecot/dns-client libexec/dovecot/doveadm-server libexec/dovecot/dovecot-lda libexec/dovecot/gdbhelper libexec/dovecot/imap libexec/dovecot/imap-hibernate libexec/dovecot/imap-login libexec/dovecot/imap-urlauth libexec/dovecot/imap-urlauth-login libexec/dovecot/imap-urlauth-worker libexec/dovecot/indexer libexec/dovecot/indexer-worker libexec/dovecot/ipc libexec/dovecot/lmtp libexec/dovecot/log libexec/dovecot/maildirlock libexec/dovecot/pop3 libexec/dovecot/pop3-login libexec/dovecot/quota-status libexec/dovecot/rawlog libexec/dovecot/replicator libexec/dovecot/script libexec/dovecot/script-login libexec/dovecot/ssl-params libexec/dovecot/stats libexec/dovecot/xml2text man/man1/deliver.1.gz man/man1/doveadm-acl.1.gz man/man1/doveadm-altmove.1.gz man/man1/doveadm-auth.1.gz man/man1/doveadm-backup.1.gz man/man1/doveadm-batch.1.gz man/man1/doveadm-config.1.gz man/man1/doveadm-copy.1.gz man/man1/doveadm-deduplicate.1.gz man/man1/doveadm-director.1.gz man/man1/doveadm-dump.1.gz man/man1/doveadm-exec.1.gz man/man1/doveadm-expunge.1.gz man/man1/doveadm-fetch.1.gz man/man1/doveadm-flags.1.gz man/man1/doveadm-force-resync.1.gz man/man1/doveadm-fs.1.gz man/man1/doveadm-fts.1.gz man/man1/doveadm-help.1.gz man/man1/doveadm-import.1.gz man/man1/doveadm-index.1.gz man/man1/doveadm-instance.1.gz man/man1/doveadm-kick.1.gz man/man1/doveadm-log.1.gz man/man1/doveadm-mailbox-cryptokey.1.gz man/man1/doveadm-mailbox.1.gz man/man1/doveadm-mount.1.gz man/man1/doveadm-move.1.gz man/man1/doveadm-penalty.1.gz man/man1/doveadm-proxy.1.gz man/man1/doveadm-purge.1.gz man/man1/doveadm-pw.1.gz man/man1/doveadm-quota.1.gz man/man1/doveadm-reload.1.gz man/man1/doveadm-replicator.1.gz man/man1/doveadm-search.1.gz man/man1/doveadm-stats.1.gz man/man1/doveadm-stop.1.gz man/man1/doveadm-sync.1.gz man/man1/doveadm-user.1.gz man/man1/doveadm-who.1.gz man/man1/doveadm.1.gz man/man1/doveconf.1.gz man/man1/dovecot-lda.1.gz man/man1/dovecot.1.gz man/man1/dsync.1.gz man/man7/doveadm-search-query.7.gz sbin/dovecot share/aclocal/dovecot.m4 %%DATADIR%%/stopwords/stopwords_da.txt %%DATADIR%%/stopwords/stopwords_de.txt %%DATADIR%%/stopwords/stopwords_en.txt %%DATADIR%%/stopwords/stopwords_es.txt %%DATADIR%%/stopwords/stopwords_fi.txt %%DATADIR%%/stopwords/stopwords_fr.txt %%DATADIR%%/stopwords/stopwords_it.txt %%DATADIR%%/stopwords/stopwords_nl.txt %%DATADIR%%/stopwords/stopwords_no.txt %%DATADIR%%/stopwords/stopwords_pt.txt %%DATADIR%%/stopwords/stopwords_ro.txt %%DATADIR%%/stopwords/stopwords_ru.txt %%DATADIR%%/stopwords/stopwords_sv.txt %%LIBWRAP%%libexec/dovecot/tcpwrap %%LDAP%%include/dovecot/ldap-client.h %%LDAP%%lib/dovecot/dict/libdict_ldap.a %%LDAP%%lib/dovecot/dict/libdict_ldap.so %%LDAP%%lib/dovecot/libdovecot-ldap.a %%LDAP%%lib/dovecot/libdovecot-ldap.so %%LDAP%%lib/dovecot/libdovecot-ldap.so.0 %%LDAP%%lib/dovecot/libdovecot-ldap.so.0.0.0 %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so %%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.a %%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.so %%SOLR%%lib/dovecot/lib21_fts_solr_plugin.a %%SOLR%%lib/dovecot/lib21_fts_solr_plugin.so lib/dovecot/libssl_iostream_openssl.a lib/dovecot/libssl_iostream_openssl.so @postunexec echo "If you are removing dovecot2 permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data." Index: head/mail/dovecot-pigeonhole/Makefile =================================================================== --- head/mail/dovecot-pigeonhole/Makefile (revision 448696) +++ head/mail/dovecot-pigeonhole/Makefile (revision 448697) @@ -1,66 +1,66 @@ # Created by: Nils Vogels # $FreeBSD$ PORTNAME= dovecot-pigeonhole PORTVERSION= 0.4.19 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} MAINTAINER= ler@FreeBSD.org COMMENT= Sieve plugin for the Dovecot 'deliver' LDA and LMTP LICENSE= LGPL21 BUILD_DEPENDS= dovecot>=2.2.31:mail/dovecot RUN_DEPENDS= dovecot>=2.2.31:mail/dovecot DOVECOTVERSION= 2.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ --without-dovecot-install-dirs \ --docdir=${DOCSDIR} \ --with-dovecot="${LOCALBASE}/lib/dovecot" LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip USES= compiler:c11 libtool ssl USE_LDCONFIG= ${PREFIX}/lib/dovecot OPTIONS_DEFINE= DOCS LDAP MANAGESIEVE OPTIONS_DEFAULT=MANAGESIEVE GSSAPI_NONE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_SUB= yes GSSAPI_DESC= GSSAPI Support (*MUST MATCH* mail/dovecot) GSSAPI_NONE_DESC= Build without GSSAPI support GSSAPI_BASE_DESC= Use GSSAPI from base GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_OFF= ${GSSAPI_CONFIGURE_ARGS} BUILD_FAIL_MESSAGE= Ensure that ${PORTNAME}'s GSSAPI backend is the same as dovecot2 (make config). MANAGESIEVE_DESC= ManageSieve support MANAGESIEVE_CONFIGURE_WITH= managesieve LDAP_CONFIGURE_WITH= ldap LDAP_CPPFLAGS= -I${LOCALBASE}/include LDAP_LDFLAGS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes PORTDOCS= sieve/extensions/* sieve/plugins/* sieve/locations/* post-patch: @${REINPLACE_CMD} -E '\ s!^(install-data-am:) install-sieve_docDATA!\1!; \ s!^(uninstall-am:) uninstall-sieve_docDATA!\1!;' \ ${WRKSRC}/doc/Makefile.in .include