Update "imap-uw" package to version 2002.1rc1 (0212051126 snapshot of

version 2002a). This version fixes a buffer overflow described
in Cert Vulnerability Note VU#961489.

10 files changed, 178 insertions, 98 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 7bcbb32717e..7006fae431e 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2002/10/30 12:00:49 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2002/12/11 12:21:21 tron Exp $
 
-DISTNAME=       imap-2001a
-PKGNAME=        imap-uw-2001.1
-PKGREVISION=	2
+DISTNAME=       imap-2002a.DEV.SNAP-0212051126
+PKGNAME=        imap-uw-2002.1rc1
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
diff --git a/mail/imap-uw/PLIST b/mail/imap-uw/PLIST
index 3534ef6d5c9..93f50d02e3b 100644
--- a/mail/imap-uw/PLIST
+++ b/mail/imap-uw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/15 08:30:26 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/11 12:21:21 tron Exp $
 include/c-client/c-client.h
 include/c-client/env.h
 include/c-client/env_unix.h
@@ -42,13 +42,20 @@ sbin/mtest
 sbin/rimapd
 share/doc/imap-uw/BUILD
 share/doc/imap-uw/CONFIG
-share/doc/imap-uw/FAQ
+share/doc/imap-uw/FAQ.txt
+share/doc/imap-uw/FAQ.html
 share/doc/imap-uw/RELNOTES
 share/doc/imap-uw/SSLBUILD
 share/doc/imap-uw/Y2K
 share/doc/imap-uw/bugs.txt
 share/doc/imap-uw/calendar.txt
 share/doc/imap-uw/commndmt.txt
+share/doc/imap-uw/draft/imapbase.txt
+share/doc/imap-uw/draft/sort.txt
+share/doc/imap-uw/draft/thread.txt
+share/doc/imap-uw/draft/README
+share/doc/imap-uw/draft/binary.txt
+share/doc/imap-uw/draft/multapnd.txt
 share/doc/imap-uw/drivers.txt
 share/doc/imap-uw/formats.txt
 share/doc/imap-uw/imaprc.txt
@@ -78,6 +85,9 @@ share/doc/imap-uw/rfc/rfc2342.txt
 share/doc/imap-uw/rfc/rfc2359.txt
 share/doc/imap-uw/rfc/rfc2595.txt
 share/doc/imap-uw/rfc/rfc2683.txt
+share/doc/imap-uw/rfc/rfc2971.txt
+share/doc/imap-uw/rfc/rfc3348.txt
 @dirrm share/doc/imap-uw/rfc
+@dirrm share/doc/imap-uw/draft
 @dirrm share/doc/imap-uw
 @dirrm include/c-client
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 576f141bfe4..872f8446773 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.7 2002/10/30 02:12:45 elric Exp $
+$NetBSD: distinfo,v 1.8 2002/12/11 12:21:21 tron Exp $
 
-SHA1 (imap-2001a.tar.Z) = 505ea704159846cc79e517d719d10bef94e2dc88
-Size (imap-2001a.tar.Z) = 1959777 bytes
+SHA1 (imap-2002a.DEV.SNAP-0212051126.tar.Z) = 83517cc8d9d69b277619f58e6b713d53654e73f3
+Size (imap-2002a.DEV.SNAP-0212051126.tar.Z) = 2165172 bytes
+SHA1 (patch-aa) = e9c0e8f2ded2fec60e507d0aace9a4f7e0af1820
+SHA1 (patch-ab) = f2f988c7b25d694ca6df3a45fc79192d3d5ed7a8
+SHA1 (patch-ac) = 8b4ea8c15929c65eda1b3444c68fdbf70fa68b6a
+SHA1 (patch-ad) = 3404de4e4acb456e3c7b34ca80b31b80b465b3e1
+SHA1 (patch-ae) = 702473377ca66266bdb6d5d13045d279a38ea7de
 SHA1 (patch-ai) = aaa778f60684c797cc53a109b8430fa05ec7f424
-SHA1 (patch-aj) = 6eabb86e3c678c1dc324ae70e2adfc4b442ec843
+SHA1 (patch-aj) = 3e56f0910ecd6eb50cad7855908c8ff90a889d88
 SHA1 (patch-ak) = a0a1a21ec22a92d086e665b263b51532207d0e3c
