Update to version 2.0.16

Changes to numerous to mention see the changes.html file.

8 files changed, 75 insertions, 100 deletions

diff --git a/mail/cyrus-imapd/patches/patch-aa b/mail/cyrus-imapd/patches/patch-aa
index 96220688232..0a08763533c 100644
--- a/mail/cyrus-imapd/patches/patch-aa
+++ b/mail/cyrus-imapd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2000/12/10 09:46:13 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2001/09/18 21:56:30 skrll Exp $
 
---- doc/html/install.html.orig	Thu Dec 30 16:07:24 1999
-+++ doc/html/install.html
-@@ -573,12 +573,12 @@
+--- doc/install-configure.html.orig	Thu Jul  5 16:47:39 2001
++++ doc/install-configure.html
+@@ -142,12 +142,12 @@
  </kbd></pre>
  
  <li>Change to the Cyrus user and use the tool
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.1 2000/12/10 09:46:13 jlam Exp $
  <pre>
  <kbd>   su cyrus
 -   tools/mkimap
-+   /usr/cyrus/bin/mkimap
++   mkimap
+    exit
  </kbd>
  </pre>
- 
diff --git a/mail/cyrus-imapd/patches/patch-ab b/mail/cyrus-imapd/patches/patch-ab
index 266da8fd245..b3c60127597 100644
--- a/mail/cyrus-imapd/patches/patch-ab
+++ b/mail/cyrus-imapd/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2000/12/10 09:46:13 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2001/09/18 21:56:30 skrll Exp $
 
---- installsieve/Makefile.in.orig	Thu Nov 11 13:30:16 1999
-+++ installsieve/Makefile.in
-@@ -28,7 +28,7 @@
- CC = @CC@
- 
- DEFS = @DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
+--- imap/Makefile.in.orig	Sat Jun 23 04:14:01 2001
++++ imap/Makefile.in
+@@ -65,7 +65,7 @@
+ CYRUS_GROUP=@cyrus_group@
  
+ DEFS = @DEFS@ @LOCALDEFS@
+-CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @ZEPHYR_CPPFLAGS@ @SASLFLAGS@
++CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @ZEPHYR_CPPFLAGS@ @SASLFLAGS@
+ IMAP_LIBS = @IMAP_LIBS@
+ SIEVE_LIBS = @SIEVE_LIBS@
+ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
diff --git a/mail/cyrus-imapd/patches/patch-ac b/mail/cyrus-imapd/patches/patch-ac
index ed51016a313..cc73b4928dd 100644
--- a/mail/cyrus-imapd/patches/patch-ac
+++ b/mail/cyrus-imapd/patches/patch-ac
@@ -1,13 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2000/12/10 09:46:13 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2001/09/18 21:56:30 skrll Exp $
 
---- timsieved/Makefile.in.orig	Thu Nov 11 13:30:04 1999
-+++ timsieved/Makefile.in
-@@ -34,7 +34,7 @@
- CYRUS_GROUP=@cyrus_group@
+--- imap/lmtpd.c.orig	Mon May 21 19:21:47 2001
++++ imap/lmtpd.c
+@@ -411,7 +411,12 @@
+     }
+ }
  
- DEFS = @DEFS@ @LOCALDEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
++#ifdef __NetBSD__
++#include <paths.h>
++#define DEFAULT_SENDMAIL (_PATH_SENDMAIL)
++#else
+ #define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#endif
+ #define DEFAULT_POSTMASTER ("postmaster")
  
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd/patches/patch-ad b/mail/cyrus-imapd/patches/patch-ad
index b3b0f3b354d..6b39b5b0b3b 100644
--- a/mail/cyrus-imapd/patches/patch-ad
+++ b/mail/cyrus-imapd/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2000/12/10 09:46:13 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2001/09/18 21:56:30 skrll Exp $
 
