update to 2.2.5

Changes to the Cyrus IMAP Server since 2.2.4
- Bug fixed in hash table code that could sometimes cause crashes with
  the quotalegacy database
- Net-SNMP compatibility
- Significantly improved com_err detection
- Assorted minor NNTP improvements
- Assorted other minor bugfixes

13 files changed, 23 insertions, 213 deletions

diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 62843cdad7d..ac455140143 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2004/05/27 09:28:16 recht Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/28 23:02:02 recht Exp $
 
-DISTNAME=	cyrus-imapd-2.2.4
-PKGREVISION=	2
+DISTNAME=	cyrus-imapd-2.2.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index 58458c881af..3ef149dba68 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1,16 +1,7 @@
-$NetBSD: distinfo,v 1.5 2004/05/27 09:28:16 recht Exp $
+$NetBSD: distinfo,v 1.6 2004/05/28 23:02:02 recht Exp $
 
-SHA1 (cyrus-imapd-2.2.4.tar.gz) = 05c12b65c02e2b785b0c51ec604c6b0d91817167
-Size (cyrus-imapd-2.2.4.tar.gz) = 1927519 bytes
-SHA1 (patch-ac) = b3b0cd824ce4d27113a1602e460708de0d8c4343
-SHA1 (patch-ad) = 61fdf605f77d8b08190146d3e3ae3932114a8dee
-SHA1 (patch-ae) = 0b07e9f2a66e0c10ee9d19b307201d22a794cf3c
-SHA1 (patch-af) = 44d961e76b76b7bb95379851207862dbc6800ed7
-SHA1 (patch-ag) = aa75c78b65ccae8244b36c68f97bca9bc2a34900
-SHA1 (patch-ah) = c419672788766583c61ceb0a9328aa398cda0f09
-SHA1 (patch-ai) = 4b9d3cca6d48af708d19c105d01477b22bbcba93
-SHA1 (patch-ak) = 41e84dce4b633072ec4510b9ab237a8ecf538a2f
+SHA1 (cyrus-imapd-2.2.5.tar.gz) = a93c1ba66630146c3c0d69ed51739c315e09aa6a
+Size (cyrus-imapd-2.2.5.tar.gz) = 1931138 bytes
+SHA1 (patch-af) = a14b9618c107fed484da8675b3787b0a36fd95e8
 SHA1 (patch-al) = a0e4d20bd11bf78f6ed2e8ee9e3cc7b8d7ba35c1
