Updated: 27 August 2003

imap-2002e is a minor release, released concurrently with Pine 4.57, and
contains primarily bugfixes.  Programs written for imap-2002d should build
with this version without modification.

The NNTP client code now tries to perform better with legacy NNTP servers
which do not comply with the current NNTP protocol specification draft, most
notably Netscape Collabra.

Delivery notifications now work reliably with SMTP servers that support it.

The following changes are primarily of concern to developers and power users:

There is a "limited advertise" option in env_unix.c which, if set, will only
advertise the user's own namespace and the #shared/ namespace.

It is now possible to build the IMAP toolkit with a separate SSL KEY file
from the certificate file (SSLKEYS vs. SSLCERTS).

A new BODY structure element, sparep, is available for the main program to
use as a pointer for its own purposes; as well as a SET_FREEBODYSPAREP
function, similar to SET_FREEENVELOPESPAREP, SET_FREEELTSPAREP, etc.

5 files changed, 26 insertions, 27 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index a620a298e3d..82f593a864f 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.66 2003/09/04 11:02:19 martti Exp $
-
+# $NetBSD: Makefile,v 1.67 2003/09/10 11:54:41 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-2002d
-PKGNAME=        imap-uw-2002.4
-PKGREVISION=	1
+DISTNAME=       imap-2002e
+PKGNAME=        imap-uw-2002.5
 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 dd41882c1c6..85821a382e6 100644
--- a/mail/imap-uw/PLIST
+++ b/mail/imap-uw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/28 14:38:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/09/10 11:54:41 adam Exp $
 include/c-client/c-client.h
 include/c-client/env.h
 include/c-client/env_unix.h
@@ -51,10 +51,11 @@ 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/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/README
+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
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 26b60e26598..2fcdf30094f 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2003/07/30 09:29:58 adam Exp $
+$NetBSD: distinfo,v 1.14 2003/09/10 11:54:41 adam Exp $
 
-SHA1 (imap-2002d.tar.Z) = ec037715940f970c75f3f5fe892e9399b210281e
-Size (imap-2002d.tar.Z) = 2155224 bytes
-SHA1 (patch-aa) = 56b2c44cc02e658f85c56bd70229c7a0822891a0
-SHA1 (patch-ab) = 9ad48cbb090bfb7969be7349836d23f980d0888a
+SHA1 (imap-2002e.tar.Z) = d52749df111c31094a3a5003bb93752ea8fbeea0
+Size (imap-2002e.tar.Z) = 2157511 bytes
+SHA1 (patch-aa) = 84239c107b531b69e0f88eddfc7b58416d89c9c7
+SHA1 (patch-ab) = a18844f58641d9eee0f30c9333377cbe31adaea9
 SHA1 (patch-ac) = 8b4ea8c15929c65eda1b3444c68fdbf70fa68b6a
 SHA1 (patch-ad) = 3404de4e4acb456e3c7b34ca80b31b80b465b3e1
 SHA1 (patch-ae) = 702473377ca66266bdb6d5d13045d279a38ea7de
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index 89c8b992756..6de3c8419d0 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2003/07/28 14:38:05 adam Exp $
+$NetBSD: patch-aa,v 1.13 2003/09/10 11:54:42 adam Exp $
 
---- Makefile.orig	2003-07-28 14:34:21.000000000 +0200
-+++ Makefile	2003-07-28 14:34:21.000000000 +0200
-@@ -419,9 +419,9 @@
+--- Makefile.orig	2003-07-15 03:17:18.000000000 +0200
++++ Makefile
+@@ -424,9 +424,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 a1ff56096e8..ffae53eaa44 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,26 +1,26 @@
-$NetBSD: patch-ab,v 1.11 2003/07/28 14:38:06 adam Exp $
+$NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
 
---- src/osdep/unix/Makefile.orig	2003-07-28 14:34:04.000000000 +0200
-+++ src/osdep/unix/Makefile	2003-07-28 14:34:38.000000000 +0200
-@@ -28,8 +28,6 @@
+--- src/osdep/unix/Makefile.orig	2003-09-10 13:18:31.000000000 +0200
++++ src/osdep/unix/Makefile
+@@ -28,8 +28,6 @@ SSLTYPE=nopwd
  
  # Extended flags needed for SSL.  You may need to modify.
  
 -SSLDIR=/usr/local/ssl
 -SSLCERTS=$(SSLDIR)/certs
+ SSLKEYS=$(SSLCERTS)
  SSLINCLUDE=$(SSLDIR)/include
  SSLLIB=$(SSLDIR)/lib
- 
-@@ -46,7 +44,7 @@
+@@ -47,7 +45,7 @@ SSLRSA= # -lRSAglue -lrsaref
  
  SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
-  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\"
+  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
 -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 @@
+@@ -91,14 +89,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.11 2003/07/28 14:38:06 adam Exp $
  LN=ln -s
  RANLIB=ranlib
  
-@@ -380,9 +378,9 @@
+@@ -381,9 +379,9 @@ gso:	# 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.11 2003/07/28 14:38:06 adam Exp $
  
  gsu:	# GCC SUN-OS
  	$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -472,9 +470,9 @@
+@@ -473,9 +471,9 @@ neb:	# NetBSD
  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
  	 CRXTYPE=nfs \
  	 SPOOLDIR=/var \
@@ -61,7 +61,7 @@ $NetBSD: patch-ab,v 1.11 2003/07/28 14:38:06 adam Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nec:	# NEC UX
-@@ -877,7 +875,7 @@
+@@ -878,7 +876,7 @@ onceenv:
  	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
  	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS