From 7d2abecfa7d8b2b211051cabdc34d77ceca9ce3a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 22 Jun 2011 06:51:09 +0000 Subject: [PATCH] Update to cyrus-imapd-2.4.9. More details at: http://cyrusimap.org/mediawiki/index.php/Bugs_Resolved_in_2.4.9 --- mail/cyrus-imapd/Makefile | 6 ++---- mail/cyrus-imapd/distinfo | 10 +++++----- mail/cyrus-imapd/patches/patch-configure | 16 ++++++++-------- mail/cyrus-imapd/patches/patch-lib_imapoptions | 10 +++++----- mail/cyrus-imapd/patches/patch-man_imapd_conf_5 | 10 +++++----- 5 files changed, 25 insertions(+), 27 deletions(-) diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 40be9ee0574..628592af62b 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,16 +1,14 @@ -# $OpenBSD: Makefile,v 1.57 2011/06/02 13:41:39 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.58 2011/06/22 06:51:09 ajacoutot Exp $ COMMENT-main= Cyrus IMAP server COMMENT-perl= perl utils for the Cyrus IMAP server -V= 2.4.8 +V= 2.4.9 DISTNAME= cyrus-imapd-${V} PKGNAME-main= ${DISTNAME} FULLPKGNAME-perl=cyrus-imapd-perl-${V} FULLPKGPATH-perl=mail/cyrus-imapd,-perl -REVISION-main= 0 - CATEGORIES= mail HOMEPAGE= http://www.cyrusimap.org/ diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo index 91f8717c11c..d2ebd2ee545 100644 --- a/mail/cyrus-imapd/distinfo +++ b/mail/cyrus-imapd/distinfo @@ -1,5 +1,5 @@ -MD5 (cyrus-imapd-2.4.8.tar.gz) = tVkwKTeHpC1XGkf2mqrPKA== -RMD160 (cyrus-imapd-2.4.8.tar.gz) = cvmvv3iTs0SaGna3BQ6m18mwA8k= -SHA1 (cyrus-imapd-2.4.8.tar.gz) = Tfwyiv9ILJ67Tv3OSxQPaVZIgOg= -SHA256 (cyrus-imapd-2.4.8.tar.gz) = eh/3M5KCdtDkLcz7hfF+bW1jzcEcA+k66hnn3nmNoDA= -SIZE (cyrus-imapd-2.4.8.tar.gz) = 2424151 +MD5 (cyrus-imapd-2.4.9.tar.gz) = eL5ThdUG2fcTTYq/baORdw== +RMD160 (cyrus-imapd-2.4.9.tar.gz) = N3J1AviwgKHjIFNgwEir1H526Hg= +SHA1 (cyrus-imapd-2.4.9.tar.gz) = PMjPVNQ7rtpoIvhO/sarlfPRxJ8= +SHA256 (cyrus-imapd-2.4.9.tar.gz) = 11e8lcqJGsrTdoqIilAiq5a6ctSURaoS4mtZKYIuQVY= +SIZE (cyrus-imapd-2.4.9.tar.gz) = 2425065 diff --git a/mail/cyrus-imapd/patches/patch-configure b/mail/cyrus-imapd/patches/patch-configure index 361c8556ae3..0aaecac6efd 100644 --- a/mail/cyrus-imapd/patches/patch-configure +++ b/mail/cyrus-imapd/patches/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed Mar 30 15:53:09 2011 -+++ configure Wed Mar 30 17:05:07 2011 -@@ -5051,9 +5051,7 @@ CFLAGS=$save_CFLAGS +--- configure.orig Tue Jun 21 21:51:34 2011 ++++ configure Wed Jun 22 08:43:42 2011 +@@ -5053,9 +5053,7 @@ CFLAGS=$save_CFLAGS fi if test "$ac_cv_fpic" = "yes"; then @@ -11,7 +11,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fpic" >&5 $as_echo "$ac_cv_fpic" >&6; } -@@ -6444,7 +6442,7 @@ fi +@@ -6446,7 +6444,7 @@ fi @@ -20,7 +20,7 @@ CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}" CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o" -@@ -9598,7 +9596,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th +@@ -9612,7 +9610,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29,7 +29,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -9900,8 +9898,8 @@ fi +@@ -9914,8 +9912,8 @@ fi GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" @@ -40,7 +40,7 @@ elif test "$gss_impl" = "cybersafe03"; then # Version of CyberSafe with two libraries CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include" -@@ -10469,7 +10467,7 @@ elif test "${with_perl}" != "no"; then +@@ -10483,7 +10481,7 @@ elif test "${with_perl}" != "no"; then PERL_SUBDIRS="imap" PERL="${with_perl}" case "${target_os}" in @@ -49,7 +49,7 @@ { $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` -@@ -10532,6 +10530,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -10546,6 +10544,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext extern "C" #endif char request_init (); diff --git a/mail/cyrus-imapd/patches/patch-lib_imapoptions b/mail/cyrus-imapd/patches/patch-lib_imapoptions index b3fce36ea00..63503a430f7 100644 --- a/mail/cyrus-imapd/patches/patch-lib_imapoptions +++ b/mail/cyrus-imapd/patches/patch-lib_imapoptions @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_imapoptions,v 1.4 2011/04/13 15:18:24 ajacoutot Exp $ ---- lib/imapoptions.orig Wed Apr 13 16:35:22 2011 -+++ lib/imapoptions Wed Apr 13 17:07:59 2011 -@@ -253,7 +253,7 @@ Blank lines and lines beginning with ``#'' are ignored +$OpenBSD: patch-lib_imapoptions,v 1.5 2011/06/22 06:51:10 ajacoutot Exp $ +--- lib/imapoptions.orig Tue Jun 21 21:50:39 2011 ++++ lib/imapoptions Wed Jun 22 08:43:42 2011 +@@ -257,7 +257,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 executable (without path). The second is the pid (integer) and the third @@ -10,7 +10,7 @@ $OpenBSD: patch-lib_imapoptions,v 1.4 2011/04/13 15:18:24 ajacoutot Exp $ { "defaultacl", "anyone lrs", STRING } /* The Access Control List (ACL) placed on a newly-created (non-user) -@@ -1018,7 +1018,7 @@ And the notification message will be available on \fIs +@@ -1043,7 +1043,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 01e8a73e076..4840c2f0ecd 100644 --- a/mail/cyrus-imapd/patches/patch-man_imapd_conf_5 +++ b/mail/cyrus-imapd/patches/patch-man_imapd_conf_5 @@ -1,7 +1,7 @@ -$OpenBSD: patch-man_imapd_conf_5,v 1.3 2011/04/13 15:18:24 ajacoutot Exp $ ---- man/imapd.conf.5.orig Wed Apr 13 16:53:15 2011 -+++ man/imapd.conf.5 Wed Apr 13 17:07:59 2011 -@@ -231,7 +231,7 @@ required. +$OpenBSD: patch-man_imapd_conf_5,v 1.4 2011/06/22 06:51:10 ajacoutot Exp $ +--- man/imapd.conf.5.orig Tue Jun 21 21:51:34 2011 ++++ man/imapd.conf.5 Wed Jun 22 08:43:42 2011 +@@ -234,7 +234,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 executable (without path). The second is the pid (integer) and the third @@ -10,7 +10,7 @@ $OpenBSD: patch-man_imapd_conf_5,v 1.3 2011/04/13 15:18:24 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. -@@ -865,7 +865,7 @@ Possible values include "auxprop", "saslauthd", and "p +@@ -884,7 +884,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