Index: head/mail/dovecot2/Makefile =================================================================== --- head/mail/dovecot2/Makefile (revision 435187) +++ head/mail/dovecot2/Makefile (revision 435188) @@ -1,162 +1,163 @@ # Created by: Nagy, Attila # $FreeBSD$ ###################################################################### # Anytime PORTVERSION changes please bump PORTREVISION of # # mail/dovecot2-pigeonhole and also mail/dovecot2-antispam-plugin. # # Please see ports/135311 and ports/146029 for an explanation. # # # # Please be careful when updating this port as changes to this port # # can break mail/dovecot2-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.28 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= https://www.dovecot.org/releases/${PORTVERSION:R}/ PKGNAMESUFFIX= 2 MAINTAINER= adamw@FreeBSD.org COMMENT= Secure, fast and powerful IMAP and POP3 server LICENSE= LGPL21 MIT LICENSE_COMB= dual CONFLICTS= dovecot-1.[0-9]* 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_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/dovecot2/files/patch-trash_plugin =================================================================== --- head/mail/dovecot2/files/patch-trash_plugin (nonexistent) +++ head/mail/dovecot2/files/patch-trash_plugin (revision 435188) @@ -0,0 +1,48 @@ +From 326fb016a23480e4ff8dcc03dc80e76812859bd6 Mon Sep 17 00:00:00 2001 +From: Aki Tuomi +Date: Wed, 1 Mar 2017 09:15:29 +0200 +Subject: [PATCH] trash: Read settings after namespaces are loaded + +Fixes Panic: file mail-namespace.c: line 709 (mail_namespace_find): assertion failed: (ns != NULL) +--- + src/plugins/trash/trash-plugin.c | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +diff --git a/src/plugins/trash/trash-plugin.c b/src/plugins/trash/trash-plugin.c +index 7129d3d..2e12578 100644 +--- src/plugins/trash/trash-plugin.c ++++ src/plugins/trash/trash-plugin.c +@@ -348,17 +348,27 @@ trash_mail_user_created(struct mail_user *user) + } else { + tuser = p_new(user->pool, struct trash_user, 1); + MODULE_CONTEXT_SET(user, trash_user_module, tuser); ++ } ++} + +- if (read_configuration(user, env) == 0) { +- trash_next_quota_test_alloc = +- quser->quota->set->test_alloc; +- quser->quota->set->test_alloc = trash_quota_test_alloc; +- } ++static void ++trash_mail_namespaces_created(struct mail_namespace *namespaces) ++{ ++ struct mail_user *user = namespaces->user; ++ struct trash_user *tuser = TRASH_USER_CONTEXT(user); ++ struct quota_user *quser = QUOTA_USER_CONTEXT(user); ++ const char *env = mail_user_plugin_getenv(user, "trash"); ++ ++ if (tuser != NULL && read_configuration(user, env) == 0) { ++ trash_next_quota_test_alloc = ++ quser->quota->set->test_alloc; ++ quser->quota->set->test_alloc = trash_quota_test_alloc; + } + } + + static struct mail_storage_hooks trash_mail_storage_hooks = { +- .mail_user_created = trash_mail_user_created ++ .mail_user_created = trash_mail_user_created, ++ .mail_namespaces_created = trash_mail_namespaces_created, + }; + + void trash_plugin_init(struct module *module) Property changes on: head/mail/dovecot2/files/patch-trash_plugin ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property