Update cyrus-imapd to 2.1.11.

This includes the fix for the recent buffer overflow.

Note that IPv6 patch doesn't work, I've not had the time to look into this,
but felt that being a security fix I should get the update done.

Also note that if you define CYRUS_DB_RECOMMENDED in your build environment
it will build using the cyrus mailing list recommended defaults for the
database settings.

4 files changed, 26 insertions, 28 deletions

diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 993b7465866..85632ab92ce 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2002/11/16 10:39:22 seb Exp $
+# $NetBSD: Makefile,v 1.3 2002/12/08 00:39:42 chris Exp $
 
-DISTNAME=		cyrus-imapd-2.1.9
-PKGREVISION=		1
+DISTNAME=		cyrus-imapd-2.1.11
 SVR4_PKGNAME=		cimap
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -20,7 +19,7 @@ AUTOCONF_REQD=		2.13
 
 .if defined(CYRUS_USE_INET6) && ${CYRUS_USE_INET6} == "YES"
 PATCH_SITES=		http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=		${DISTNAME}-ipv6-20020902.diff.gz
+PATCHFILES=		${DISTNAME}-ipv6-20021205.diff.gz
 .endif
 
 # CYRUS_USER		username of the Cyrus administrator
@@ -44,6 +43,18 @@ CONFIGURE_ARGS+=	--without-ucdsnmp
 CONFIGURE_ARGS+=	--without-notify
 CONFIGURE_ARGS+=	--without-zephyr
 CONFIGURE_ARGS+=	--enable-netscapehack
+CONFIGURE_ARGS+=	--with-perl=${PERL5}
+
+# Follow the recommended methods for database types to use:
+.if defined(CYRUS_DB_RECOMMENDED)
+CONFIGURE_ARGS+=	--with-duplicate-db=db3_nosync
+CONFIGURE_ARGS+=	--with-mboxlist-db=skiplist
+CONFIGURE_ARGS+=	--with-seen-db=skiplist
+CONFIGURE_ARGS+=	--with-subs-db=flat
+CONFIGURE_ARGS+=	--with-tls-db=db3_nosync
+# I'm not 100% ready to override the defaults till I've checked any side
+# effects - chris@nb.org
+.endif
 
 CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
 CONFIGURE_ENV+=		ac_cv_lib_wrap_request_init=yes
diff --git a/mail/cyrus-imapd21/distinfo b/mail/cyrus-imapd21/distinfo
index 36d31eddf34..e34cfe50a10 100644
--- a/mail/cyrus-imapd21/distinfo
+++ b/mail/cyrus-imapd21/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.2 2002/11/16 10:39:22 seb Exp $
+$NetBSD: distinfo,v 1.3 2002/12/08 00:39:43 chris Exp $
 
-SHA1 (cyrus-imapd-2.1.9.tar.gz) = 7f9fe16e3cc5f67b97278f3fb2a194482570924a
-Size (cyrus-imapd-2.1.9.tar.gz) = 1633031 bytes
-SHA1 (cyrus-imapd-2.1.9-ipv6-20020902.diff.gz) = cb9beb12ac699c0a8e53476b9958a5c10b9f1738
-Size (cyrus-imapd-2.1.9-ipv6-20020902.diff.gz) = 30496 bytes
+SHA1 (cyrus-imapd-2.1.11.tar.gz) = 33a575ff1212362c7c6e6f195669c3ef866364d2
+Size (cyrus-imapd-2.1.11.tar.gz) = 1646196 bytes
+SHA1 (cyrus-imapd-2.1.11-ipv6-20021205.diff.gz) = 7ad9e90cf318d9f0e02047743e3d2948816f155e
+Size (cyrus-imapd-2.1.11-ipv6-20021205.diff.gz) = 32318 bytes
 SHA1 (patch-aa) = ef3630c2bafc752eb3af56815c44b3a2037d221a
-SHA1 (patch-ab) = 93f8b2a17a2f1267b891f89a6904af6dfc53c904
 SHA1 (patch-ac) = dd29b77fefee4c61dd1fac6d16284e0d1505d4ae
 SHA1 (patch-ad) = 3e07a4e5bd1e496e33f555c9a4004a0097595551
 SHA1 (patch-ae) = 371df78750ef75fba2ff42a17785aea4e3aea724
-SHA1 (patch-af) = 5581025bb08d3e1f29f21f133e32f9cc0b2675fb
+SHA1 (patch-af) = 4594ac4fd6aa63f7e0236929ef0744561ba3a315
 SHA1 (patch-ag) = 55e7bbd00f8fe4b47d48fad3a06e3ad0aa835a4a
 SHA1 (patch-ah) = 99e25634852897f8df72b9af5f35789a0ef4b892
 SHA1 (patch-ai) = df0551cd295d660dcd12601cb1aa2d930f85d2f1
diff --git a/mail/cyrus-imapd21/patches/patch-ab b/mail/cyrus-imapd21/patches/patch-ab
deleted file mode 100644
index 7c3c5e749b7..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/10/27 16:08:53 chris Exp $
-
---- lib/cyrusdb_flat.c~	Mon Aug  5 13:46:15 2002
-+++ lib/cyrusdb_flat.c	Thu Aug 29 23:13:17 2002
-@@ -186,6 +186,7 @@
-     struct db *db = (struct db *) xmalloc(sizeof(struct db));
-     struct stat sbuf;
- 
-+    db->fname = NULL;
-     assert(fname && ret);
- 
-     db->fd = open(fname, O_RDWR | O_CREAT, 0666);
diff --git a/mail/cyrus-imapd21/patches/patch-af b/mail/cyrus-imapd21/patches/patch-af
index abaa4ff273d..e5c3ce5cfd4 100644
--- a/mail/cyrus-imapd21/patches/patch-af
+++ b/mail/cyrus-imapd21/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.1 2002/11/15 11:49:07 seb Exp $
+$NetBSD: patch-af,v 1.2 2002/12/08 00:39:43 chris Exp $
 
---- configure.in.orig	Tue Aug 27 17:05:26 2002
-+++ configure.in
-@@ -857,6 +857,10 @@ dnl compile perl stuff
-     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
+--- configure.in.orig	Fri Dec  6 13:19:12 2002
++++ configure.in	Fri Dec  6 13:20:18 2002
+@@ -865,6 +865,10 @@
  dnl and compile perl/cyradm
      PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
 +dnl add perl cccdlflags when building libraries
 +    eval `${PERL} -V:cccdlflags`
 +    PERL_CCCDLFLAGS="$cccdlflags"