svn commit: r399529 - in head/mail/cyrus-imapd24: . files

[Hajimu UMEMOTO]

Author: ume
Date: Sat Oct 17 07:33:11 2015
New Revision: 399529
URL: https://svnweb.freebsd.org/changeset/ports/399529

Log:
  re-enable autosieve option.
  
  PR:		162185
  Submitted by:	enzi.sergio

Added:
  head/mail/cyrus-imapd24/files/extra-patch-imap__lmtp_sieve.c   (contents, props changed)
Modified:
  head/mail/cyrus-imapd24/Makefile

Modified: head/mail/cyrus-imapd24/Makefile
==============================================================================
--- head/mail/cyrus-imapd24/Makefile	Sat Oct 17 05:33:48 2015	(r399528)
+++ head/mail/cyrus-imapd24/Makefile	Sat Oct 17 07:33:11 2015	(r399529)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.4.18
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
@@ -111,7 +111,7 @@ AUTOCREATE_PATCHFILES=	${PORTNAME}-2.4.4
 AUTOSIEVE_VERSION=	0.6.0
 AUTOSIEVE_PATCH_SITES=	LOCAL/mm:autosieve
 AUTOSIEVE_PATCHFILES=	${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch:-p1:autosieve
-AUTOSIEVE_BROKEN=	Not buildable with autosieve patch
+AUTOSIEVE_EXTRA_PATCHES=${FILESDIR}/extra-patch-imap__lmtp_sieve.c
 
 DRAC_EXTRA_PATCHES=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
 DRAC_USE=	AUTOTOOLS=autoconf,autoheader

Added: head/mail/cyrus-imapd24/files/extra-patch-imap__lmtp_sieve.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/cyrus-imapd24/files/extra-patch-imap__lmtp_sieve.c	Sat Oct 17 07:33:11 2015	(r399529)
@@ -0,0 +1,11 @@
+--- imap/lmtp_sieve.c.orig	2015-10-17 06:54:40 UTC
++++ imap/lmtp_sieve.c
+@@ -511,7 +511,7 @@ static int sieve_fileinto(void *ac, 
+ 	/* Try to deliver the mail again. */
+         if (!ret)
+             ret = deliver_mailbox(md->f, mdata->content, mdata->stage, md->size,
+-                                  fc->imapflags->flag, fc->imapflags->nflags,
++                                  fc->imapflags,
+                                   (char *) sd->username, sd->authstate, md->id,
+                                   sd->username, mdata->notifyheader,
+                                   namebuf, md->date, quotaoverride, 0);