---- tools/mkimap.orig	Tue Jan  4 15:52:22 2000
+--- tools/mkimap.orig	Wed Jan 24 21:26:51 2001
 +++ tools/mkimap
-@@ -35,7 +35,7 @@
+@@ -74,7 +74,7 @@
  	$conf = $1;
  	print "i will configure directory $conf.\n";
      }
--    if (/^sieveuserhomedir:\s(1|t|yes|on)/) {
-+    if (/^sieveusehomedir:\s(1|t|yes|on)/) {
+-    if (/^sieveuserhomedir:\s+(1|t|yes|on)/) {
++    if (/^sieveusehomedir:\s+(1|t|yes|on)/) {
  	$nosievedir = 1;
  	print "you are storing sieve scripts in user's home directories.\n";
      }
diff --git a/mail/cyrus-imapd/patches/patch-ae b/mail/cyrus-imapd/patches/patch-ae
index 4804789c690..df3c6046640 100644
--- a/mail/cyrus-imapd/patches/patch-ae
+++ b/mail/cyrus-imapd/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/12/10 19:33:03 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2001/09/18 21:56:30 skrll Exp $
 
---- man/Makefile.in.orig	Mon Sep 27 13:24:48 1999
+--- man/Makefile.in.orig	Sun Jul 15 19:08:15 2001
 +++ man/Makefile.in
-@@ -52,7 +52,7 @@
+@@ -65,7 +65,7 @@
  MAN3 = $(srcdir)/imclient.3
- MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5
+ MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5
  MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \
 -	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
 +	$(srcdir)/fud.8 $(srcdir)/cyrus-imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
  	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
- 	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
- 
+ 	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/master.8 \
+ 	$(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \
diff --git a/mail/cyrus-imapd/patches/patch-af b/mail/cyrus-imapd/patches/patch-af
index c9ce9422116..4d71c44274b 100644
--- a/mail/cyrus-imapd/patches/patch-af
+++ b/mail/cyrus-imapd/patches/patch-af
@@ -1,10 +1,11 @@
-$NetBSD: patch-af,v 1.1 2000/12/10 19:33:03 jlam Exp $
+$NetBSD: patch-af,v 1.2 2001/09/18 21:56:31 skrll Exp $
 
---- man/imapd.conf.5.orig	Tue Dec 28 18:58:43 1999
+--- man/imapd.conf.5.orig	Sat Jun 23 02:01:50 2001
 +++ man/imapd.conf.5
-@@ -176,4 +176,4 @@
- 
+@@ -228,5 +228,5 @@
+ Unix domain socket that the new mail notification daemon listens on.
  .SH SEE ALSO
  .PP
--\fBimapd(8)\fR, \fBtimsieved(8)\fR, \fBdeliver(8)\fR
-+\fBcyrus-imapd(8)\fR, \fBtimsieved(8)\fR, \fBdeliver(8)\fR
+-\fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, \fBtimsieved(8)\fR,
++\fBcyrus-imapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, \fBtimsieved(8)\fR,
+ \fBidled(8)\fR, \fBdeliver(8)\fR, \fBmaster(8)\fR
diff --git a/mail/cyrus-imapd/patches/patch-ag b/mail/cyrus-imapd/patches/patch-ag
index 963dba1ed66..661f1f6cb40 100644
--- a/mail/cyrus-imapd/patches/patch-ag
+++ b/mail/cyrus-imapd/patches/patch-ag
@@ -1,17 +1,12 @@
-$NetBSD: patch-ag,v 1.1 2001/02/26 20:55:05 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2001/09/18 21:56:31 skrll Exp $
 
---- imap/deliver.c.orig	Tue May 16 22:18:18 2000
-+++ imap/deliver.c
-@@ -833,7 +833,12 @@
-     }
- }
+--- master/master.c.orig	Mon Jul 16 19:23:11 2001
++++ master/master.c
+@@ -84,6 +84,7 @@
+ #include <ucd-snmp/ucd-snmp-agent-includes.h>
  
-+#ifdef __NetBSD__
-+#include <paths.h>
-+#define SENDMAIL _PATH_SENDMAIL
-+#else
- #define SENDMAIL "/usr/lib/sendmail"
-+#endif
- #define POSTMASTER "postmaster"
+ #include "cyrusMasterMIB.h"
++int smux_listen_sd;
+ #endif
  
- static char *month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ #include "masterconf.h"
diff --git a/mail/cyrus-imapd/patches/patch-ah b/mail/cyrus-imapd/patches/patch-ah
index 9c914acdd53..3b3ecb513cf 100644
--- a/mail/cyrus-imapd/patches/patch-ah
+++ b/mail/cyrus-imapd/patches/patch-ah
@@ -1,45 +1,20 @@
-$NetBSD: patch-ah,v 1.1 2001/07/22 01:54:53 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2001/09/18 21:56:31 skrll Exp $
 
---- imap/quota.c.orig	Fri Aug 20 15:08:30 1999
-+++ imap/quota.c	Sat Jul 21 17:13:16 2001
-@@ -132,7 +132,7 @@
- int compare_quota(a, b)
- char *a, *b;
- {
--    return strcasecmp(((struct quotaentry *)a)->quota.root,
-+    return strcmp(((struct quotaentry *)a)->quota.root,
- 		      ((struct quotaentry *)b)->quota.root);
- }
+--- perl/sieve/Makefile.in.orig	Tue Dec 26 23:07:25 2000
++++ perl/sieve/Makefile.in
+@@ -63,6 +63,7 @@
  
-@@ -172,8 +172,8 @@
- 	    /* If restricting our list, see if this quota file matches */
- 	    if (nroots) {
- 		for (i = 0; i < nroots; i++) {
--		    if (!strcasecmp(dirent->d_name, roots[i]) ||
--			(!strncasecmp(dirent->d_name, roots[i], strlen(roots[i])) &&
-+		    if (!strcmp(dirent->d_name, roots[i]) ||
-+			(!strncmp(dirent->d_name, roots[i], strlen(roots[i])) &&
- 			 dirent->d_name[strlen(roots[i])] == '.')) break;
- 		}
- 		if (i == nroots) continue;
-@@ -231,7 +231,7 @@
-     int i, len, thisquota, thisquotalen;
+ SASL_LIB=@LIB_SASL@
+ SASL_INC=@SASLFLAGS@
++EXTRA_INC=@CPPFLAGS@ @COM_ERR_CPPFLAGS@
+ CC=@CC@
+ PERL=@PERL@
  
-     while (firstquota < quota_num &&
--	   strncasecmp(name, quota[firstquota].quota.root,
-+	   strncmp(name, quota[firstquota].quota.root,
- 		       strlen(quota[firstquota].quota.root)) > 0) {
- 	r = fixquota_finish(firstquota++);
- 	if (r) return r;
-@@ -240,9 +240,9 @@
-     thisquota = -1;
-     thisquotalen = 0;
-     for (i = firstquota;
--	 i < quota_num && strcasecmp(name, quota[i].quota.root) >= 0; i++) {
-+	 i < quota_num && strcmp(name, quota[i].quota.root) >= 0; i++) {
- 	len = strlen(quota[i].quota.root);
--	if (!strncasecmp(name, quota[i].quota.root, len) &&
-+	if (!strncmp(name, quota[i].quota.root, len) &&
- 	    (!name[len] || name[len] == '.')) {
- 	    quota[i].refcount++;
- 	    if (len > thisquotalen) {
+@@ -72,6 +73,7 @@
+ 		(cd $$d; echo "### Making" all "in" `pwd`;	\
+ 			if [ -f Makefile.PL ]; then \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
++			     EXTRA_INC="$(EXTRA_INC)" \
+ 			     $(PERL) Makefile.PL PREFIX=$(prefix); \
+ 			fi; \
+ 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \