svn commit: r425665 - in head/mail/dovecot2-pigeonhole: . files

[Adam Weinberger]

Author: adamw
Date: Tue Nov  8 02:53:22 2016
New Revision: 425665
URL: https://svnweb.freebsd.org/changeset/ports/425665

Log:
  pick up github commit:
  https://github.com/dovecot/pigeonhole/commit/00651e607c6ea9145ec565dcfd2fdf7d04bb32e9
  
  imapsieve plugin: Fixed assert failure occurring when used with virtual
  mailboxes.
  
  In that case a transaction (delayed sync) is perfromed outside of the
  context of an IMAP command.
  
  PR:		214302
  Submitted by:	maintainer (Larry Rosenman)

Added:
  head/mail/dovecot2-pigeonhole/files/
  head/mail/dovecot2-pigeonhole/files/patch-src_plugins_imapsieve_imap-sieve-storage.c   (contents, props changed)
Modified:
  head/mail/dovecot2-pigeonhole/Makefile

Modified: head/mail/dovecot2-pigeonhole/Makefile
==============================================================================
--- head/mail/dovecot2-pigeonhole/Makefile	Tue Nov  8 02:48:00 2016	(r425664)
+++ head/mail/dovecot2-pigeonhole/Makefile	Tue Nov  8 02:53:22 2016	(r425665)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.4.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}

Added: head/mail/dovecot2-pigeonhole/files/patch-src_plugins_imapsieve_imap-sieve-storage.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/dovecot2-pigeonhole/files/patch-src_plugins_imapsieve_imap-sieve-storage.c	Tue Nov  8 02:53:22 2016	(r425665)
@@ -0,0 +1,12 @@
+--- src/plugins/imapsieve/imap-sieve-storage.c.orig	2016-11-08 02:19:04 UTC
++++ src/plugins/imapsieve/imap-sieve-storage.c
+@@ -531,7 +531,8 @@ imap_sieve_mailbox_transaction_begin(str
+ 	/* commence parent transaction */
+ 	t = lbox->super.transaction_begin(box, flags);
+ 
+-	if (isuser == NULL || isuser->sieve_active)
++	if (isuser == NULL || isuser->sieve_active ||
++		isuser->cur_cmd == IMAP_SIEVE_CMD_NONE)
+ 		return t;
+ 
+ 	i_assert(isuser->client != NULL);