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

4 files changed, 33 insertions, 32 deletions

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')) &&