From 1149b4f57a748c12befec0bd6ed8eea9dcc19954 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 9 Sep 2011 06:46:39 +0000 Subject: [PATCH] SECURITY: update to cyrus-imapd-2.4.11 to fix CVE-2011-3208. --- mail/cyrus-imapd/Makefile | 6 ++---- mail/cyrus-imapd/distinfo | 10 +++++----- mail/cyrus-imapd/patches/patch-configure | 8 ++++---- mail/cyrus-imapd/patches/patch-lib_imapoptions | 8 ++++---- mail/cyrus-imapd/patches/patch-man_imapd_conf_5 | 8 ++++---- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 247f5e8bf32..d20c76c9a88 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,16 +1,14 @@ -# $OpenBSD: Makefile,v 1.61 2011/09/02 08:24:28 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.62 2011/09/09 06:46:39 ajacoutot Exp $ COMMENT-main= Cyrus IMAP server COMMENT-perl= perl utils for the Cyrus IMAP server -V= 2.4.10 +V= 2.4.11 DISTNAME= cyrus-imapd-${V} PKGNAME-main= ${DISTNAME} FULLPKGNAME-perl=cyrus-imapd-perl-${V} FULLPKGPATH-perl=mail/cyrus-imapd,-perl -REVISION-main= 1 - CATEGORIES= mail HOMEPAGE= http://www.cyrusimap.org/ diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo index 5f47c1b35aa..81fbf9469bd 100644 --- a/mail/cyrus-imapd/distinfo +++ b/mail/cyrus-imapd/distinfo @@ -1,5 +1,5 @@ -MD5 (cyrus-imapd-2.4.10.tar.gz) = VfCO6r8vkygeYbonhUrqZw== -RMD160 (cyrus-imapd-2.4.10.tar.gz) = 1//jrVa55WXcfht2TUuwpZfOlpY= -SHA1 (cyrus-imapd-2.4.10.tar.gz) = tstR1n8rSVNrqS2q5HHXgXkpxII= -SHA256 (cyrus-imapd-2.4.10.tar.gz) = L1tcblJN+QBd9KcAyVi7maIcRFBIU3Tjij0YAQvIcxc= -SIZE (cyrus-imapd-2.4.10.tar.gz) = 2430196 +MD5 (cyrus-imapd-2.4.11.tar.gz) = 1KBm6XmtvoVnmm4jnWTudA== +RMD160 (cyrus-imapd-2.4.11.tar.gz) = C7MPfYxlWgM2aozln1pwjDDTTsE= +SHA1 (cyrus-imapd-2.4.11.tar.gz) = JP2vDlfVw722O33Mop/m31NcYQI= +SHA256 (cyrus-imapd-2.4.11.tar.gz) = /mu8/Xq+RZoKqIki74HkGpjck7DPJAi3CGNWs+5Mf3A= +SIZE (cyrus-imapd-2.4.11.tar.gz) = 2446611 diff --git a/mail/cyrus-imapd/patches/patch-configure b/mail/cyrus-imapd/patches/patch-configure index b13458ff8ae..6a198c40c8b 100644 --- a/mail/cyrus-imapd/patches/patch-configure +++ b/mail/cyrus-imapd/patches/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Mon Jul 4 17:06:30 2011 -+++ configure Tue Jul 5 23:36:08 2011 +--- configure.orig Thu Sep 8 21:03:38 2011 ++++ configure Fri Sep 9 08:38:25 2011 @@ -5062,9 +5062,7 @@ CFLAGS=$save_CFLAGS fi @@ -44,8 +44,8 @@ PERL_SUBDIRS="imap" PERL="${with_perl}" case "${target_os}" in -- linux*|netbsd*) -+ linux*|netbsd*|openbsd*) +- linux*|netbsd*|freebsd*|dragonfly*) ++ linux*|netbsd*|freebsd*|dragonfly*|openbsd*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5 $as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; } eval `${PERL} -V:cccdlflags` diff --git a/mail/cyrus-imapd/patches/patch-lib_imapoptions b/mail/cyrus-imapd/patches/patch-lib_imapoptions index 76bceef3f0a..fbba85b7cae 100644 --- a/mail/cyrus-imapd/patches/patch-lib_imapoptions +++ b/mail/cyrus-imapd/patches/patch-lib_imapoptions @@ -1,6 +1,6 @@ -$OpenBSD: patch-lib_imapoptions,v 1.6 2011/07/05 22:58:48 ajacoutot Exp $ ---- lib/imapoptions.orig Mon Jul 4 17:05:01 2011 -+++ lib/imapoptions Tue Jul 5 23:36:08 2011 +$OpenBSD: patch-lib_imapoptions,v 1.7 2011/09/09 06:46:39 ajacoutot Exp $ +--- lib/imapoptions.orig Thu Sep 8 20:57:42 2011 ++++ lib/imapoptions Fri Sep 9 08:37:42 2011 @@ -263,7 +263,7 @@ Blank lines and lines beginning with ``#'' are ignored /* Debug command to be used by processes started with -D option. The string is a C format string that gets 3 options: the first is the name of the @@ -10,7 +10,7 @@ $OpenBSD: patch-lib_imapoptions,v 1.6 2011/07/05 22:58:48 ajacoutot Exp $ { "defaultacl", "anyone lrs", STRING } /* The Access Control List (ACL) placed on a newly-created (non-user) -@@ -1062,7 +1062,7 @@ And the notification message will be available on \fIs +@@ -1072,7 +1072,7 @@ And the notification message will be available on \fIs { "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")} /* The cyrusdb backend to use for the seen state. */ diff --git a/mail/cyrus-imapd/patches/patch-man_imapd_conf_5 b/mail/cyrus-imapd/patches/patch-man_imapd_conf_5 index 954dee3ca4e..b987822be32 100644 --- a/mail/cyrus-imapd/patches/patch-man_imapd_conf_5 +++ b/mail/cyrus-imapd/patches/patch-man_imapd_conf_5 @@ -1,6 +1,6 @@ -$OpenBSD: patch-man_imapd_conf_5,v 1.5 2011/07/05 22:58:48 ajacoutot Exp $ ---- man/imapd.conf.5.orig Mon Jul 4 17:06:30 2011 -+++ man/imapd.conf.5 Tue Jul 5 23:36:08 2011 +$OpenBSD: patch-man_imapd_conf_5,v 1.6 2011/09/09 06:46:39 ajacoutot Exp $ +--- man/imapd.conf.5.orig Thu Sep 8 21:03:38 2011 ++++ man/imapd.conf.5 Fri Sep 9 08:37:42 2011 @@ -239,7 +239,7 @@ required. Debug command to be used by processes started with -D option. The string is a C format string that gets 3 options: the first is the name of the @@ -10,7 +10,7 @@ $OpenBSD: patch-man_imapd_conf_5,v 1.5 2011/07/05 22:58:48 ajacoutot Exp $ .IP "\fBdefaultacl:\fR anyone lrs" 5 The Access Control List (ACL) placed on a newly-created (non-user) mailbox that does not have a parent mailbox. -@@ -900,7 +900,7 @@ Possible values include "auxprop", "saslauthd", and "p +@@ -908,7 +908,7 @@ Possible values include "auxprop", "saslauthd", and "p The cyrusdb backend to use for the seen state. Allowed values: \fIflat\fR, \fIberkeley\fR, \fIberkeley-hash\fR, \fIskiplist\fR