Date: Sun, 15 Jan 2017 02:48:19 +0000 (UTC) From: Larry Rosenman <ler@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431511 - in branches/2017Q1: archivers/zip astro/xearth devel/t1lib mail/dovecot2-pigeonhole mail/dovecot2-pigeonhole/files net-mgmt/iog sysutils/lsof textproc/pecl-xdiff www/joomla3 x... Message-ID: <201701150248.v0F2mJd8004752@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ler Date: Sun Jan 15 02:48:19 2017 New Revision: 431511 URL: https://svnweb.freebsd.org/changeset/ports/431511 Log: MFH: r431147 r431488 Update MAINTAINER on my ports (and created by line) to my @FreeBSD.org email Differential Revision: https://reviews.freebsd.org/D9125 mail/dovecot2-pigeonhole: lib-sieve: Fixed handling of an early explicit keep during multiscript execution. Applies to LDA/LMTP context in general, not only when sieve_before/sieve_after are used. Action side-effects and the message snapshot would be lost at the final stage where the implicit keep is evaluated. This happened because the keep action itself is not actually executed, but rather its presence is noted to determine whether more scripts need to be executed. So, when finally execution of the actual keep action is due, i.e. when there are no more scripts in the sequence, it overrides the explicit keep from the last script. This didn't take the side-effects and message snapshot into account. Obtained from: https://github.com/dovecot/pigeonhole/commit/772485538302957ebada484b6eedec57136bc737 Differential Revision: https://reviews.freebsd.org/D9177 Merging r431147 to pick up the maintainer change as well. Approved by: ports-secteam (junovitch), adamw (mentor) Added: branches/2017Q1/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c - copied unchanged from r431488, head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c Modified: branches/2017Q1/archivers/zip/Makefile branches/2017Q1/astro/xearth/Makefile branches/2017Q1/devel/t1lib/Makefile branches/2017Q1/mail/dovecot2-pigeonhole/Makefile branches/2017Q1/net-mgmt/iog/Makefile branches/2017Q1/sysutils/lsof/Makefile branches/2017Q1/textproc/pecl-xdiff/Makefile branches/2017Q1/www/joomla3/Makefile branches/2017Q1/x11/xdialog/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/archivers/zip/Makefile ============================================================================== --- branches/2017Q1/archivers/zip/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/archivers/zip/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -8,7 +8,7 @@ CATEGORIES= archivers MASTER_SITES= SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Create/update ZIP files compatible with PKZIP # License is BSD-based, but not identical, so install with documentation Modified: branches/2017Q1/astro/xearth/Makefile ============================================================================== --- branches/2017Q1/astro/xearth/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/astro/xearth/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -6,7 +6,7 @@ PORTVERSION= 1.2 CATEGORIES= astro geography MASTER_SITES= LOCAL/madpilot/xearth -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Set the root window to the image of earth USE_XORG= x11 xext sm ice xt Modified: branches/2017Q1/devel/t1lib/Makefile ============================================================================== --- branches/2017Q1/devel/t1lib/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/devel/t1lib/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -8,7 +8,7 @@ PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= SUNSITE/libs/graphics/ -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Type 1 font rasterization library for Unix/X11 LICENSE= LGPL20 Modified: branches/2017Q1/mail/dovecot2-pigeonhole/Makefile ============================================================================== --- branches/2017Q1/mail/dovecot2-pigeonhole/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/mail/dovecot2-pigeonhole/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -3,12 +3,12 @@ PORTNAME= dovecot-pigeonhole PORTVERSION= 0.4.16 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Sieve plugin for the Dovecot 'deliver' LDA and LMTP LICENSE= LGPL21 Copied: branches/2017Q1/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c (from r431488, head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c Sun Jan 15 02:48:19 2017 (r431511, copy of r431488, head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c) @@ -0,0 +1,87 @@ +--- src/lib-sieve/sieve-result.c.orig 2016-10-20 22:48:08 UTC ++++ src/lib-sieve/sieve-result.c +@@ -928,7 +928,7 @@ static int _sieve_result_implicit_keep + (struct sieve_result *result, bool rollback) + { + const struct sieve_action_exec_env *aenv = &result->action_env; +- struct sieve_result_action *rac; ++ struct sieve_result_action *rac, *kac; + int status = SIEVE_EXEC_OK; + struct sieve_result_side_effect *rsef, *rsef_first = NULL; + void *tr_context = NULL; +@@ -937,38 +937,54 @@ static int _sieve_result_implicit_keep + if ( (aenv->flags & SIEVE_EXECUTE_FLAG_DEFER_KEEP) != 0 ) + return SIEVE_EXEC_OK; + +- if ( rollback ) { ++ if ( rollback ) + act_keep = result->failure_action; +- act_keep.mail = NULL; +- } else { ++ else + act_keep = result->keep_action; +- act_keep.mail = sieve_message_get_mail(aenv->msgctx); +- } ++ act_keep.mail = NULL; + + /* If keep is a non-action, return right away */ + if ( act_keep.def == NULL ) + return SIEVE_EXEC_OK; + +- /* Scan for execution of keep-equal actions */ +- rac = result->first_action; +- while ( rac != NULL ) { +- if ( rac->action.def == act_keep.def && act_keep.def->equals != NULL && +- act_keep.def->equals(aenv->scriptenv, NULL, &rac->action) && +- rac->action.executed ) +- return SIEVE_EXEC_OK; +- +- rac = rac->next; ++ /* Scan for deferred keep */ ++ kac = result->last_action; ++ while ( kac != NULL && kac->action.executed ) { ++ if ( kac->keep && kac->action.def == NULL ) ++ break; ++ kac = kac->prev; + } + +- /* Apply any implicit side effects if applicable */ +- if ( !rollback && hash_table_is_created(result->action_contexts) ) { +- struct sieve_result_action_context *actctx; ++ if (kac == NULL) { ++ if ( !rollback ) ++ act_keep.mail = sieve_message_get_mail(aenv->msgctx); + +- /* Check for implicit side effects to keep action */ +- actctx = hash_table_lookup(result->action_contexts, act_keep.def); ++ /* Scan for execution of keep-equal actions */ ++ rac = result->first_action; ++ while ( rac != NULL ) { ++ if ( rac->action.def == act_keep.def && act_keep.def->equals != NULL && ++ act_keep.def->equals(aenv->scriptenv, NULL, &rac->action) && ++ rac->action.executed ) ++ return SIEVE_EXEC_OK; + +- if ( actctx != NULL && actctx->seffects != NULL ) +- rsef_first = actctx->seffects->first_effect; ++ rac = rac->next; ++ } ++ ++ /* Apply any implicit side effects if applicable */ ++ if ( !rollback && hash_table_is_created(result->action_contexts) ) { ++ struct sieve_result_action_context *actctx; ++ ++ /* Check for implicit side effects to keep action */ ++ actctx = hash_table_lookup(result->action_contexts, act_keep.def); ++ ++ 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 */ Modified: branches/2017Q1/net-mgmt/iog/Makefile ============================================================================== --- branches/2017Q1/net-mgmt/iog/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/net-mgmt/iog/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -1,4 +1,4 @@ -# Created by: Larry Rosenman <ler@lerctr.org> +# Created by: Larry Rosenman <ler@FreeBSD.org> # $FreeBSD$ PORTNAME= iog Modified: branches/2017Q1/sysutils/lsof/Makefile ============================================================================== --- branches/2017Q1/sysutils/lsof/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/sysutils/lsof/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -22,7 +22,7 @@ MASTER_SITES= http://ftp.cerias.purdue.e ftp://ftp.tau.ac.il/pub/unix/admin/ DISTNAME= ${PORTNAME}_${DISTVERSION}${DISTNAME_SUFFIX} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Lists information about open files (similar to fstat(1)) LICENSE=lsof Modified: branches/2017Q1/textproc/pecl-xdiff/Makefile ============================================================================== --- branches/2017Q1/textproc/pecl-xdiff/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/textproc/pecl-xdiff/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -1,4 +1,4 @@ -# Created by: Larry Rosenman <ler@lerctr.org> +# Created by: Larry Rosenman <ler@FreeBSD.org> # $FreeBSD$ PORTNAME= xdiff Modified: branches/2017Q1/www/joomla3/Makefile ============================================================================== --- branches/2017Q1/www/joomla3/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/www/joomla3/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -6,7 +6,7 @@ PORTVERSION= 3.6.5 CATEGORIES= www PKGNAMESUFFIX= 3 -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Dynamic web content management system (CMS) LICENSE= GPLv2 Modified: branches/2017Q1/x11/xdialog/Makefile ============================================================================== --- branches/2017Q1/x11/xdialog/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/x11/xdialog/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -8,7 +8,7 @@ CATEGORIES= x11 MASTER_SITES= http://xdialog.free.fr/ DISTNAME= ${PORTNAME:S/x/X/}-${PORTVERSION} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Drop in replacement for the "dialog" or "cdialog" programs LICENSE= GPLv2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701150248.v0F2mJd8004752>