Add two patches from CVS:

- allow deletions in the middle of a hash_enumerate
- typo

Posted by Jukka Salmi on tech-pkg@.

While at it add a knob for changing cyrus' default idle method.

# CYRUS_IDLE
# use METHOD for IMAP IDLE
# METHOD is poll, idled or no
# Default: not defined

(Idea from FreeBSD)

Bump PKGREVISION to 2.

6 files changed, 70 insertions, 5 deletions

diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 25b44f41f4c..62843cdad7d 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/05/27 05:09:04 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/27 09:28:16 recht Exp $
 
 DISTNAME=	cyrus-imapd-2.2.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
@@ -82,6 +82,26 @@ CONFIGURE_ENV+=		COMPILE_ET=${COMERRBASE}/bin/compile_et
 CONFIGURE_ARGS+=	--with-com-err=yes
 .endif
 
+# use METHOD for IMAP IDLE
+# METHOD is poll, idled or no
+# Default: not defined
+# (== poll)
+.if defined(CYRUS_IDLE)
+.  if ${CYRUS_IDLE} != "poll" && ${CYRUS_IDLE} != "idled"	\
+	&& ${CYRUS_IDLE} != "no"
+PKG_FAIL_REASON+=	"CYRUS_IDLE must be poll, idled or no"
+.  endif
+CONFIGURE_ARGS+=	--with-idle=${CYRUS_IDLE}
+.  if ${CYRUS_IDLE} == "idled"
+PLIST_SUBST+=	IDLED=
+.  else
+PLIST_SUBST+=	IDLED="@comment "
+.  endif
+.else
+PLIST_SUBST+=	IDLED="@comment "
+.endif
+BUILD_DEFS+=	CYRUS_IDLE
+
 MAKEFLAGS+=		PERL=${PERL5}
 
 HTMLDIR=		${PREFIX}/share/doc/html/cyrus-imapd
diff --git a/mail/cyrus-imapd22/PLIST b/mail/cyrus-imapd22/PLIST
index a844d5765b6..f23e67f4c58 100644
--- a/mail/cyrus-imapd22/PLIST
+++ b/mail/cyrus-imapd22/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/27 05:09:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/05/27 09:28:16 recht Exp $
 bin/imtest
 bin/installsieve
 bin/lmtptest
@@ -19,6 +19,7 @@ cyrus/bin/cyrdump
 cyrus/bin/deliver
 cyrus/bin/fetchnews
 cyrus/bin/fud
+${IDLED}cyrus/bin/idled
 cyrus/bin/imapd
 cyrus/bin/ipurge
 cyrus/bin/lmtpd
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index 3c48f7d1200..58458c881af 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/05/27 04:42:46 jlam Exp $
+$NetBSD: distinfo,v 1.5 2004/05/27 09:28:16 recht Exp $
 
 SHA1 (cyrus-imapd-2.2.4.tar.gz) = 05c12b65c02e2b785b0c51ec604c6b0d91817167
 Size (cyrus-imapd-2.2.4.tar.gz) = 1927519 bytes
@@ -12,3 +12,5 @@ SHA1 (patch-ai) = 4b9d3cca6d48af708d19c105d01477b22bbcba93
 SHA1 (patch-ak) = 41e84dce4b633072ec4510b9ab237a8ecf538a2f
 SHA1 (patch-al) = a0e4d20bd11bf78f6ed2e8ee9e3cc7b8d7ba35c1
 SHA1 (patch-am) = eaf329864c74f4bc4df499c81024ab89a4eda712
+SHA1 (patch-ba) = a3c1a044e45a1495c49eff6661092b297ba6b5e3
+SHA1 (patch-bb) = 1124139a0c79f9d52b5decef00de77eb2aba3505
diff --git a/mail/cyrus-imapd22/patches/patch-ba b/mail/cyrus-imapd22/patches/patch-ba
new file mode 100644
index 00000000000..c83a0f2108a
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2004/05/27 09:28:16 recht Exp $
+
+--- imap/lmtpd.c.orig	2004-03-11 15:59:12.000000000 +0100
++++ imap/lmtpd.c	2004-05-27 11:08:51.000000000 +0200
+@@ -97,7 +97,7 @@
+ /* forward declarations */
+ static int deliver(message_data_t *msgdata, char *authuser,
+ 		   struct auth_state *authstate);
+-static int verify_user(const char *user, const char *domain, const char *mailhox,
++static int verify_user(const char *user, const char *domain, const char *mailbox,
+ 		       long quotacheck,
+ 		       struct auth_state *authstate);
+ static char *generate_notify(message_data_t *m);
diff --git a/mail/cyrus-imapd22/patches/patch-bb b/mail/cyrus-imapd22/patches/patch-bb
new file mode 100644
index 00000000000..d1174994f44
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-bb
@@ -0,0 +1,24 @@
+$NetBSD: patch-bb,v 1.1 2004/05/27 09:28:16 recht Exp $
+
+--- lib/hash.c.orig	2003-10-22 20:50:12.000000000 +0200
++++ lib/hash.c	2004-05-27 11:09:07.000000000 +0200
+@@ -300,7 +300,7 @@
+ 		    void *rock)
+ {
+       unsigned i;
+-      bucket *temp;
++      bucket *temp, *temp_next;
+ 
+       for (i=0;i<table->size; i++)
+       {
+@@ -308,8 +308,9 @@
+             {
+                   for (temp = (table->table)[i];
+                         NULL != temp;
+-                        temp = temp -> next)
++                        temp = temp_next)
+                   {
++			temp_next = temp->next;
+                         func(temp -> key, temp->data, rock);
+                   }
+             }
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index c658452ce68..9123e647359 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.243 2004/05/25 21:51:42 wiz Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.244 2004/05/27 09:28:15 recht Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -754,6 +754,11 @@ CUPS_USER?=	lp
 # Possible: any user name
 # Default: lp
 
+# CYRUS_IDLE
+# use METHOD for IMAP IDLE
+# METHOD is poll, idled or no
+# Default: not defined
+
 CYRUS_GROUP?=	mail
 # Used in cyrus-imapd, cyrus-imapd21, cyrus-sasl, and cyrus-sasl2 to
 # specify the group used for installing setuid programs.