update to 2.2.4

changes:

- Quota now uses the cyrusdb interface (quotalegacy by default).
- All incoming messages are now staged to disk before locking the
  destination mailbox (locks are no longer held during a network read).
- Fixed off-by-one error in fetchnews (articles are no longer skipped).
  nntpd now uses the Followup-To: header (if exists) instead of the
  Newsgroups: header when constructing post address(es) and adds them to
  the Reply-To: header instead of the To: header.
- Added berkeley_locks_max, berkeley_txns_max and berkeley_cachesize options.
- Added imapmagicplus option.
- Substantial work on afspts/ptloader canonicalization code
- Much improved LDAP ptloader code (no more internal OpenLDAP dependencies)
- Fixed a number of IPv6 related bugs

7 files changed, 31 insertions, 45 deletions

diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index e5b4a844034..bb0bbf7c0c1 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2004/04/20 15:54:02 recht Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/26 22:18:05 recht Exp $
 
-DISTNAME=	cyrus-imapd-2.2.3
-PKGREVISION=	2
+DISTNAME=	cyrus-imapd-2.2.4
 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 30ab51f8f1e..a3c76fc88dc 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.2 2004/04/20 15:54:02 recht Exp $
+$NetBSD: distinfo,v 1.3 2004/05/26 22:18:05 recht Exp $
 
-SHA1 (cyrus-imapd-2.2.3.tar.gz) = 782582f86a1970bf1cf54f3ed58adbdfca867dd4
-Size (cyrus-imapd-2.2.3.tar.gz) = 1887717 bytes
-SHA1 (patch-aa) = bd3f54b5589c3b5f176f6f19ced90cb49edeebd1
-SHA1 (patch-ac) = 08b2694fa3cc895d56d3bc5c89028b5343805709
+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) = 6cbb81899a2009d4c822ea00a52842a34132fed5
-SHA1 (patch-ag) = 28d2e26a6a3d2ee7d90a06f8b07daa9a15f29a58
+SHA1 (patch-af) = 44d961e76b76b7bb95379851207862dbc6800ed7
+SHA1 (patch-ag) = aa75c78b65ccae8244b36c68f97bca9bc2a34900
 SHA1 (patch-ah) = c419672788766583c61ceb0a9328aa398cda0f09
 SHA1 (patch-ai) = 4b9d3cca6d48af708d19c105d01477b22bbcba93
-SHA1 (patch-ak) = b607ef81063c7b05b6768ca58b8d2b44a1d4a070
+SHA1 (patch-ak) = 41e84dce4b633072ec4510b9ab237a8ecf538a2f
 SHA1 (patch-al) = a0e4d20bd11bf78f6ed2e8ee9e3cc7b8d7ba35c1
diff --git a/mail/cyrus-imapd22/patches/patch-aa b/mail/cyrus-imapd22/patches/patch-aa
deleted file mode 100644
index 7540f45e0dd..00000000000
--- a/mail/cyrus-imapd22/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/04/20 15:54:02 recht Exp $
-
---- lib/auth_krb5.c.orig	2004-04-20 17:50:47.000000000 +0200
-+++ lib/auth_krb5.c	2004-04-20 17:51:13.000000000 +0200
-@@ -74,6 +74,7 @@
- 
-     if (strcmp(identifier,"anyone") == 0) return 1;
-     if (!auth_state && !strcmp(identifier, "anonymous")) return 3;
-+    else if(!auth_state) return 0;
-     if (strcmp(identifier,auth_state->userid) == 0) return 3;
-     if (strcmp(auth_state->userid,"anonymous") == 0) return 0;
- 
diff --git a/mail/cyrus-imapd22/patches/patch-ac b/mail/cyrus-imapd22/patches/patch-ac
index b98b6e5fe06..284d83d978c 100644
--- a/mail/cyrus-imapd22/patches/patch-ac
+++ b/mail/cyrus-imapd22/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+$NetBSD: patch-ac,v 1.2 2004/05/26 22:18:05 recht Exp $
 
---- imap/imapd.c~	2003-10-24 20:24:05.000000000 +0200
-+++ imap/imapd.c	2003-11-03 11:08:40.000000000 +0100
-@@ -5858,7 +5858,7 @@
+--- 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];
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
      struct buf tag, cmd, tmp, user;
      int r = 0;
  
-@@ -5973,7 +5973,7 @@
+@@ -6131,7 +6131,7 @@
  		   char *mailbox, char *acl_in) 
  {
      int r = 0;
diff --git a/mail/cyrus-imapd22/patches/patch-af b/mail/cyrus-imapd22/patches/patch-af
index 506e9f87c5d..36c06d4cbb8 100644
--- a/mail/cyrus-imapd22/patches/patch-af
+++ b/mail/cyrus-imapd22/patches/patch-af
@@ -1,17 +1,17 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+$NetBSD: patch-af,v 1.2 2004/05/26 22:18:05 recht Exp $
 
---- configure~	2004-01-15 15:36:50.000000000 +0100
-+++ configure	2004-01-15 23:03:32.000000000 +0100
+--- 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_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_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_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.
-@@ -13187,6 +13187,8 @@
+@@ -13183,6 +13183,8 @@
      EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
@@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
  fi
  
  if test "$sievedir" != "no"; then
-@@ -14660,6 +14662,7 @@
+@@ -14657,6 +14659,7 @@
  s,@LIB_SASL@,$LIB_SASL,;t t
  s,@SASLFLAGS@,$SASLFLAGS,;t t
  s,@PERL@,$PERL,;t t
diff --git a/mail/cyrus-imapd22/patches/patch-ag b/mail/cyrus-imapd22/patches/patch-ag
index cb4c25b332d..ff190eca898 100644
--- a/mail/cyrus-imapd22/patches/patch-ag
+++ b/mail/cyrus-imapd22/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+$NetBSD: patch-ag,v 1.2 2004/05/26 22:18:05 recht Exp $
 
---- sieve/Makefile.in~	2003-11-12 05:02:12.000000000 +0100
-+++ sieve/Makefile.in	2004-01-15 23:05:12.000000000 +0100
+--- 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.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+ CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
 -CFLAGS = @CFLAGS@
 +CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
  LDFLAGS = @LDFLAGS@
diff --git a/mail/cyrus-imapd22/patches/patch-ak b/mail/cyrus-imapd22/patches/patch-ak
index da2dcd50a6a..78f6457ec31 100644
--- a/mail/cyrus-imapd22/patches/patch-ak
+++ b/mail/cyrus-imapd22/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+$NetBSD: patch-ak,v 1.2 2004/05/26 22:18:05 recht Exp $
 
---- imap/ctl_cyrusdb.c~	2003-10-22 20:50:07.000000000 +0200
-+++ imap/ctl_cyrusdb.c	2003-11-03 11:09:25.000000000 +0100
-@@ -226,9 +226,9 @@
+--- 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);
@@ -14,7 +14,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
  
      syslog(LOG_NOTICE, "%s", msg);
  
-@@ -273,6 +273,7 @@
+@@ -274,6 +274,7 @@
  		struct dirent *dirent;
  
  		tail = backup2 + strlen(backup2);
@@ -22,7 +22,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
  
  		/* remove db.backup2 */
  		dirp = opendir(backup2);
-@@ -286,7 +287,7 @@
+@@ -287,7 +288,7 @@
  
  		    closedir(dirp);
  		}