diff options
Diffstat (limited to 'mail/dovecot2-pigeonhole')
| -rw-r--r-- | mail/dovecot2-pigeonhole/Makefile | 2 | ||||
| -rw-r--r-- | mail/dovecot2-pigeonhole/distinfo | 6 | ||||
| -rw-r--r-- | mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c | 42 |
3 files changed, 46 insertions, 4 deletions
diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile index 2f80b35..93c27c3 100644 --- a/mail/dovecot2-pigeonhole/Makefile +++ b/mail/dovecot2-pigeonhole/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.4.17 +PORTVERSION= 0.4.18 PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ diff --git a/mail/dovecot2-pigeonhole/distinfo b/mail/dovecot2-pigeonhole/distinfo index 6042c9b..63bfb81 100644 --- a/mail/dovecot2-pigeonhole/distinfo +++ b/mail/dovecot2-pigeonhole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488163544 -SHA256 (dovecot-2.2-pigeonhole-0.4.17.tar.gz) = 74d869c7532cbf4fe41e3cc95a1aa6ce32e98f4d423f0d099da1e0fba022dae3 -SIZE (dovecot-2.2-pigeonhole-0.4.17.tar.gz) = 1787177 +TIMESTAMP = 1491958585 +SHA256 (dovecot-2.2-pigeonhole-0.4.18.tar.gz) = dd871bb57fad22795460f613f3c9484a8bf229272ac00956d837a34444f1c3a9 +SIZE (dovecot-2.2-pigeonhole-0.4.18.tar.gz) = 1742357 diff --git a/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c b/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c new file mode 100644 index 0000000..e1ebc85 --- /dev/null +++ b/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c @@ -0,0 +1,42 @@ +From 3e1a17a286ab0e084577fc267a442cb12aed1cbc Mon Sep 17 00:00:00 2001 +From: Stephan Bosch <stephan.bosch@dovecot.fi> +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 */ |
