Changes imap-2004a:

* maintenance release, consisting primarily of critical bugfixes
* now has a supported NNTP proxy capability
* OSF/1 port (Digital UNIX, Tru64) now uses flocksim instead of flcksafe
* The unix[nt] and mmdf drivers now prevent mail_append() from writing Status:,
  X-Status:, X-UID, X-IMAP[base]:, and X-Keywords: header lines to a
  traditional UNIX or MMDF format mailbox

4 files changed, 15 insertions, 15 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 0d5dc918af5..c108f7d62dc 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.77 2004/05/13 18:14:34 adam Exp $
+# $NetBSD: Makefile,v 1.78 2004/08/12 12:13:54 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-2004
-PKGNAME=        imap-uw-2004
+DISTNAME=       imap-2004a
+PKGNAME=        imap-uw-2004a
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -61,7 +61,7 @@ MESSAGE_SUBST+=	SSLCERTS="${SSLCERTS}"
 PLIST_SUBST+=	CCLIENT_MAJOR="${CCLIENT_MAJOR}"
 PLIST_SUBST+=	CCLIENT_MINOR="${CCLIENT_MINOR}"
 
-MANFILES=	src/imapd/imapd.8c src/ipopd/ipopd.8c
+MANFILES=	src/imapd/imapd.8 src/ipopd/ipopd.8
 
 MAKE_ENV+=	SSLDIR=${SSLBASE:Q}
 MAKE_ENV+=	SSLCERTS=${SSLCERTS:Q}
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 96eb07c4bd7..d21efce58b9 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2004/05/13 18:14:34 adam Exp $
+$NetBSD: distinfo,v 1.17 2004/08/12 12:13:54 adam Exp $
 
-SHA1 (imap-2004.tar.Z) = f8bacc27f784b4b84b3742056b8917394f156ffa
-Size (imap-2004.tar.Z) = 2220333 bytes
+SHA1 (imap-2004a.tar.Z) = e5df251f2b8c3f01e94195a2832b5ba5cd809fbb
+Size (imap-2004a.tar.Z) = 2224181 bytes
 SHA1 (patch-aa) = 2109d076b1f50ca461b2b2a00ee927207a64f766
-SHA1 (patch-ab) = 0dcd00a94a05bbf6730c3ea8be4200a6ad5b617f
+SHA1 (patch-ab) = 76af6b8772962e77925da19902285aabcebc7d76
 SHA1 (patch-ac) = 8b4ea8c15929c65eda1b3444c68fdbf70fa68b6a
 SHA1 (patch-ad) = 3404de4e4acb456e3c7b34ca80b31b80b465b3e1
 SHA1 (patch-ae) = 702473377ca66266bdb6d5d13045d279a38ea7de
@@ -12,4 +12,4 @@ SHA1 (patch-ai) = c495ed39fbc01e1d8b05f6acd3d11394978f9b43
 SHA1 (patch-aj) = 0a728d3b5271c048275a4d41002877e86ac275b2
 SHA1 (patch-ak) = a0a1a21ec22a92d086e665b263b51532207d0e3c
 SHA1 (patch-al) = b746d36cb324114468d07d1aba7d22c5bd5b23b2
-SHA1 (patch-am) = e236acda47dc6ae0066a6bc2319b6c0f5804eb76
+SHA1 (patch-am) = b75052f548fad7563c6bf22ad1be4d736d204bef
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index ffd5009a134..b7258b5ec23 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.13 2004/05/13 18:14:34 adam Exp $
+$NetBSD: patch-ab,v 1.14 2004/08/12 12:13:54 adam Exp $
 
---- src/osdep/unix/Makefile.orig	2004-05-13 14:54:30.000000000 +0000
+--- src/osdep/unix/Makefile.orig	2004-08-12 13:26:38.000000000 +0000
 +++ src/osdep/unix/Makefile
 @@ -29,8 +29,6 @@ IP=4
  
@@ -61,7 +61,7 @@ $NetBSD: patch-ab,v 1.13 2004/05/13 18:14:34 adam Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nec:	# NEC UX
-@@ -908,7 +906,7 @@ onceenv:
+@@ -911,7 +909,7 @@ onceenv:
  	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
  	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
diff --git a/mail/imap-uw/patches/patch-am b/mail/imap-uw/patches/patch-am
index f3400b065e8..28106221a7f 100644
--- a/mail/imap-uw/patches/patch-am
+++ b/mail/imap-uw/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 2004/05/13 18:14:34 adam Exp $
+$NetBSD: patch-am,v 1.3 2004/08/12 12:13:54 adam Exp $
 
---- src/osdep/unix/env_unix.c.orig	2004-04-27 19:53:16.000000000 +0000
+--- src/osdep/unix/env_unix.c.orig	2004-07-08 20:46:11.000000000 +0000
 +++ src/osdep/unix/env_unix.c
-@@ -818,7 +818,7 @@ char *sysinbox ()
+@@ -830,7 +830,7 @@ char *sysinbox ()
  {
    char tmp[MAILTMPLEN];
    if (!sysInbox) {		/* initialize if first time */