Update to 4.7rc6 ("2000" release candidate)

Fixes a security problem in folder handling described in
http://www.securityfocus.com/advisories/2646

Will be used by upcoming pine-pkg

8 files changed, 70 insertions, 47 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 54e3953063b..26570b18b43 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2000/06/09 08:17:56 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2000/09/19 13:13:29 hubertf Exp $
 #
 
-DISTNAME=       imap-4.7c2
-PKGNAME=        imap-uw-4.7c2
+DISTNAME=       imap-2000.RELEASE-CANDIDATE.6
+PKGNAME=        imap-uw-4.7c6
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -12,7 +12,6 @@ HOMEPAGE=	http://www.washington.edu/imap/
 
 USE_LIBTOOL=	# defined
 
-WRKSRC=		${WRKDIR}/imap-4.7c
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 INST_PROG=	${LIBTOOL} ${INSTALL_PROGRAM}
@@ -32,8 +31,6 @@ do-build:
 
 do-install:
 	${INST_LIB} ${WRKSRC}/c-client/libimapuw.la ${PREFIX}/lib
-	@${RM} -f ${PREFIX}/lib/libimapuw.a
-	@${RM} -f ${PREFIX}/lib/libimapuw.la
 	${INST_PROG} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
 	${INST_PROG} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
 	${INST_PROG} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec
@@ -47,5 +44,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOC_DIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/RELNOTES ${DOC_DIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOC_DIR}
+	${INSTALL_DATA_DIR} ${PREFIX}/include/c-client
+	for i in linkage.h mail.h rfc822.h misc.h imap4r1.h osdep.h smtp.h \
+		nntp.h env_unix.h fs.h ftl.h nl.h  tcp.h env.h linkage.c; \
+	do \
+		${INSTALL_DATA} ${WRKSRC}/c-client/$$i \
+			${PREFIX}/include/c-client ; \
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imap-uw/files/md5 b/mail/imap-uw/files/md5
index c37bcab3374..5da6319ff7f 100644
--- a/mail/imap-uw/files/md5
+++ b/mail/imap-uw/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2000/05/19 03:58:56 jlam Exp $
+$NetBSD: md5,v 1.7 2000/09/19 13:13:29 hubertf Exp $
 
-MD5 (imap-4.7c2.tar.Z) = 1a27c7684094a8c94baf294552467060
+MD5 (imap-2000.RELEASE-CANDIDATE.6.tar.Z) = f7de92c2c4dcd0be3f5d650850900449
diff --git a/mail/imap-uw/files/patch-sum b/mail/imap-uw/files/patch-sum
index 7238c3b8300..9a4aede2cfd 100644
--- a/mail/imap-uw/files/patch-sum
+++ b/mail/imap-uw/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.4 2000/05/19 03:58:56 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/09/19 13:13:29 hubertf Exp $
 
-MD5 (patch-aa) = 618edd77602a401a70f2ad0e4f3dcb6c
-MD5 (patch-ab) = 686ca8ed99a8c27ffe8dd873beb995d0
+MD5 (patch-aa) = 46975edf63b6b6de0b369913d0599a65
+MD5 (patch-ab) = f75e19056b795dfc93da40bf99cc4556
 MD5 (patch-ac) = af18863cad9851603b47b604eaffb13c
 MD5 (patch-ad) = 7f4bdb112125a0537a7e101093be8d07
-MD5 (patch-ae) = 5d835b323c7550f645ac16d767988001
+MD5 (patch-ae) = 0df5aad89a2f435551b802c65f3efad4
 MD5 (patch-af) = 3301d969c79118ae742f824aa9d90812
 MD5 (patch-ag) = 0da043e9e17ea708ee15b71d4747ea93
-MD5 (patch-ah) = c0f26ffac24476290f60f25beb30206e
+MD5 (patch-ah) = ae6ea6d040f12c8d22774a1a8f93ca1b
 MD5 (patch-ai) = 03c45f118c746a0acb5fc6b39fcb661e
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index aa42298053f..4e5c387f22e 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.5 2000/05/19 03:58:57 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2000/09/19 13:13:30 hubertf Exp $
 
---- Makefile.orig	Mon Nov 15 15:20:34 1999
-+++ Makefile	Tue May  2 15:37:12 2000
-@@ -110,7 +110,7 @@
+--- Makefile.orig	Wed Aug  9 02:11:08 2000
++++ Makefile
+@@ -284,7 +284,7 @@
  
- 
- # *** TEMPORARY FOR PINE 4.10 BUILD ***
+ #EXTRASPECIALS=
+ # *** TEMPORARY FOR PINE BUILD ***
 -GSSDIR=/usr/local
-+GSSDIR=$(PREFIX)
- # *** TEMPORARY FOR PINE 4.10 BUILD ***
++GSSDIR=${PREFIX}
+ EXTRASPECIALS="GSSDIR=$(GSSDIR)"
+ # *** TEMPORARY FOR PINE BUILD ***
  
- # Normal command to build IMAP toolkit:
-@@ -402,7 +402,7 @@
- # *** TEMPORARY FOR PINE 4.10 BUILD ***
- 	echo GSSDIR=$(GSSDIR) >> c-client/EXTRASPECIALS
- # *** TEMPORARY FOR PINE 4.10 BUILD ***
+@@ -430,7 +430,7 @@
+ OSTYPE:
+ 	@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 $(OS) > OSTYPE
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index ac71abdef70..83262953312 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2000/05/19 03:58:57 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2000/09/19 13:13:30 hubertf Exp $
 
