- update to version 2.3.12

- fix depends for the drac FLAVOR in the process
- add a patch from cyrus bugzilla to allow imapd.conf to contain blank lines (!)

* Added statuscache.db to cache IMAP STATUS data
* Added option to unexpunge to restore messages by time interval
* Implemented incremental squat updates (see squatter.8)
* Fixed major bugs in reconstruct -k implementation
* Added code to promote transaction safety and to track the lock status of skiplist databases
* Allow long lines in imapd.conf to be split across multiple lines by using backslash as a continuation character.
* Fixed miscellaneous bugs and build issues
... and more

mail/cyrus-imapd/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2008/03/15 10:07:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2008/04/23 13:33:22 ajacoutot Exp $
 
 COMMENT-main=	Cyrus IMAP server
 COMMENT-perl=	perl utils for the Cyrus IMAP server
 
-V=		2.3.11
+V=		2.3.12
 DISTNAME=	cyrus-imapd-${V}
-PKGNAME-main=	${DISTNAME}p0
+PKGNAME-main=	${DISTNAME}
 FULLPKGNAME-perl=cyrus-imapd-perl-${V}
 FULLPKGPATH-perl=mail/cyrus-imapd,-perl
 CATEGORIES=	mail
@@ -59,6 +59,8 @@ CONFIGURE_ARGS=	--with-service-path=${LOCALBASE}/libexec/cyrus-imapd \
 		--without-zephyr \
 		--without-snmp
 
+# this is a needed hack; to update PLIST:
+# make SHARED_ONLY=Yes plist
 MULTI_PACKAGES=	-main ${NO_SHARED_LIBS:S/Yes//:S/No/-perl/}
 CONFIGURE_ARGS+=--with${NO_SHARED_LIBS:S/Yes/out/:S/No//}-perl
 
@@ -66,7 +68,8 @@ FLAVORS=	drac
 FLAVOR?=
 
 .if ${FLAVOR:L:Mdrac}
-BUILD_DEPENDS=	::mail/drac
+BUILD_DEPENDS+=	::mail/drac
+RUN_DEPENDS+=	::mail/drac
 PATCH_LIST+=	${WRKSRC}/contrib/drac_auth.patch \
 		drac-patch-imap_Makefile.in
 .endif

mail/cyrus-imapd/distinfo

@@ -1,5 +1,5 @@
-MD5 (cyrus-imapd-2.3.11.tar.gz) = 32MusqieNuYpbkq9aHQ17Q==
-RMD160 (cyrus-imapd-2.3.11.tar.gz) = NHJ+CMwl88tuDqAZW5belC3hD0g=
-SHA1 (cyrus-imapd-2.3.11.tar.gz) = Yhjw3E8XkueGZ3NiuLOWXkWTEi4=
-SHA256 (cyrus-imapd-2.3.11.tar.gz) = h85Yso7R+JdBGMAqwAk3e7PeYq3M1pmmfwEAFYEG2EI=
-SIZE (cyrus-imapd-2.3.11.tar.gz) = 2275173
+MD5 (cyrus-imapd-2.3.12.tar.gz) = fdiDXsP5EttBjjVBrJZcFg==
+RMD160 (cyrus-imapd-2.3.12.tar.gz) = szpqnnljMZE0owNGINA6uPKU6j4=
+SHA1 (cyrus-imapd-2.3.12.tar.gz) = bxQ3Ti71HcgBgh5t1ywm41/ZEMM=
+SHA256 (cyrus-imapd-2.3.12.tar.gz) = q0qUstOkexRRAEagZANorFUXo0CXAL7ZMUVoYXmpAnY=
+SIZE (cyrus-imapd-2.3.12.tar.gz) = 2291961

mail/cyrus-imapd/patches/patch-configure

@@ -1,5 +1,5 @@
---- configure.orig	Wed Oct 24 20:12:43 2007
-+++ configure	Thu Oct 25 10:40:37 2007
+--- configure.orig	Mon Apr 21 13:17:40 2008
++++ configure	Mon Apr 21 16:16:41 2008
 @@ -5206,9 +5206,7 @@ CFLAGS=$save_CFLAGS
  fi
  
@@ -29,7 +29,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14827,7 +14825,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -14831,7 +14829,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -38,7 +38,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14917,7 +14915,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
+@@ -14921,7 +14919,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -47,7 +47,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -15387,8 +15385,8 @@ fi
+@@ -15391,8 +15389,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"
@@ -58,7 +58,7 @@
    elif test "$gss_impl" = "cybersafe03"; then
  # Version of CyberSafe with two libraries
      CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-@@ -15572,7 +15570,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -15576,7 +15574,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -67,7 +67,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17410,6 +17408,8 @@ extern "C"
+@@ -17414,6 +17412,8 @@ extern "C"
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char request_init ();

mail/cyrus-imapd/patches/patch-lib_libconfig_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib_libconfig_c,v 1.1 2008/04/23 13:33:22 ajacoutot Exp $
+--- lib/libconfig.c.orig	Wed Apr 23 12:03:13 2008
++++ lib/libconfig.c	Wed Apr 23 12:05:47 2008
+@@ -344,7 +344,7 @@ void config_read_file(const char *filename)
+ 		/* end of line */
+ 		buf[--len] = '\0';
+ 
+-		if (buf[len-1] == '\\') {
++		if (len && buf[len-1] == '\\') {
+ 		    /* line continuation */
+ 		    len--;
+ 		    lineno++;

mail/cyrus-imapd/patches/patch-master_conf_normal_conf

@@ -1,6 +1,6 @@
-$OpenBSD: patch-master_conf_normal_conf,v 1.2 2008/03/15 10:07:20 ajacoutot Exp $
+$OpenBSD: patch-master_conf_normal_conf,v 1.3 2008/04/23 13:33:22 ajacoutot Exp $
 --- master/conf/normal.conf.orig	Thu Mar 30 18:01:39 2006
-+++ master/conf/normal.conf	Tue Mar  4 09:13:24 2008
++++ master/conf/normal.conf	Mon Apr 21 16:29:36 2008
 @@ -5,17 +5,17 @@ START {
    recover	cmd="ctl_cyrusdb -r"
  
@@ -29,5 +29,5 @@ $OpenBSD: patch-master_conf_normal_conf,v 1.2 2008/03/15 10:07:20 ajacoutot Exp
    tlsprune	cmd="tls_prune" at=0400
 +
 +  # create SQUAT indexes for all mailboxes
-+#  squatter	cmd="squatter -s -r user" at=0540
++#  squatter	cmd="squatter -s -r -i user" at=0540
  }