Update to version 2.1.12.

Changes to the Cyrus IMAP Server since 2.1.11

      * Master now will forcibly exit if a service is not executable
      * Master now has a daemon mode and pidfile support (-d and -p
        options)
      * Berkeley DB Configuration methods have changed. Hopefully they're
        more generic now. You can still use --with-dbdir, or you can use
        --with-bdb-libdir and --with-bdb-incdir
      * timsieved now handles usernames with dots (when unixhierarchysep is
        active)
      * tugowar has been removed from the distribution.
      * Squatter now has an option to skip unmodified mailboxes.
      * Properly hash username to remove a user's sieve scripts when their
        INBOX is removed.
      * Reset output buffer when prot_flush returns EOF.
      * Minor Makefile improvements with use of $(srcdir)
      * Remotepurge improvement for empty mailboxes
      * Fix for AFS overwriting the canonicalized username in ptloader
      * Security audit of imapd.c performed by SecurityAppraisers and
        Bynari

5 files changed, 19 insertions, 17 deletions

diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index f97c1baaca5..f546df2ccb7 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:31 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/27 13:21:51 seb Exp $
 
-DISTNAME=		cyrus-imapd-2.1.11
+DISTNAME=		cyrus-imapd-2.1.12
 SVR4_PKGNAME=		cimap
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -20,7 +20,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-20021205.diff.gz
+PATCHFILES=		${DISTNAME}-ipv6-20030204.diff.gz
 .endif
 
 # CYRUS_USER		username of the Cyrus administrator
@@ -37,7 +37,8 @@ CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER}
 CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP}
 CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
 CONFIGURE_ARGS+=	--with-statedir=/var/run
-CONFIGURE_ARGS+=	--with-dbdir=${BUILDLINK_PREFIX.db3}
+CONFIGURE_ARGS+=	--with-bdb-libdir=${BUILDLINK_PREFIX.db3}/lib
+CONFIGURE_ARGS+=	--with-bdb-incdir=${BUILDLINK_PREFIX.db3}/include/db3
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 CONFIGURE_ARGS+=	--without-ucdsnmp
diff --git a/mail/cyrus-imapd21/buildlink2.mk b/mail/cyrus-imapd21/buildlink2.mk
index cb86d1daac5..5cf050ae5ad 100644
--- a/mail/cyrus-imapd21/buildlink2.mk
+++ b/mail/cyrus-imapd21/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/02/21 22:47:10 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/02/27 13:21:51 seb Exp $
 #
 # This Makefile fragment is included by packages that use cyrus-imapd.
 #
@@ -9,7 +9,7 @@
 CYRUS_IMAPD_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			cyrus-imapd
-BUILDLINK_DEPENDS.cyrus-imapd?=		cyrus-imapd>=2.1.11
+BUILDLINK_DEPENDS.cyrus-imapd?=		cyrus-imapd>=2.1.12
 BUILDLINK_PKGSRCDIR.cyrus-imapd?=		../../mail/cyrus-imapd21
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.cyrus-imapd=cyrus-imapd
diff --git a/mail/cyrus-imapd21/distinfo b/mail/cyrus-imapd21/distinfo
index f99268164f0..c4bef24cf0b 100644
--- a/mail/cyrus-imapd21/distinfo
+++ b/mail/cyrus-imapd21/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2003/01/08 21:26:34 chris Exp $
+$NetBSD: distinfo,v 1.6 2003/02/27 13:21:51 seb Exp $
 
-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 (cyrus-imapd-2.1.12.tar.gz) = f77c7328faba7bdb6b2af55ec562433a29255e4a
+Size (cyrus-imapd-2.1.12.tar.gz) = 1664202 bytes
+SHA1 (cyrus-imapd-2.1.12-ipv6-20030204.diff.gz) = e361074cdcd4aac37988c75b96f011c1613a619e
+Size (cyrus-imapd-2.1.12-ipv6-20030204.diff.gz) = 32582 bytes
 SHA1 (patch-aa) = ef3630c2bafc752eb3af56815c44b3a2037d221a
 SHA1 (patch-ac) = dd29b77fefee4c61dd1fac6d16284e0d1505d4ae
 SHA1 (patch-ad) = 3e07a4e5bd1e496e33f555c9a4004a0097595551
@@ -12,5 +12,5 @@ SHA1 (patch-af) = 4594ac4fd6aa63f7e0236929ef0744561ba3a315
 SHA1 (patch-ag) = 55e7bbd00f8fe4b47d48fad3a06e3ad0aa835a4a
 SHA1 (patch-ah) = 99e25634852897f8df72b9af5f35789a0ef4b892
 SHA1 (patch-ai) = df0551cd295d660dcd12601cb1aa2d930f85d2f1
-SHA1 (patch-aj) = df5f4ebee3d971a257c514beda4ca9cf5b315ca0
+SHA1 (patch-aj) = fcf0ce2c630459ea27c3d950a31ed907f5884de6
 SHA1 (patch-ak) = 31124c296228bd821022adf2a21ceb9d839148ce
diff --git a/mail/cyrus-imapd21/files/cyrus.sh b/mail/cyrus-imapd21/files/cyrus.sh
index 6372c2ccf2d..372129727d9 100644
--- a/mail/cyrus-imapd21/files/cyrus.sh
+++ b/mail/cyrus-imapd21/files/cyrus.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: cyrus.sh,v 1.1.1.1 2002/10/27 16:08:53 chris Exp $
+# $NetBSD: cyrus.sh,v 1.2 2003/02/27 13:21:52 seb Exp $
 #
 # PROVIDE: cyrus
 # REQUIRE: DAEMON
@@ -17,7 +17,8 @@ rcd_dir=`@DIRNAME@ $0`
 name="cyrus"
 rcvar=$name
 command="@PREFIX@/cyrus/bin/master"
-command_args="& sleep 2"
+command_args="-d"
+pidfile="/var/run/cyrus-master.pid"
 required_files="@PKG_SYSCONFDIR@/cyrus.conf @IMAPDCONF@"
 extra_commands="mkimap reload"
 
diff --git a/mail/cyrus-imapd21/patches/patch-aj b/mail/cyrus-imapd21/patches/patch-aj
index 47bfce00610..94e5b5271e0 100644
--- a/mail/cyrus-imapd21/patches/patch-aj
+++ b/mail/cyrus-imapd21/patches/patch-aj
@@ -1,9 +1,9 @@
-$NetBSD: patch-aj,v 1.1 2002/11/15 11:49:08 seb Exp $
+$NetBSD: patch-aj,v 1.2 2003/02/27 13:21:52 seb Exp $
 
---- acap/Makefile.in.orig	Sat May 25 21:57:41 2002
+--- acap/Makefile.in.orig	Tue Dec 10 00:52:37 2002
 +++ acap/Makefile.in
 @@ -54,7 +54,7 @@ DEFS = @DEFS@
- CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I.. -I../lib
+ CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/../lib
  LIBS = @LIBS@
  
 -CFLAGS = @CFLAGS@