Changes 2004:

* mailutil has three new commands: delete, rename, and prune
* IPv6 support now exists for UNIX and W2K
* The NNTP driver now supports NNTP SASL and TLS
* imapd now supports the LITERAL+ and SASL-IR initial-response extensions
* The IMAP driver has some additional checks to reduce the amount of network
  traffic, including executing "silly searches" (searches of sequence numbers
  only) locally
* The IMAP, POP, SMTP, and NNTP drivers now have diagnostic code to provide
  better information about servers which violate SASL's empty challenge
  requirements (e.g. with the PLAIN mechanism).
* There is a new mail_fetch_overview_sequence() function which is like
  mail_fetch_overview() but takes a sequence number string as an argument.
  There should have been a flags argument and FT_UID bit as in all the other
  mail_fetch_???() functions but compatibility with the past... :-(
* The overview_t callback (from mail_fetch_overview()) now has a fourth
  argument which contains the message sequence number (as opposed to the UID
  which is in the second argument).  It turned out that some applications were
  calling mail_msgno() (which can be moderately expensive) to get the sequence
  number, and c-client already knew it.
* Many declarations which are completely internal to a driver have been removed
  from the driver .h file, and in those cases where there are no external
  declarations left the .h file has been eliminated entirely.  As part of this,
  the mbox driver routines are now incorporated with the unix driver routines
  as opposed to being a separate file.  The mbox driver still needs to be lunk
  in order to get the mbox functionality.

8 files changed, 38 insertions, 38 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 769f783e0a0..0d5dc918af5 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.76 2004/04/22 21:31:22 ben Exp $
+# $NetBSD: Makefile,v 1.77 2004/05/13 18:14:34 adam Exp $
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
 # upgrade this package you *must* test it on a system *without* Kerberos
 # enabled before committing the changes.
 
-DISTNAME=       imap-2002e
-PKGNAME=        imap-uw-2002.5
-PKGREVISION=	3
+DISTNAME=       imap-2004
+PKGNAME=        imap-uw-2004
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -47,7 +46,7 @@ MAKE_ENV+=	GSS_EXTRA_LDFLAGS="-ldes"
 BUILD_DEFS+=	IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_NO_CLEARTEXT
 CCLIENT_INCS=	c-client.h env.h env_unix.h flocksim.h flstring.h	\
 		fs.h ftl.h imap4r1.h linkage.c linkage.h mail.h misc.h	\
-		netmsg.h newsrc.h nl.h nntp.h osdep.h pop3.h rfc822.h	\
+		netmsg.h newsrc.h nl.h nntp.h osdep.h rfc822.h		\
 		smtp.h tcp.h utf8.h
 CCLIENT_LIB=	libc-client.la
 CCLIENT_PICLIB=	libc-client_pic.a
diff --git a/mail/imap-uw/PLIST b/mail/imap-uw/PLIST
index 85821a382e6..77de8f13760 100644
--- a/mail/imap-uw/PLIST
+++ b/mail/imap-uw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/09/10 11:54:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/05/13 18:14:34 adam Exp $
 include/c-client/c-client.h
 include/c-client/env.h
 include/c-client/env_unix.h
@@ -16,7 +16,6 @@ include/c-client/newsrc.h
 include/c-client/nl.h
 include/c-client/nntp.h
 include/c-client/osdep.h
-include/c-client/pop3.h
 include/c-client/rfc822.h
 include/c-client/smtp.h
 include/c-client/tcp.h
@@ -45,6 +44,7 @@ share/doc/imap-uw/BUILD
 share/doc/imap-uw/CONFIG
 share/doc/imap-uw/FAQ.txt
 share/doc/imap-uw/FAQ.html
+share/doc/imap-uw/IPv6.txt
 share/doc/imap-uw/RELNOTES
 share/doc/imap-uw/SSLBUILD
 share/doc/imap-uw/Y2K
@@ -55,7 +55,6 @@ share/doc/imap-uw/draft/README
 share/doc/imap-uw/draft/compare.txt
 share/doc/imap-uw/draft/i18n.txt
 share/doc/imap-uw/draft/sort.txt
-share/doc/imap-uw/draft/unselect.txt
 share/doc/imap-uw/drivers.txt
 share/doc/imap-uw/formats.txt
 share/doc/imap-uw/imaprc.txt
@@ -90,6 +89,8 @@ share/doc/imap-uw/rfc/rfc3501.txt
 share/doc/imap-uw/rfc/rfc3502.txt
 share/doc/imap-uw/rfc/rfc3503.txt
 share/doc/imap-uw/rfc/rfc3516.txt
+share/doc/imap-uw/rfc/rfc3656.txt
+share/doc/imap-uw/rfc/rfc3691.txt
 @dirrm share/doc/imap-uw/rfc
 @dirrm share/doc/imap-uw/draft
 @dirrm share/doc/imap-uw
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index c47896b2f8d..96eb07c4bd7 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.15 2003/09/13 18:31:33 kim Exp $
+$NetBSD: distinfo,v 1.16 2004/05/13 18:14:34 adam Exp $
 
-SHA1 (imap-2002e.tar.Z) = d52749df111c31094a3a5003bb93752ea8fbeea0
-Size (imap-2002e.tar.Z) = 2157511 bytes
-SHA1 (patch-aa) = 84239c107b531b69e0f88eddfc7b58416d89c9c7
-SHA1 (patch-ab) = a18844f58641d9eee0f30c9333377cbe31adaea9
+SHA1 (imap-2004.tar.Z) = f8bacc27f784b4b84b3742056b8917394f156ffa
+Size (imap-2004.tar.Z) = 2220333 bytes
+SHA1 (patch-aa) = 2109d076b1f50ca461b2b2a00ee927207a64f766
+SHA1 (patch-ab) = 0dcd00a94a05bbf6730c3ea8be4200a6ad5b617f
 SHA1 (patch-ac) = 8b4ea8c15929c65eda1b3444c68fdbf70fa68b6a
 SHA1 (patch-ad) = 3404de4e4acb456e3c7b34ca80b31b80b465b3e1
 SHA1 (patch-ae) = 702473377ca66266bdb6d5d13045d279a38ea7de
 SHA1 (patch-af) = 07e6b95a8aea0ea0ee6ccc20c1906ddf16ef6d61
-SHA1 (patch-ai) = aaa778f60684c797cc53a109b8430fa05ec7f424
+SHA1 (patch-ai) = c495ed39fbc01e1d8b05f6acd3d11394978f9b43
 SHA1 (patch-aj) = 0a728d3b5271c048275a4d41002877e86ac275b2
 SHA1 (patch-ak) = a0a1a21ec22a92d086e665b263b51532207d0e3c
-SHA1 (patch-al) = c8593cfbb5822efa05fb1343bbf1e8bb4d7c035f
-SHA1 (patch-am) = 4537d1971ec4675889da9ef6d8c37af14ae7da75
+SHA1 (patch-al) = b746d36cb324114468d07d1aba7d22c5bd5b23b2
+SHA1 (patch-am) = e236acda47dc6ae0066a6bc2319b6c0f5804eb76
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index 6de3c8419d0..0795f12bbf4 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2003/09/10 11:54:42 adam Exp $
+$NetBSD: patch-aa,v 1.14 2004/05/13 18:14:34 adam Exp $
 
---- Makefile.orig	2003-07-15 03:17:18.000000000 +0200
+--- Makefile.orig	2004-04-27 19:56:49.000000000 +0000
 +++ Makefile
-@@ -424,9 +424,9 @@ sslunix sslsco:
+@@ -446,9 +446,9 @@ sslunix sslsco:
  	@echo + In order to rectify this problem, you MUST build with:
  	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index ffae53eaa44..ffd5009a134 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
+$NetBSD: patch-ab,v 1.13 2004/05/13 18:14:34 adam Exp $
 
---- src/osdep/unix/Makefile.orig	2003-09-10 13:18:31.000000000 +0200
+--- src/osdep/unix/Makefile.orig	2004-05-13 14:54:30.000000000 +0000
 +++ src/osdep/unix/Makefile
-@@ -28,8 +28,6 @@ SSLTYPE=nopwd
+@@ -29,8 +29,6 @@ IP=4
  
  # Extended flags needed for SSL.  You may need to modify.
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
  SSLKEYS=$(SSLCERTS)
  SSLINCLUDE=$(SSLDIR)/include
  SSLLIB=$(SSLDIR)/lib
-@@ -47,7 +45,7 @@ SSLRSA= # -lRSAglue -lrsaref
+@@ -48,7 +46,7 @@ SSLRSA= # -lRSAglue -lrsaref
  
  SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
   -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
  
  
  # Extended flags needed for non-standard passwd types.  You may need to modify.
-@@ -91,14 +89,14 @@ LOCKPGM=/etc/mlock
+@@ -92,14 +90,14 @@ LOCKPGM=/etc/mlock
  # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
  # formats can never be empty files.
  
@@ -37,7 +37,7 @@ $NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
  LN=ln -s
  RANLIB=ranlib
  
-@@ -381,9 +379,9 @@ gso:	# GCC Solaris
+@@ -391,9 +389,9 @@ gso:	os_sol.h	# GCC Solaris
  	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
  	 ACTIVEFILE=/usr/share/news/active \
  	 RSHPATH=/usr/bin/rsh \
@@ -49,7 +49,7 @@ $NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
  
  gsu:	# GCC SUN-OS
  	$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -473,9 +471,9 @@ neb:	# NetBSD
+@@ -483,9 +481,9 @@ neb:	# NetBSD
  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
  	 CRXTYPE=nfs \
  	 SPOOLDIR=/var \
@@ -61,7 +61,7 @@ $NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nec:	# NEC UX
-@@ -878,7 +876,7 @@ onceenv:
+@@ -908,7 +906,7 @@ onceenv:
  	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
  	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
diff --git a/mail/imap-uw/patches/patch-ai b/mail/imap-uw/patches/patch-ai
index d065d733b9f..bcd6c2bc8b8 100644
--- a/mail/imap-uw/patches/patch-ai
+++ b/mail/imap-uw/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2001/02/08 19:11:38 jlam Exp $
+$NetBSD: patch-ai,v 1.4 2004/05/13 18:14:34 adam Exp $
 
---- src/mtest/mtest.c.orig	Tue Oct 24 19:16:33 2000
+--- src/mtest/mtest.c.orig	2004-05-01 17:22:07.000000000 +0000
 +++ src/mtest/mtest.c
-@@ -36,6 +36,11 @@
+@@ -33,6 +33,11 @@
  
  /* Excellent reasons to hate ifdefs, and why my real code never uses them */
  
diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al
index 5ea5db92f78..dfa397ab5c8 100644
--- a/mail/imap-uw/patches/patch-al
+++ b/mail/imap-uw/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.4 2003/07/30 09:29:59 adam Exp $
+$NetBSD: patch-al,v 1.5 2004/05/13 18:14:34 adam Exp $
 
---- src/c-client/auth_gss.c.orig	2003-03-05 06:24:17.000000000 +0100
-+++ src/c-client/auth_gss.c	2003-07-30 10:54:54.000000000 +0200
+--- src/c-client/auth_gss.c.orig	2004-03-15 19:59:22.000000000 +0000
++++ src/c-client/auth_gss.c
 @@ -18,6 +18,16 @@
   * CPYRIGHT, included with this Distribution.
   */
@@ -19,7 +19,7 @@ $NetBSD: patch-al,v 1.4 2003/07/30 09:29:59 adam Exp $
  
  long auth_gssapi_valid (void);
  long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,
-@@ -53,15 +63,32 @@
+@@ -56,15 +66,32 @@ long auth_gssapi_valid (void)
    OM_uint32 smn;
    gss_buffer_desc buf;
    gss_name_t name;
diff --git a/mail/imap-uw/patches/patch-am b/mail/imap-uw/patches/patch-am
index 5e2f45e168a..f3400b065e8 100644
--- a/mail/imap-uw/patches/patch-am
+++ b/mail/imap-uw/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2003/09/13 18:31:34 kim Exp $
+$NetBSD: patch-am,v 1.2 2004/05/13 18:14:34 adam Exp $
 
---- src/osdep/unix/env_unix.c.orig	Wed Apr 16 20:14:42 2003
-+++ src/osdep/unix/env_unix.c	Sat Sep 13 14:07:00 2003
-@@ -804,7 +804,7 @@
+--- src/osdep/unix/env_unix.c.orig	2004-04-27 19:53:16.000000000 +0000
++++ src/osdep/unix/env_unix.c
+@@ -818,7 +818,7 @@ char *sysinbox ()
  {
    char tmp[MAILTMPLEN];
    if (!sysInbox) {		/* initialize if first time */