-SHA1 (patch-al) = 1c753388fe7bbd0f885cf240c06fd328926211a0
+SHA1 (patch-al) = ea40f48394df229c03b028eb58d915b5dc5e162b
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
new file mode 100644
index 00000000000..d004576cef9
--- /dev/null
+++ b/mail/imap-uw/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.11 2002/12/11 12:21:23 tron Exp $
+
+--- Makefile.orig	Tue Nov  5 01:19:13 2002
++++ Makefile	Wed Dec 11 12:21:53 2002
+@@ -396,9 +396,9 @@
+ 	@echo + In order to rectify this problem, you MUST build with:
+ 	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
+ 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+-	@echo
+-	@echo Do you want to continue this build anyway?  Type y or n please:
+-	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
++#	@echo
++#	@echo Do you want to continue this build anyway?  Type y or n please:
++#	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
+ 
+ sslnone:
+ 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
new file mode 100644
index 00000000000..346569f74f5
--- /dev/null
+++ b/mail/imap-uw/patches/patch-ab
@@ -0,0 +1,72 @@
+$NetBSD: patch-ab,v 1.9 2002/12/11 12:21:23 tron Exp $
+
+--- src/osdep/unix/Makefile.orig	Wed Dec 11 12:15:02 2002
++++ src/osdep/unix/Makefile	Wed Dec 11 12:18:05 2002
+@@ -28,8 +28,6 @@
+ 
+ # Extended flags needed for SSL.  You may need to modify.
+ 
+-SSLDIR=/usr/local/ssl
+-SSLCERTS=$(SSLDIR)/certs
+ SSLINCLUDE=$(SSLDIR)/include
+ SSLLIB=$(SSLDIR)/lib
+ 
+@@ -46,7 +44,7 @@
+ 
+ SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
+  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\"
+-SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
++SSLLDFLAGS= -lssl $(SSLCRYPTO) $(SSLRSA)
+ 
+ 
+ # Extended flags needed for non-standard passwd types.  You may need to modify.
+@@ -90,14 +88,14 @@
+ # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
+ # formats can never be empty files.
+ 
+-CREATEPROTO=unixproto
++#CREATEPROTO=unixproto
+ EMPTYPROTO=unixproto
+ 
+ 
+ # Commands possibly overriden by the individual port
+ 
+ ARRC=ar rc
+-CC=cc
++#CC=cc
+ LN=ln -s
+ RANLIB=ranlib
+ 
+@@ -380,9 +378,9 @@
+ 	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
+ 	 ACTIVEFILE=/usr/share/news/active \
+ 	 RSHPATH=/usr/bin/rsh \
+-	 BASECFLAGS="-g -O2" \
++	 BASECFLAGS="-O2" \
+ 	 BASELDFLAGS="-lsocket -lnsl -lgen" \
+-	 RANLIB=true CC=gcc
++	 RANLIB=true
+ 
+ gsu:	# GCC SUN-OS
+ 	$(BUILD) `$(CAT) SPECIALS` OS=sun \
+@@ -472,9 +470,9 @@
+ 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
+ 	 CRXTYPE=nfs \
+ 	 SPOOLDIR=/var \
+-	 ACTIVEFILE=/var/db/news/active \
++	 ACTIVEFILE=/var/news/db/active \
+ 	 RSHPATH=/usr/bin/rsh \
+-	 BASECFLAGS="-g -O -pipe" \
++	 BASECFLAGS="-O -pipe" \
+ 	 BASELDFLAGS="-lcrypt"
+ 
+ nec:	# NEC UX
+@@ -876,7 +874,7 @@
+ 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+-	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++	echo "$(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`cat LDFLAGS\`" > ARCHIVE
+ 	echo $(OS) > OSTYPE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
+ 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff --git a/mail/imap-uw/patches/patch-ac b/mail/imap-uw/patches/patch-ac
new file mode 100644
index 00000000000..1e176aebbc7
--- /dev/null
+++ b/mail/imap-uw/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5 2002/12/11 12:21:23 tron Exp $
+
+--- src/mailutil/Makefile.orig	Tue Nov 19 01:41:46 2002
++++ src/mailutil/Makefile	Wed Dec 11 12:34:19 2002
+@@ -19,7 +19,7 @@
+ 
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/libc-client.la
+ SHELL = /bin/sh
+ 
+ # Get local definitions from c-client directory
diff --git a/mail/imap-uw/patches/patch-ad b/mail/imap-uw/patches/patch-ad
new file mode 100644
index 00000000000..54a27808953
--- /dev/null
+++ b/mail/imap-uw/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.5 2002/12/11 12:21:24 tron Exp $
+
+--- src/dmail/Makefile.orig	Tue Nov 19 01:43:31 2002
++++ src/dmail/Makefile	Wed Dec 11 12:34:22 2002
+@@ -18,7 +18,7 @@
+ 
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/libc-client.la
+ SHELL = /bin/sh
+ 
+ # Get local definitions from c-client directory
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
new file mode 100644
index 00000000000..dea4c804fb0
--- /dev/null
+++ b/mail/imap-uw/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.15 2002/12/11 12:21:24 tron Exp $
+
+--- src/tmail/Makefile.orig	Tue Nov 19 01:45:14 2002
++++ src/tmail/Makefile	Wed Dec 11 12:34:26 2002
+@@ -18,7 +18,7 @@
+ 
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/libc-client.la
+ SHELL = /bin/sh
+ 
+ # Get local definitions from c-client directory
diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj
index ac3eade6d21..12abd01187b 100644
--- a/mail/imap-uw/patches/patch-aj
+++ b/mail/imap-uw/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.8 2002/10/30 02:12:45 elric Exp $
+$NetBSD: patch-aj,v 1.9 2002/12/11 12:21:25 tron Exp $
 
 --- src/osdep/unix/Makefile.gss.orig	Wed Oct 23 17:23:36 2002
 +++ src/osdep/unix/Makefile.gss	Wed Oct 23 17:41:19 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-aj,v 1.8 2002/10/30 02:12:45 elric Exp $
  # Extended flags needed for additional authenticators.  You may need to modify.
  
 -GSSDIR=/usr/local
