Index: head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c =================================================================== --- head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c (revision 444435) +++ head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c (nonexistent) @@ -1,42 +0,0 @@ -From 3e1a17a286ab0e084577fc267a442cb12aed1cbc Mon Sep 17 00:00:00 2001 -From: Stephan Bosch -Date: Fri, 28 Apr 2017 00:02:39 +0200 -Subject: [PATCH] lib-sieve: Fixed bug in handling of deferred implicit keep - with implicit side-effects. - -Upon continuing the deferred implicit keep, the implicit side-effects (such as imap flags) were not applied. ---- - src/lib-sieve/sieve-result.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c -index 3c896f2..fc75063 100644 ---- src/lib-sieve/sieve-result.c -+++ src/lib-sieve/sieve-result.c -@@ -969,7 +969,14 @@ static int _sieve_result_implicit_keep - - rac = rac->next; - } -+ } else if ( !rollback ) { -+ act_keep.location = kac->action.location; -+ act_keep.mail = kac->action.mail; -+ if ( kac->seffects != NULL ) -+ rsef_first = kac->seffects->first_effect; -+ } - -+ if (rsef_first == NULL) { - /* Apply any implicit side effects if applicable */ - if ( !rollback && hash_table_is_created(result->action_contexts) ) { - struct sieve_result_action_context *actctx; -@@ -980,11 +987,6 @@ static int _sieve_result_implicit_keep - if ( actctx != NULL && actctx->seffects != NULL ) - rsef_first = actctx->seffects->first_effect; - } -- } else if ( !rollback ) { -- act_keep.location = kac->action.location; -- act_keep.mail = kac->action.mail; -- if ( kac->seffects != NULL ) -- rsef_first = kac->seffects->first_effect; - } - - /* Start keep action */ Property changes on: head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c ___________________________________________________________________ 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/dovecot2-pigeonhole/Makefile =================================================================== --- head/mail/dovecot2-pigeonhole/Makefile (revision 444435) +++ head/mail/dovecot2-pigeonhole/Makefile (revision 444436) @@ -1,66 +1,65 @@ # Created by: Nils Vogels # $FreeBSD$ PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.4.18 -PORTREVISION= 5 +PORTVERSION= 0.4.19 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= dovecot2>=2.2.26.0:mail/dovecot2 -RUN_DEPENDS= dovecot2>=2.2.26.0:mail/dovecot2 +BUILD_DEPENDS= dovecot2>=2.2.31:mail/dovecot2 +RUN_DEPENDS= dovecot2>=2.2.31:mail/dovecot2 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/dovecot2) 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 Index: head/mail/dovecot2-pigeonhole/distinfo =================================================================== --- head/mail/dovecot2-pigeonhole/distinfo (revision 444435) +++ head/mail/dovecot2-pigeonhole/distinfo (revision 444436) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491958585 -SHA256 (dovecot-2.2-pigeonhole-0.4.18.tar.gz) = dd871bb57fad22795460f613f3c9484a8bf229272ac00956d837a34444f1c3a9 -SIZE (dovecot-2.2-pigeonhole-0.4.18.tar.gz) = 1742357 +TIMESTAMP = 1498520165 +SHA256 (dovecot-2.2-pigeonhole-0.4.19.tar.gz) = 629204bfbdcd3480e1ebcdc246da438323c3ea5fea57480ab859e8b201ad8793 +SIZE (dovecot-2.2-pigeonhole-0.4.19.tar.gz) = 1743025