Update to '2000 release.

Fixes a bunch of security problems. (This is the same imap-lib
that also comes with pine-4.30). Sorry, no detailed list available. ;(

11 files changed, 59 insertions, 59 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index d066d7a6981..bec2e5c8ac7 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2000/09/27 08:34:25 toshii Exp $
+# $NetBSD: Makefile,v 1.16 2000/11/09 03:35:33 hubertf Exp $
 #
 
-DISTNAME=       imap-2000.RELEASE-CANDIDATE.6
-PKGNAME=        imap-uw-4.7c6
+DISTNAME=       imap-2000
+PKGNAME=        imap-uw-2000
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	tv@netbsd.org
+MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.washington.edu/imap/
 
 USE_LIBTOOL=	# defined
@@ -35,7 +35,7 @@ do-configure:
 		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 
 do-build:
-	cd ${WRKSRC} && ${MAKE} ${BUILDNAME} PREFIX=${PREFIX} CC="${LIBTOOL} ${CC}"
+	cd ${WRKSRC} && ${MAKE} ${BUILDNAME} PREFIX=${PREFIX} CC="${LIBTOOL} ${CC} -g"
 
 do-install:
 	${INST_LIB} ${WRKSRC}/c-client/libimapuw.la ${PREFIX}/lib
diff --git a/mail/imap-uw/files/md5 b/mail/imap-uw/files/md5
index 5da6319ff7f..0005227809a 100644
--- a/mail/imap-uw/files/md5
+++ b/mail/imap-uw/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 2000/09/19 13:13:29 hubertf Exp $
+$NetBSD: md5,v 1.8 2000/11/09 03:35:34 hubertf Exp $
 
-MD5 (imap-2000.RELEASE-CANDIDATE.6.tar.Z) = f7de92c2c4dcd0be3f5d650850900449
+MD5 (imap-2000.tar.Z) = 7b5f2cfcad528bad2e79800d083821a5
diff --git a/mail/imap-uw/files/patch-sum b/mail/imap-uw/files/patch-sum
index a1d5030f5d3..4cdae8a04fb 100644
--- a/mail/imap-uw/files/patch-sum
+++ b/mail/imap-uw/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.6 2000/09/27 08:29:04 toshii Exp $
+$NetBSD: patch-sum,v 1.7 2000/11/09 03:35:34 hubertf Exp $
 
-MD5 (patch-aa) = 46975edf63b6b6de0b369913d0599a65
-MD5 (patch-ab) = f75e19056b795dfc93da40bf99cc4556
-MD5 (patch-ac) = af18863cad9851603b47b604eaffb13c
-MD5 (patch-ad) = 7f4bdb112125a0537a7e101093be8d07
-MD5 (patch-ae) = 42fbda1d07284445910eaeb2c4b0d959
+MD5 (patch-aa) = 6059d31af88cc99ea92914250f20c07c
+MD5 (patch-ab) = bb937534f987fe7a8a365c1ffcd8760d
+MD5 (patch-ac) = b105631b853f128cbae3e00a72bfbf78
+MD5 (patch-ad) = 6b10bb3e3475a2bad35c4f704b10f6a4
+MD5 (patch-ae) = 4520592ffac3f95511bc730f684fa3bb
 MD5 (patch-af) = 3301d969c79118ae742f824aa9d90812
 MD5 (patch-ag) = 0da043e9e17ea708ee15b71d4747ea93
-MD5 (patch-ah) = ae6ea6d040f12c8d22774a1a8f93ca1b
-MD5 (patch-ai) = 03c45f118c746a0acb5fc6b39fcb661e
+MD5 (patch-ah) = 0d0d8a769e951e4422163d0912d906a9
+MD5 (patch-ai) = 4757f3135f2fb6112419fadc44201e9f
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index 4e5c387f22e..ea7a9ff7511 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.6 2000/09/19 13:13:30 hubertf Exp $
+$NetBSD: patch-aa,v 1.7 2000/11/09 03:35:34 hubertf Exp $
 
---- Makefile.orig	Wed Aug  9 02:11:08 2000
+--- Makefile.orig	Wed Oct 25 01:52:21 2000
 +++ Makefile
-@@ -284,7 +284,7 @@
- 
- #EXTRASPECIALS=
+@@ -276,7 +276,7 @@
+ #SPECIALS=
+ EXTRASPECIALS=
  # *** TEMPORARY FOR PINE BUILD ***
 -GSSDIR=/usr/local
 +GSSDIR=${PREFIX}
- EXTRASPECIALS="GSSDIR=$(GSSDIR)"
+ SPECIALS=GSSDIR=$(GSSDIR)
  # *** TEMPORARY FOR PINE BUILD ***
  
-@@ -430,7 +430,7 @@
- OSTYPE:
+@@ -423,7 +423,7 @@
  	@echo Building c-client for $(OS)...
- 	echo $(EXTRASPECIALS) > c-client/EXTRASPECIALS
--	$(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS="$(BUILDOPTIONS)" $(EXTRASPECIALS)
-+	$(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS="$(BUILDOPTIONS)" $(EXTRASPECIALS) PREFIX=$(PREFIX) CC="$(CC)"
+ 	echo $(SPECIALS) $(EXTRASPECIALS) > c-client/SPECIALS
+ 	$(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS="$(BUILDOPTIONS)" \
+-	 $(SPECIALS) $(EXTRASPECIALS)
++	 $(SPECIALS) $(EXTRASPECIALS) PREFIX=$(PREFIX) CC="$(CC)"
  	echo $(OS) > OSTYPE
  	$(TOUCH) rebuild
  
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index 83262953312..6a19bc6a587 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2000/09/19 13:13:30 hubertf Exp $
+$NetBSD: patch-ab,v 1.7 2000/11/09 03:35:34 hubertf Exp $
 
---- src/imapd/Makefile.orig	Wed Aug 30 22:47:54 2000
+--- src/imapd/Makefile.orig	Wed Oct 25 01:54:32 2000
 +++ src/imapd/Makefile
-@@ -40,7 +40,7 @@
+@@ -27,7 +27,7 @@
  # Get local definitions from c-client directory
  
  C = ../c-client
diff --git a/mail/imap-uw/patches/patch-ac b/mail/imap-uw/patches/patch-ac
index 076b11557b8..2403c318ff9 100644
--- a/mail/imap-uw/patches/patch-ac
+++ b/mail/imap-uw/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:09:37 agc Exp $
+$NetBSD: patch-ac,v 1.3 2000/11/09 03:35:34 hubertf Exp $
 
---- src/ipopd/Makefile.orig	Sun Jul 19 10:53:35 1998
-+++ src/ipopd/Makefile	Sun Jul 19 10:53:43 1998
-@@ -32,7 +32,7 @@
+--- src/ipopd/Makefile.orig	Wed Oct 25 01:55:07 2000
++++ src/ipopd/Makefile
+@@ -19,7 +19,7 @@
  
  
  C = ../c-client
diff --git a/mail/imap-uw/patches/patch-ad b/mail/imap-uw/patches/patch-ad
index 23d9e751731..adc45a25098 100644
--- a/mail/imap-uw/patches/patch-ad
+++ b/mail/imap-uw/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:09:37 agc Exp $
+$NetBSD: patch-ad,v 1.3 2000/11/09 03:35:34 hubertf Exp $
 
---- src/mtest/Makefile.orig	Sun Jul 19 10:53:47 1998
-+++ src/mtest/Makefile	Sun Jul 19 10:53:56 1998
-@@ -32,7 +32,7 @@
+--- src/mtest/Makefile.orig	Wed Oct 25 01:55:39 2000
++++ src/mtest/Makefile
+@@ -19,7 +19,7 @@
  
  
  C = ../c-client
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
index 343e5460383..6b302d4d050 100644
--- a/mail/imap-uw/patches/patch-ae
+++ b/mail/imap-uw/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.10 2000/09/27 08:29:04 toshii Exp $
+$NetBSD: patch-ae,v 1.11 2000/11/09 03:35:34 hubertf Exp $
 
---- src/osdep/unix/Makefile.orig	Thu Aug 31 06:28:56 2000
-+++ src/osdep/unix/Makefile	Mon Sep 25 19:50:28 2000
-@@ -100,7 +100,7 @@
+--- src/osdep/unix/Makefile.orig	Wed Oct 25 01:59:24 2000
++++ src/osdep/unix/Makefile
+@@ -87,7 +87,7 @@
  
  # Normally no need to change any of these
  
@@ -11,16 +11,16 @@ $NetBSD: patch-ae,v 1.10 2000/09/27 08:29:04 toshii Exp $
  BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o utf8.o siglocal.o \
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-@@ -123,7 +123,7 @@
+@@ -112,7 +112,7 @@
  # Here if no make argument established
  
  missing: osdep.h
--	$(MAKE) all CC=`cat CCTYPE` CFLAGS="`cat CFLAGS`" `cat EXTRASPECIALS`
-+	$(MAKE) all CC="`cat CCTYPE`" CFLAGS="`cat CFLAGS`" `cat EXTRASPECIALS`
+-	$(MAKE) all CC=`$(CAT) CCTYPE` CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
++	$(MAKE) all CC="`$(CAT) CCTYPE`" CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
  
  osdep.h:
  	@echo You must specify what type of system
-@@ -343,7 +343,7 @@
+@@ -332,7 +332,7 @@
  	 RSHPATH=/usr/bin/rsh \
  	 BASECFLAGS="-g -O2" \
  	 BASELDFLAGS="-lsocket -lnsl -lgen" \
@@ -28,11 +28,11 @@ $NetBSD: patch-ae,v 1.10 2000/09/27 08:29:04 toshii Exp $
 +	 RANLIB=true CC="$(CC)"
  
  gsu:	# GCC SUN-OS
- 	$(BUILD) `cat EXTRASPECIALS` OS=sun \
-@@ -431,11 +431,12 @@
+ 	$(BUILD) `$(CAT) SPECIALS` OS=sun \
+@@ -420,11 +420,12 @@
  
  neb:	# NetBSD
- 	$(BUILD) `cat EXTRASPECIALS` OS=bsi \
+ 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
 +	 CC="$(CC)" \
  	 CRXTYPE=nfs \
  	 SPOOLDIR=/var \
@@ -44,12 +44,12 @@ $NetBSD: patch-ae,v 1.10 2000/09/27 08:29:04 toshii Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nec:	# NEC UX
-@@ -813,7 +814,7 @@
+@@ -808,7 +809,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 4:0" > ARCHIVE
++	echo "$(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info 4:1" > ARCHIVE
  	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
  	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
  	$(LN) os_$(OS).h osdep.h
diff --git a/mail/imap-uw/patches/patch-ah b/mail/imap-uw/patches/patch-ah
index 921c06bdddb..169ba0808eb 100644
--- a/mail/imap-uw/patches/patch-ah
+++ b/mail/imap-uw/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2000/09/19 13:13:30 hubertf Exp $
+$NetBSD: patch-ah,v 1.4 2000/11/09 03:35:34 hubertf Exp $
 
---- src/osdep/unix/env_unix.c.orig	Fri Aug 18 00:13:00 2000
+--- src/osdep/unix/env_unix.c.orig	Wed Oct 25 01:40:48 2000
 +++ src/osdep/unix/env_unix.c
-@@ -1226,7 +1226,7 @@
+@@ -1211,7 +1211,7 @@
    FILE *f = fopen (file,"r");
  				/* no file or ill-advised usage */
    if (!(f && (s = fgets (tmp,MAILTMPLEN,f)) && (t = strchr (s,'\n')) &&
diff --git a/mail/imap-uw/patches/patch-ai b/mail/imap-uw/patches/patch-ai
index aac94c757b8..f510757351d 100644
--- a/mail/imap-uw/patches/patch-ai
+++ b/mail/imap-uw/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 1999/11/25 14:32:43 tron Exp $
+$NetBSD: patch-ai,v 1.2 2000/11/09 03:35:34 hubertf Exp $
 
---- src/mtest/mtest.c.orig	Thu Jan  8 08:40:50 1998
-+++ src/mtest/mtest.c	Thu Nov 25 15:17:58 1999
-@@ -52,6 +52,11 @@
+--- src/mtest/mtest.c.orig	Wed Oct 25 01:16:33 2000
++++ src/mtest/mtest.c
+@@ -36,6 +36,11 @@
  
  /* Excellent reasons to hate ifdefs, and why my real code never uses them */
  
diff --git a/mail/imap-uw/pkg/PLIST b/mail/imap-uw/pkg/PLIST
index 209d21121b0..c5054405939 100644
--- a/mail/imap-uw/pkg/PLIST
+++ b/mail/imap-uw/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/09/19 13:13:30 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/11/09 03:35:34 hubertf Exp $
 include/c-client/env.h
 include/c-client/env_unix.h
 include/c-client/fs.h
@@ -16,7 +16,7 @@ include/c-client/smtp.h
 include/c-client/tcp.h
 lib/libimapuw.a
 lib/libimapuw.la
-lib/libimapuw.so.4.0
+lib/libimapuw.so.4.1
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d