--GSSCFLAGS= -I$(GSSDIR)/include
+-GSSCFLAGS= -I$(GSSDIR)/include -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name
 -GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
 -GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
 -
@@ -27,73 +27,3 @@ $NetBSD: patch-aj,v 1.8 2002/10/30 02:12:45 elric Exp $
 +gss:
 +	echo "-I/usr/include/krb5" >> OSCFLAGS
 +	echo "-lgssapi -lkrb5 -lasn1 -lcrypto -lcom_err -lroken" >> LDFLAGS
---- src/osdep/unix/Makefile.orig	Wed Oct 23 17:53:35 2002
-+++ src/osdep/unix/Makefile	Wed Oct 23 18:10:34 2002
-@@ -28,8 +28,6 @@
- 
- # Extended flags needed for SSL.  You may need to modify.
- 
--SSLDIR=/usr/local/ssl
--SSLCERTS=$(SSLDIR)/certs
- SSLINCLUDE=$(SSLDIR)/include
- SSLLIB=$(SSLDIR)/lib
- 
-@@ -46,7 +44,7 @@
- 
- SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
-  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\"
--SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
-+SSLLDFLAGS= -lssl $(SSLCRYPTO) $(SSLRSA)
- 
- 
- # Extended flags needed for non-standard passwd types.  You may need to modify.
-@@ -90,14 +88,14 @@
- # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
- # formats can never be empty files.
- 
--CREATEPROTO=unixproto
-+#CREATEPROTO=unixproto
- EMPTYPROTO=unixproto
- 
- 
- # Commands possibly overriden by the individual port
- 
- ARRC=ar rc
--CC=cc
-+#CC=cc
- LN=ln -s
- RANLIB=ranlib
- 
-@@ -380,9 +378,9 @@
- 	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
- 	 ACTIVEFILE=/usr/share/news/active \
- 	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-g -O2" \
-+	 BASECFLAGS="-O2" \
- 	 BASELDFLAGS="-lsocket -lnsl -lgen" \
--	 RANLIB=true CC=gcc
-+	 RANLIB=true
- 
- gsu:	# GCC SUN-OS
- 	$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -472,9 +470,9 @@
- 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
- 	 CRXTYPE=nfs \
- 	 SPOOLDIR=/var \
--	 ACTIVEFILE=/var/db/news/active \
-+	 ACTIVEFILE=/var/news/db/active \
- 	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-g -O -pipe" \
-+	 BASECFLAGS="-O -pipe" \
- 	 BASELDFLAGS="-lcrypt"
- 
- nec:	# NEC UX
-@@ -871,7 +869,7 @@
- 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
- 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
- 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
--	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
-+	echo "$(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`cat LDFLAGS\`" > ARCHIVE
- 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
- 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
- 	$(LN) os_$(OS).h osdep.h
diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al
index d184c6effde..3c646f7c469 100644
--- a/mail/imap-uw/patches/patch-al
+++ b/mail/imap-uw/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1 2002/10/30 02:12:45 elric Exp $
+$NetBSD: patch-al,v 1.2 2002/12/11 12:21:25 tron Exp $
 
