Update to 2.3.11.

6 files changed, 26 insertions, 24 deletions

diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 1023110defbe..be867585da93 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.3.9
-PORTREVISION=	1
+PORTVERSION=	2.3.11
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
 		http://ftp.andrew.cmu.edu/pub/cyrus/ \
@@ -146,12 +146,12 @@ 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 ctl_mboxlist.8 cvt_cyrusdb.8 \
-		deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
-		make_md5.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_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 a00eb372adf3..62dfa47614f5 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.3.9.tar.gz) = 113433c1fdc777e3b0466b5ce643b8bc
-SHA256 (cyrus-imapd-2.3.9.tar.gz) = 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437
-SIZE (cyrus-imapd-2.3.9.tar.gz) = 2272004
+MD5 (cyrus-imapd-2.3.11.tar.gz) = df632eb2a89e36e6296e4abd687435ed
+SHA256 (cyrus-imapd-2.3.11.tar.gz) = 87ce58b28ed1f8974118c02ac009377bb3de62adccd699a67f0100158106d842
+SIZE (cyrus-imapd-2.3.11.tar.gz) = 2275173
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index e81ea3ceba10..7e35fe26d09f 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -17,6 +17,7 @@ cyrus/bin/ctl_mboxlist
 cyrus/bin/cvt_cyrusdb
 cyrus/bin/cyr_dbtool
 cyrus/bin/cyr_expire
+cyrus/bin/cyr_synclog
 cyrus/bin/cyrdump
 cyrus/bin/deliver
 %%NNTP%%cyrus/bin/fetchnews
@@ -27,6 +28,7 @@ cyrus/bin/ipurge
 cyrus/bin/lmtpd
 cyrus/bin/lmtpproxyd
 %%REPLICATION%%cyrus/bin/make_md5
+%%REPLICATION%%cyrus/bin/make_sha1
 cyrus/bin/masssievec
 cyrus/bin/master
 cyrus/bin/mbexamine
@@ -74,7 +76,6 @@ include/cyrus/lock.h
 include/cyrus/lsort.h
 include/cyrus/map.h
 include/cyrus/md5.h
-include/cyrus/message_uuid.h
 include/cyrus/mkgmtime.h
 include/cyrus/mpool.h
 include/cyrus/nonblock.h
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 1023110defbe..be867585da93 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.3.9
-PORTREVISION=	1
+PORTVERSION=	2.3.11
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
 		http://ftp.andrew.cmu.edu/pub/cyrus/ \
@@ -146,12 +146,12 @@ 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 ctl_mboxlist.8 cvt_cyrusdb.8 \
-		deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
-		make_md5.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_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 a00eb372adf3..62dfa47614f5 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.3.9.tar.gz) = 113433c1fdc777e3b0466b5ce643b8bc
-SHA256 (cyrus-imapd-2.3.9.tar.gz) = 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437
-SIZE (cyrus-imapd-2.3.9.tar.gz) = 2272004
+MD5 (cyrus-imapd-2.3.11.tar.gz) = df632eb2a89e36e6296e4abd687435ed
+SHA256 (cyrus-imapd-2.3.11.tar.gz) = 87ce58b28ed1f8974118c02ac009377bb3de62adccd699a67f0100158106d842
+SIZE (cyrus-imapd-2.3.11.tar.gz) = 2275173
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index e81ea3ceba10..7e35fe26d09f 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -17,6 +17,7 @@ cyrus/bin/ctl_mboxlist
 cyrus/bin/cvt_cyrusdb
 cyrus/bin/cyr_dbtool
 cyrus/bin/cyr_expire
+cyrus/bin/cyr_synclog
 cyrus/bin/cyrdump
 cyrus/bin/deliver
 %%NNTP%%cyrus/bin/fetchnews
@@ -27,6 +28,7 @@ cyrus/bin/ipurge
 cyrus/bin/lmtpd
 cyrus/bin/lmtpproxyd
 %%REPLICATION%%cyrus/bin/make_md5
+%%REPLICATION%%cyrus/bin/make_sha1
 cyrus/bin/masssievec
 cyrus/bin/master
 cyrus/bin/mbexamine
@@ -74,7 +76,6 @@ include/cyrus/lock.h
 include/cyrus/lsort.h
 include/cyrus/map.h
 include/cyrus/md5.h
-include/cyrus/message_uuid.h
 include/cyrus/mkgmtime.h
 include/cyrus/mpool.h
 include/cyrus/nonblock.h