---- src/imapd/Makefile.orig	Thu Nov  4 02:50:56 1999
-+++ src/imapd/Makefile	Tue May  2 15:13:29 2000
-@@ -54,7 +54,7 @@
+--- src/imapd/Makefile.orig	Wed Aug 30 22:47:54 2000
++++ src/imapd/Makefile
+@@ -40,7 +40,7 @@
  # Get local definitions from c-client directory
  
  C = ../c-client
 -CCLIENTLIB = $C/c-client.a
 +CCLIENTLIB = $C/libimapuw.la
  CC = `cat $C/CCTYPE`
- CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
+ CFLAGS = -I$C `cat $C/CFLAGS` -DANOFILE=\"$(ANO)\" \
  	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
index b357ea83739..663e4af4137 100644
--- a/mail/imap-uw/patches/patch-ae
+++ b/mail/imap-uw/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.8 2000/05/19 03:58:57 jlam Exp $
+$NetBSD: patch-ae,v 1.9 2000/09/19 13:13:30 hubertf Exp $
 
---- src/osdep/unix/Makefile.orig	Tue Nov 16 21:05:48 1999
-+++ src/osdep/unix/Makefile	Tue May  2 15:18:30 2000
-@@ -99,7 +99,7 @@
+--- src/osdep/unix/Makefile.orig	Wed Aug 30 23:28:56 2000
++++ src/osdep/unix/Makefile
+@@ -100,7 +100,7 @@
  
  # Normally no need to change any of these
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.8 2000/05/19 03:58:57 jlam 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 \
-@@ -122,7 +122,7 @@
+@@ -123,7 +123,7 @@
  # Here if no make argument established
  
  missing: osdep.h
@@ -20,21 +20,22 @@ $NetBSD: patch-ae,v 1.8 2000/05/19 03:58:57 jlam Exp $
  
  osdep.h:
  	@echo You must specify what type of system
-@@ -386,10 +386,11 @@
+@@ -431,11 +431,12 @@
  
  neb:	# NetBSD
  	$(BUILD) `cat EXTRASPECIALS` OS=bsi \
 +	 CC="$(CC)" \
+ 	 CRXTYPE=nfs \
  	 SPOOLDIR=/var \
 -	 ACTIVEFILE=/var/db/news/active \
 +	 ACTIVEFILE=/var/news/db/active \
  	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \
-+	 BASECFLAGS="-O -pipe -DNFSKLUDGE" \
+-	 BASECFLAGS="-g -O -pipe" \
++	 BASECFLAGS="-O -pipe" \
  	 BASELDFLAGS="-lcrypt"
  
- nxt:	# NEXTSTEP
-@@ -709,7 +710,7 @@
+ nec:	# NEC UX
+@@ -813,7 +814,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
index 002db1c37ce..921c06bdddb 100644
--- a/mail/imap-uw/patches/patch-ah
+++ b/mail/imap-uw/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2000/05/19 03:58:57 jlam Exp $
+$NetBSD: patch-ah,v 1.3 2000/09/19 13:13:30 hubertf Exp $
 
---- src/osdep/unix/env_unix.c.orig	Wed May  3 13:33:01 2000
-+++ src/osdep/unix/env_unix.c	Thu May 18 23:43:57 2000
-@@ -1127,7 +1127,7 @@
+--- src/osdep/unix/env_unix.c.orig	Fri Aug 18 00:13:00 2000
++++ src/osdep/unix/env_unix.c
+@@ -1226,7 +1226,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/pkg/PLIST b/mail/imap-uw/pkg/PLIST
index 86bab37ac9f..209d21121b0 100644
--- a/mail/imap-uw/pkg/PLIST
+++ b/mail/imap-uw/pkg/PLIST
@@ -1,12 +1,29 @@
-@comment $NetBSD: PLIST,v 1.6 2000/05/19 03:58:58 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2000/09/19 13:13:30 hubertf Exp $
+include/c-client/env.h
+include/c-client/env_unix.h
+include/c-client/fs.h
+include/c-client/ftl.h
+include/c-client/imap4r1.h
+include/c-client/linkage.c
+include/c-client/linkage.h
+include/c-client/mail.h
+include/c-client/misc.h
+include/c-client/nl.h
+include/c-client/nntp.h
+include/c-client/osdep.h
+include/c-client/rfc822.h
+include/c-client/smtp.h
+include/c-client/tcp.h
+lib/libimapuw.a
+lib/libimapuw.la
 lib/libimapuw.so.4.0
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d
 man/man8/imapd.8
-man/man8/ipopd.8
 man/man8/ipop2d.8
 man/man8/ipop3d.8
+man/man8/ipopd.8
 sbin/mtest
 sbin/rimapd
 share/doc/imap-uw/FAQ
@@ -21,3 +38,4 @@ share/doc/imap-uw/locking.txt
 share/doc/imap-uw/md5.txt
 share/doc/imap-uw/naming.txt
 @dirrm share/doc/imap-uw
+@dirrm include/c-client