-SHA1 (patch-am) = eaf329864c74f4bc4df499c81024ab89a4eda712
-SHA1 (patch-ba) = a3c1a044e45a1495c49eff6661092b297ba6b5e3
-SHA1 (patch-bb) = 1124139a0c79f9d52b5decef00de77eb2aba3505
+SHA1 (patch-am) = 894063a567fa61a541bbf3b57b6f9c0936dc6f5d
diff --git a/mail/cyrus-imapd22/patches/patch-ac b/mail/cyrus-imapd22/patches/patch-ac
deleted file mode 100644
index 284d83d978c..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/05/26 22:18:05 recht Exp $
-
---- imap/imapd.c.orig	2004-05-06 20:46:21.000000000 +0200
-+++ imap/imapd.c	2004-05-26 23:55:18.000000000 +0200
-@@ -6016,7 +6016,7 @@
- {
-     int i=0, j=0;
-     char tagbuf[128];
--    char c;
-+    int c;
-     struct buf tag, cmd, tmp, user;
-     int r = 0;
- 
-@@ -6131,7 +6131,7 @@
- 		   char *mailbox, char *acl_in) 
- {
-     int r = 0;
--    char c;
-+    int c;
-     char tag[128];
-     int tagnum = 1;
-     char *rights, *nextid;
diff --git a/mail/cyrus-imapd22/patches/patch-ad b/mail/cyrus-imapd22/patches/patch-ad
deleted file mode 100644
index 503070cc854..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
-
---- imap/mbpath.c.orig	2003-02-13 21:32:58.000000000 +0100
-+++ imap/mbpath.c	2003-07-26 16:28:49.000000000 +0200
-@@ -89,7 +89,7 @@
- {
-   char *path;
-   int rc, i, quiet = 0, stop_on_error=0;
--  char opt;
-+  int opt;
-   char *alt_config = NULL;
- 
-   while ((opt = getopt(argc, argv, "C:qs")) != EOF) {
diff --git a/mail/cyrus-imapd22/patches/patch-ae b/mail/cyrus-imapd22/patches/patch-ae
deleted file mode 100644
index ffe15b10668..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
-
---- imap/ipurge.c~	2003-11-20 19:47:46.000000000 +0100
-+++ imap/ipurge.c	2004-01-15 23:04:30.000000000 +0100
-@@ -109,7 +109,7 @@
- void print_stats(mbox_stats_t *stats);
- 
- int main (int argc, char *argv[]) {
--  char option;
-+  int option;
-   char buf[MAX_MAILBOX_PATH+1];
-   char *alt_config = NULL;
-   int r;
diff --git a/mail/cyrus-imapd22/patches/patch-af b/mail/cyrus-imapd22/patches/patch-af
index 36c06d4cbb8..fdf5b21a460 100644
--- a/mail/cyrus-imapd22/patches/patch-af
+++ b/mail/cyrus-imapd22/patches/patch-af
@@ -1,30 +1,12 @@
-$NetBSD: patch-af,v 1.2 2004/05/26 22:18:05 recht Exp $
+$NetBSD: patch-af,v 1.3 2004/05/28 23:02:02 recht Exp $
 
---- configure.orig	2004-05-16 23:05:03.000000000 +0200
-+++ configure	2004-05-27 00:02:06.000000000 +0200
-@@ -308,7 +308,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -13183,6 +13183,8 @@
+--- configure.orig	2004-05-29 00:53:27.000000000 +0200
++++ configure	2004-05-29 00:54:00.000000000 +0200
+@@ -13502,6 +13502,7 @@
      EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
 +    eval `${PERL} -V:cccdlflags`
-+    PERL_CCCDLFLAGS="$cccdlflags"
- fi
+     PERL_CCCDLFLAGS="$cccdlflags"
  
- if test "$sievedir" != "no"; then
-@@ -14657,6 +14659,7 @@
- s,@LIB_SASL@,$LIB_SASL,;t t
- s,@SASLFLAGS@,$SASLFLAGS,;t t
- s,@PERL@,$PERL,;t t
-+s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
- s,@MD5OBJ@,$MD5OBJ,;t t
- s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
- s,@LIB_WRAP@,$LIB_WRAP,;t t
+ fi
diff --git a/mail/cyrus-imapd22/patches/patch-ag b/mail/cyrus-imapd22/patches/patch-ag
deleted file mode 100644
index ff190eca898..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/05/26 22:18:05 recht Exp $
-
---- sieve/Makefile.in.orig	2004-03-11 16:25:35.000000000 +0100
-+++ sieve/Makefile.in	2004-05-26 23:59:02.000000000 +0200
-@@ -38,7 +38,7 @@
- 
- DEFS = @DEFS@
- CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
- 
- MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd22/patches/patch-ah b/mail/cyrus-imapd22/patches/patch-ah
deleted file mode 100644
index 1bd0f81a1c8..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
-
---- perl/sieve/lib/Makefile.in.orig	2003-02-11 15:17:40.000000000 +0100
-+++ perl/sieve/lib/Makefile.in	2003-07-26 16:30:58.000000000 +0200
-@@ -55,8 +55,8 @@
- IMAP_LIBS = @IMAP_LIBS@
- DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
- 
--CFLAGS = -g
--LDFLAGS = -g @LDFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
-+LDFLAGS = @LDFLAGS@
- 
- SHELL = /bin/sh
- MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd22/patches/patch-ai b/mail/cyrus-imapd22/patches/patch-ai
deleted file mode 100644
index df0b7160c2f..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
-
---- lib/Makefile.in.orig	2003-07-14 18:01:55.000000000 +0200
-+++ lib/Makefile.in	2003-07-26 16:31:15.000000000 +0200
-@@ -60,7 +60,7 @@
- CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- 
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
- 
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd22/patches/patch-ak b/mail/cyrus-imapd22/patches/patch-ak
deleted file mode 100644
index 78f6457ec31..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ak
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2004/05/26 22:18:05 recht Exp $
-
---- imap/ctl_cyrusdb.c.orig	2004-01-26 18:46:54.000000000 +0100
-+++ imap/ctl_cyrusdb.c	2004-05-26 23:57:04.000000000 +0200
-@@ -227,9 +227,9 @@
- 
-     /* create the names of the backup directories */
-     strcpy(backup1, dirname);
--    strcat(backup1, ".backup1/");
-+    strcat(backup1, ".backup1");
-     strcpy(backup2, dirname);
--    strcat(backup2, ".backup2/");
-+    strcat(backup2, ".backup2");
- 
-     syslog(LOG_NOTICE, "%s", msg);
- 
-@@ -274,6 +274,7 @@
- 		struct dirent *dirent;
- 
- 		tail = backup2 + strlen(backup2);
-+		*tail++ = '/';
- 
- 		/* remove db.backup2 */
- 		dirp = opendir(backup2);
-@@ -287,7 +288,7 @@
- 
- 		    closedir(dirp);
- 		}
--		*tail = '\0';
-+		tail[-1] = '\0';
- 		r2 = rmdir(backup2);
- 
- 		/* move db.backup1 to db.backup2 */
diff --git a/mail/cyrus-imapd22/patches/patch-am b/mail/cyrus-imapd22/patches/patch-am
index d66e7b8a061..bb42583313e 100644
--- a/mail/cyrus-imapd22/patches/patch-am
+++ b/mail/cyrus-imapd22/patches/patch-am
@@ -1,16 +1,13 @@
-$NetBSD: patch-am,v 1.1 2004/05/27 04:42:46 jlam Exp $
+$NetBSD: patch-am,v 1.2 2004/05/28 23:02:02 recht Exp $
 
---- configure.in.orig	Tue Mar  9 13:08:38 2004
-+++ configure.in
-@@ -924,6 +924,11 @@
- dnl and compile perl/cyradm
-     PERL_SUBDIRS="imap"
-     PERL="${with_perl}"
-+dnl add perl cccdlflags when building libraries -- this ensures that the
-+dnl libraries will be compiled as PIC if perl requires PIC objects
+--- configure.in.orig	2004-05-29 00:51:15.000000000 +0200
++++ configure.in	2004-05-29 00:52:04.000000000 +0200
+@@ -933,7 +933,7 @@
+ dnl add perl cccdlflags when building libraries -- this ensures that the
+ dnl libraries will be compiled as PIC if perl requires PIC objects
+ dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
+-dnl    eval `${PERL} -V:cccdlflags`
 +    eval `${PERL} -V:cccdlflags`
-+    PERL_CCCDLFLAGS="$cccdlflags"
-+    AC_SUBST(PERL_CCCDLFLAGS)
+     PERL_CCCDLFLAGS="$cccdlflags"
+     AC_SUBST(PERL_CCCDLFLAGS)
  fi
- 
- dnl for timsieved
diff --git a/mail/cyrus-imapd22/patches/patch-ba b/mail/cyrus-imapd22/patches/patch-ba
deleted file mode 100644
index c83a0f2108a..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index d1174994f44..00000000000
--- a/mail/cyrus-imapd22/patches/patch-bb
+++ /dev/null
@@ -1,24 +0,0 @@
-$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);
-                   }
-             }