---- src/c-client/auth_gss.c.orig	Fri Sep 28 16:35:14 2001
-+++ src/c-client/auth_gss.c
+--- src/c-client/auth_gss.c.orig	Thu Nov 22 05:03:10 2001
++++ src/c-client/auth_gss.c	Wed Dec 11 12:13:50 2002
 @@ -18,9 +18,17 @@
   * CPYRIGHT, included with this Distribution.
   */
@@ -20,30 +20,38 @@ $NetBSD: patch-al,v 1.1 2002/10/30 02:12:45 elric Exp $
  
  long auth_gssapi_valid (void);
  long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,
-@@ -58,22 +66,21 @@ long auth_gssapi_valid (void)
+@@ -58,24 +66,28 @@
    krb5_context ctx;
    krb5_keytab kt;
    krb5_kt_cursor csr;
-+  if (krb5_init_context(&ctx))
-+    return NIL;
-   sprintf (tmp,"host@%s",mylocalhost ());
-   buf.length = strlen (buf.value = tmp) + 1;
++
++				/* make a context */
++  if (krb5_init_context (&ctx))
++   return NIL;
+ 				/* make service name */
+   sprintf (tmp,"%s@%s",(char *) mail_parameters (NIL,GET_SERVICENAME,NIL),
+ 	   mylocalhost ());
+   buf.length = strlen (buf.value = tmp);
  				/* see if can build a name */
-   if (gss_import_name (&smn,&buf,gss_nt_service_name,&name) != GSS_S_COMPLETE)
-     return NIL;			/* failed */
+   if (gss_import_name (&smn,&buf,GSS_C_NT_HOSTBASED_SERVICE,&name) !=
+-      GSS_S_COMPLETE) return NIL;
 -				/* make a context */
 -  if (!krb5_init_context (&ctx)) {
++      GSS_S_COMPLETE) {
++    krb5_free_context (ctx);	/* finished with context */
++    return NIL;
++  }
  				/* get default keytab */
 -    if (!krb5_kt_default (ctx,&kt)) {
-+  if (!krb5_kt_default (ctx,&kt)) {
- 				/* can do server if have good keytab */
+-				/* can do server if have good keytab */
 -      if (!krb5_kt_start_seq_get (ctx,kt,&csr))
--	auth_gss.server = auth_gssapi_server;
++  if (!krb5_kt_default (ctx,&kt)) {
++			/* can do server if have good keytab */
++    if (!krb5_kt_start_seq_get (ctx,kt,&csr))
+ 	auth_gss.server = auth_gssapi_server;
 -      krb5_kt_close (ctx,kt);	/* finished with keytab */
 -    }
 -    krb5_free_context (ctx);	/* finished with context */
-+    if (!krb5_kt_start_seq_get (ctx,kt,&csr))
-+       auth_gss.server = auth_gssapi_server;
 +    krb5_kt_close (ctx,kt);	/* finished with keytab */
    }
 +  krb5_free_context (ctx);	/* finished with context */