Update to 2.3.15.

Security:	Potential buffer overflow in Sieve

10 files changed, 50 insertions, 168 deletions

diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index b7bffa68b6d7..b4d4143c6e19 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.3.14
-PORTREVISION=	2
+PORTVERSION=	2.3.15
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
 		http://ftp.andrew.cmu.edu/pub/cyrus/ \
@@ -165,12 +165,13 @@ MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
 CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
-		cyr_dbtool.8 cyr_expire.8 cyr_synclog.8 ctl_mboxlist.8 \
-		cvt_cyrusdb.8 deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 \
-		ipurge.8 lmtpd.8 make_md5.8 make_sha1.8 master.8 mbexamine.8 \
-		mbpath.8 notifyd.8 pop3d.8 quota.8 reconstruct.8 rmnews.8 \
-		smmapd.8 squatter.8 sync_client.8 sync_reset.8 sync_server.8 \
-		syncnews.8 timsieved.8 tls_prune.8 unexpunge.8
+		cyr_dbtool.8 cyr_df.8 cyr_expire.8 cyr_synclog.8 \
+		ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 fetchnews.8 fud.8 \
+		idled.8 imapd.8 ipurge.8 lmtpd.8 make_md5.8 make_sha1.8 \
+		master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
+		reconstruct.8 rmnews.8 smmapd.8 squatter.8 sync_client.8 \
+		sync_reset.8 sync_server.8 syncnews.8 timsieved.8 \
+		tls_prune.8 unexpunge.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
index 913515c89697..d47402700d27 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.3.14.tar.gz) = 1030d4d9d04036b2fb9830165723908e
-SHA256 (cyrus-imapd-2.3.14.tar.gz) = fd840403c1f25adda8f003ea59169e2c87210c4e60ca47c498bda7060ed097a0
-SIZE (cyrus-imapd-2.3.14.tar.gz) = 2348808
+MD5 (cyrus-imapd-2.3.15.tar.gz) = d89cb1b55023188938f332b7ef120fae
+SHA256 (cyrus-imapd-2.3.15.tar.gz) = 66d94f442356bd14f0d21dea63a5138ca1197a603646dbaab596ab5453b85e7a
+SIZE (cyrus-imapd-2.3.15.tar.gz) = 2370826
diff --git a/mail/cyrus-imapd23/files/patch-lib::imapurl.c b/mail/cyrus-imapd23/files/patch-lib::imapurl.c
new file mode 100644
index 000000000000..78bd54cd4fbd
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-lib::imapurl.c
@@ -0,0 +1,12 @@
+Index: lib/imapurl.c
+diff -u -p lib/imapurl.c.orig lib/imapurl.c
+--- lib/imapurl.c.orig	2009-03-31 13:11:22.000000000 +0900
++++ lib/imapurl.c	2009-09-10 00:28:05.287769072 +0900
+@@ -50,6 +50,7 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <time.h>
++#include <sys/types.h>
+ 
+ #include "imapurl.h"
+ #include "xmalloc.h"
diff --git a/mail/cyrus-imapd23/files/patch-sieve::script.c b/mail/cyrus-imapd23/files/patch-sieve::script.c
deleted file mode 100644
index b3c040ae7797..000000000000
--- a/mail/cyrus-imapd23/files/patch-sieve::script.c
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: sieve/script.c
-diff -u -p sieve/script.c.orig sieve/script.c
---- sieve/script.c.orig	2008-03-25 05:08:46.000000000 +0900
-+++ sieve/script.c	2009-09-03 10:58:13.498715559 +0900
-@@ -688,7 +688,7 @@ static int do_sieve_error(int ret,
- 	ret |= keep_ret;
-         if (keep_ret == SIEVE_OK)
-             snprintf(actions_string+strlen(actions_string),
--		     sizeof(actions_string)-strlen(actions_string),
-+		     ACTIONS_STRING_LEN-strlen(actions_string),
- 		     "Kept\n");
- 	else {
- 	    implicit_keep = 0;	/* don't try an implicit keep again */
-@@ -742,7 +742,7 @@ static int do_action_list(sieve_interp_t
- 	    
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string), 
-+			 ACTIONS_STRING_LEN-strlen(actions_string), 
- 			 "Rejected with: %s\n", a->u.rej.msg);
- 
- 	    break;
-@@ -757,7 +757,7 @@ static int do_action_list(sieve_interp_t
- 
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Filed into: %s\n",a->u.fil.mailbox);
- 	    break;
- 	case ACTION_KEEP:
-@@ -770,7 +770,7 @@ static int do_action_list(sieve_interp_t
- 			       &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Kept\n");
- 	    break;
- 	case ACTION_REDIRECT:
-@@ -783,7 +783,7 @@ static int do_action_list(sieve_interp_t
- 				   &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Redirected to %s\n", a->u.red.addr);
- 	    break;
- 	case ACTION_DISCARD:
-@@ -794,7 +794,7 @@ static int do_action_list(sieve_interp_t
- 				      &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Discarded\n");
- 	    break;
- 
-@@ -820,12 +820,12 @@ static int do_action_list(sieve_interp_t
- 
- 		    if (ret == SIEVE_OK)
- 			snprintf(actions_string+strlen(actions_string),
--				 sizeof(actions_string)-strlen(actions_string),
-+				 ACTIONS_STRING_LEN-strlen(actions_string),
- 				 "Sent vacation reply\n");
- 
- 		} else if (ret == SIEVE_DONE) {
- 		    snprintf(actions_string+strlen(actions_string),
--			     sizeof(actions_string)-strlen(actions_string),
-+			     ACTIONS_STRING_LEN-strlen(actions_string),
- 			     "Vacation reply suppressed\n");
- 
- 		    ret = SIEVE_OK;
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index d9434d929b8b..4bd742daa036 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -16,6 +16,7 @@ cyrus/bin/ctl_deliver
 cyrus/bin/ctl_mboxlist
 cyrus/bin/cvt_cyrusdb
 cyrus/bin/cyr_dbtool
+cyrus/bin/cyr_df
 cyrus/bin/cyr_expire
 cyrus/bin/cyr_synclog
 cyrus/bin/cyrdump
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index b7bffa68b6d7..b4d4143c6e19 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.3.14
-PORTREVISION=	2
+PORTVERSION=	2.3.15
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
 		http://ftp.andrew.cmu.edu/pub/cyrus/ \
@@ -165,12 +165,13 @@ MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
 CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
-		cyr_dbtool.8 cyr_expire.8 cyr_synclog.8 ctl_mboxlist.8 \
-		cvt_cyrusdb.8 deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 \
-		ipurge.8 lmtpd.8 make_md5.8 make_sha1.8 master.8 mbexamine.8 \
-		mbpath.8 notifyd.8 pop3d.8 quota.8 reconstruct.8 rmnews.8 \
-		smmapd.8 squatter.8 sync_client.8 sync_reset.8 sync_server.8 \
-		syncnews.8 timsieved.8 tls_prune.8 unexpunge.8
+		cyr_dbtool.8 cyr_df.8 cyr_expire.8 cyr_synclog.8 \
+		ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 fetchnews.8 fud.8 \
+		idled.8 imapd.8 ipurge.8 lmtpd.8 make_md5.8 make_sha1.8 \
+		master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
+		reconstruct.8 rmnews.8 smmapd.8 squatter.8 sync_client.8 \
+		sync_reset.8 sync_server.8 syncnews.8 timsieved.8 \
+		tls_prune.8 unexpunge.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 913515c89697..d47402700d27 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.3.14.tar.gz) = 1030d4d9d04036b2fb9830165723908e
-SHA256 (cyrus-imapd-2.3.14.tar.gz) = fd840403c1f25adda8f003ea59169e2c87210c4e60ca47c498bda7060ed097a0
-SIZE (cyrus-imapd-2.3.14.tar.gz) = 2348808
+MD5 (cyrus-imapd-2.3.15.tar.gz) = d89cb1b55023188938f332b7ef120fae
+SHA256 (cyrus-imapd-2.3.15.tar.gz) = 66d94f442356bd14f0d21dea63a5138ca1197a603646dbaab596ab5453b85e7a
+SIZE (cyrus-imapd-2.3.15.tar.gz) = 2370826
diff --git a/mail/cyrus-imapd24/files/patch-lib::imapurl.c b/mail/cyrus-imapd24/files/patch-lib::imapurl.c
new file mode 100644
index 000000000000..78bd54cd4fbd
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-lib::imapurl.c
@@ -0,0 +1,12 @@
+Index: lib/imapurl.c
+diff -u -p lib/imapurl.c.orig lib/imapurl.c
+--- lib/imapurl.c.orig	2009-03-31 13:11:22.000000000 +0900
++++ lib/imapurl.c	2009-09-10 00:28:05.287769072 +0900
+@@ -50,6 +50,7 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <time.h>
++#include <sys/types.h>
+ 
+ #include "imapurl.h"
+ #include "xmalloc.h"
diff --git a/mail/cyrus-imapd24/files/patch-sieve::script.c b/mail/cyrus-imapd24/files/patch-sieve::script.c
deleted file mode 100644
index b3c040ae7797..000000000000
--- a/mail/cyrus-imapd24/files/patch-sieve::script.c
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: sieve/script.c
-diff -u -p sieve/script.c.orig sieve/script.c
---- sieve/script.c.orig	2008-03-25 05:08:46.000000000 +0900
-+++ sieve/script.c	2009-09-03 10:58:13.498715559 +0900
-@@ -688,7 +688,7 @@ static int do_sieve_error(int ret,
- 	ret |= keep_ret;
-         if (keep_ret == SIEVE_OK)
-             snprintf(actions_string+strlen(actions_string),
--		     sizeof(actions_string)-strlen(actions_string),
-+		     ACTIONS_STRING_LEN-strlen(actions_string),
- 		     "Kept\n");
- 	else {
- 	    implicit_keep = 0;	/* don't try an implicit keep again */
-@@ -742,7 +742,7 @@ static int do_action_list(sieve_interp_t
- 	    
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string), 
-+			 ACTIONS_STRING_LEN-strlen(actions_string), 
- 			 "Rejected with: %s\n", a->u.rej.msg);
- 
- 	    break;
-@@ -757,7 +757,7 @@ static int do_action_list(sieve_interp_t
- 
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Filed into: %s\n",a->u.fil.mailbox);
- 	    break;
- 	case ACTION_KEEP:
-@@ -770,7 +770,7 @@ static int do_action_list(sieve_interp_t
- 			       &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Kept\n");
- 	    break;
- 	case ACTION_REDIRECT:
-@@ -783,7 +783,7 @@ static int do_action_list(sieve_interp_t
- 				   &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Redirected to %s\n", a->u.red.addr);
- 	    break;
- 	case ACTION_DISCARD:
-@@ -794,7 +794,7 @@ static int do_action_list(sieve_interp_t
- 				      &errmsg);
- 	    if (ret == SIEVE_OK)
- 		snprintf(actions_string+strlen(actions_string),
--			 sizeof(actions_string)-strlen(actions_string),
-+			 ACTIONS_STRING_LEN-strlen(actions_string),
- 			 "Discarded\n");
- 	    break;
- 
-@@ -820,12 +820,12 @@ static int do_action_list(sieve_interp_t
- 
- 		    if (ret == SIEVE_OK)
- 			snprintf(actions_string+strlen(actions_string),
--				 sizeof(actions_string)-strlen(actions_string),
-+				 ACTIONS_STRING_LEN-strlen(actions_string),
- 				 "Sent vacation reply\n");
- 
- 		} else if (ret == SIEVE_DONE) {
- 		    snprintf(actions_string+strlen(actions_string),
--			     sizeof(actions_string)-strlen(actions_string),
-+			     ACTIONS_STRING_LEN-strlen(actions_string),
- 			     "Vacation reply suppressed\n");
- 
- 		    ret = SIEVE_OK;
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index d9434d929b8b..4bd742daa036 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -16,6 +16,7 @@ cyrus/bin/ctl_deliver
 cyrus/bin/ctl_mboxlist
 cyrus/bin/cvt_cyrusdb
 cyrus/bin/cyr_dbtool
+cyrus/bin/cyr_df
 cyrus/bin/cyr_expire
 cyrus/bin/cyr_synclog
 cyrus/bin/cyrdump