From owner-svn-ports-all@freebsd.org Fri Apr 28 18:12:07 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE22DD5331E; Fri, 28 Apr 2017 18:12:07 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C103A1C; Fri, 28 Apr 2017 18:12:07 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3SIC65J084530; Fri, 28 Apr 2017 18:12:06 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3SIC6kI084528; Fri, 28 Apr 2017 18:12:06 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201704281812.v3SIC6kI084528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Fri, 28 Apr 2017 18:12:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439618 - in head/mail/dovecot2-pigeonhole: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Apr 2017 18:12:07 -0000 Author: ler Date: Fri Apr 28 18:12:06 2017 New Revision: 439618 URL: https://svnweb.freebsd.org/changeset/ports/439618 Log: Upon continuing the deferred implicit keep, the implicit side-effects (such as imap flags) were not applied. Obtained from: https://github.com/dovecot/pigeonhole/commit/3e1a17a286ab0e084577fc267a442cb12aed1cbc Approved by: adamw (mentor, implicit) Added: head/mail/dovecot2-pigeonhole/files/ head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c (contents, props changed) Modified: head/mail/dovecot2-pigeonhole/Makefile Modified: head/mail/dovecot2-pigeonhole/Makefile ============================================================================== --- head/mail/dovecot2-pigeonhole/Makefile Fri Apr 28 17:17:42 2017 (r439617) +++ head/mail/dovecot2-pigeonhole/Makefile Fri Apr 28 18:12:06 2017 (r439618) @@ -3,6 +3,7 @@ PORTNAME= dovecot-pigeonhole PORTVERSION= 0.4.18 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} Added: head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c Fri Apr 28 18:12:06 2017 (r439618) @@ -0,0 +1,42 @@ +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 */