Updated imap-uw to 2001. Changes:

* Bugfixes
* SSL is now fully integrated into the IMAP toolkit
* Full client and server TLS support
* The server certificate must be signed by a trusted certificate authority
* RFC 1730 (IMAP4 as opposed to IMAP4rev1) support is turned off by default
  in imapd

5 files changed, 35 insertions, 59 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index d448709b690..d50541068d3 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.34 2001/07/09 14:42:10 tv Exp $
+# $NetBSD: Makefile,v 1.35 2001/10/11 15:34:50 martti Exp $
 
-DISTNAME=       imap-2000c
-PKGNAME=        imap-uw-2000.0.3nb1
+DISTNAME=       imap-2001.FINAL
+PKGNAME=        imap-uw-2001.0
 CATEGORIES=     mail
-MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/old/
+MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.washington.edu/imap/
 COMMENT=	University of Washington's IMAP, POP2, and POP3 servers
 
+WRKSRC=		${WRKDIR}/imap-2001.RELEASE-CANDIDATE.1
+
 USE_BUILDLINK_ONLY=	# defined
 USE_LIBTOOL=		# defined
 #USE_SSL=		# defined
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index d8037779a6a..39d93396cf8 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/06/22 03:31:51 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/10/11 15:34:50 martti Exp $
 
-SHA1 (imap-2000c.tar.Z) = 60f8f46ad77db8672037400a80f8d5f47eef2168
-Size (imap-2000c.tar.Z) = 1886735 bytes
-SHA1 (patch-ae) = 337ec0940c1fa8310aa7f430dd50a483a1c978f0
-SHA1 (patch-ah) = 4ad17bb1d83486ebb3feb0c93cd4171837880c4a
+SHA1 (imap-2001.FINAL.tar.Z) = 44dbe1ba9fbe5a62df2e23984aeb17bb445f267e
+Size (imap-2001.FINAL.tar.Z) = 1934968 bytes
+SHA1 (patch-ae) = b8468d9171098c9df996929c846bbd4349cb573f
 SHA1 (patch-ai) = aaa778f60684c797cc53a109b8430fa05ec7f424
-SHA1 (patch-aj) = 60f9875538be98124d9beefaa64f41396d829226
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
index 5df07c418ca..cbc28e3f134 100644
--- a/mail/imap-uw/patches/patch-ae
+++ b/mail/imap-uw/patches/patch-ae
@@ -1,8 +1,26 @@
-$NetBSD: patch-ae,v 1.12 2001/02/08 19:11:37 jlam Exp $
+$NetBSD: patch-ae,v 1.13 2001/10/11 15:34:51 martti Exp $
 
---- src/osdep/unix/Makefile.orig	Tue Feb  6 15:03:59 2001
-+++ src/osdep/unix/Makefile
-@@ -67,14 +67,14 @@
+--- src/osdep/unix/Makefile.orig	Thu Oct 11 16:15:24 2001
++++ src/osdep/unix/Makefile	Thu Oct 11 16:20:54 2001
+@@ -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.
  
@@ -19,7 +37,7 @@ $NetBSD: patch-ae,v 1.12 2001/02/08 19:11:37 jlam Exp $
  LN=ln -s
  RANLIB=ranlib
  
-@@ -336,9 +336,9 @@
+@@ -380,9 +378,9 @@
  	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
  	 ACTIVEFILE=/usr/share/news/active \
  	 RSHPATH=/usr/bin/rsh \
@@ -31,7 +49,7 @@ $NetBSD: patch-ae,v 1.12 2001/02/08 19:11:37 jlam Exp $
  
  gsu:	# GCC SUN-OS
  	$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -428,9 +428,9 @@
+@@ -472,9 +470,9 @@
  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
  	 CRXTYPE=nfs \
  	 SPOOLDIR=/var \
@@ -43,7 +61,7 @@ $NetBSD: patch-ae,v 1.12 2001/02/08 19:11:37 jlam Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nec:	# NEC UX
-@@ -823,7 +823,7 @@
+@@ -871,7 +869,7 @@
  	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
  	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
diff --git a/mail/imap-uw/patches/patch-ah b/mail/imap-uw/patches/patch-ah
deleted file mode 100644
index b171f184e17..00000000000
--- a/mail/imap-uw/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2001/02/08 19:11:37 jlam Exp $
-
---- src/osdep/unix/env_unix.c.orig	Thu Dec 21 01:12:13 2000
-+++ src/osdep/unix/env_unix.c
-@@ -1273,8 +1273,12 @@
-   DRIVER *d;
-   FILE *f = fopen (file,"r");
- 				/* no file or ill-advised usage */
-+  /*
-+   * pkgsrc: don't require the "I accept the risk for..." outdated string at
-+   * the top of /etc/c-client.cf.
-+   */
-   if (!(f && (s = fgets (tmp,MAILTMPLEN,f)) && (t = strchr (s,'\n')) &&
--	(flag ||
-+	(1 ||
- 	 (!strcmp (s,"I accept the risk for IMAP toolkit 4.1.\n") &&
- 	  (s = fgets (tmp,MAILTMPLEN,f)) && (t = strchr (s,'\n')))))) return;
-   do {
diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj
deleted file mode 100644
index 2b1ab40d3e8..00000000000
--- a/mail/imap-uw/patches/patch-aj
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2001/06/22 03:31:51 jlam Exp $
-
---- src/osdep/unix/Makefile.ssl.orig	Thu Feb  1 17:30:24 2001
-+++ src/osdep/unix/Makefile.ssl
-@@ -20,8 +20,8 @@
- 
- # Extended flags needed for additional authenticators.  You may need to modify.
- 
--SSLDIR=/usr/local/ssl
--SSLCERTS=$(SSLDIR)/certs
-+#SSLDIR=/usr/local/ssl
-+#SSLCERTS=$(SSLDIR)/certs
- SSLINCLUDE=$(SSLDIR)/include
- SSLLIB=$(SSLDIR)/lib
- 
-@@ -38,7 +38,7 @@
- 
- SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
-  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\"
--SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
-+SSLLDFLAGS= -lssl $(SSLCRYPTO) $(SSLRSA)
- 
- 
- ssl:	# SSL flags