Update to version 4.7.

PR:		14359
Submitted by:	maintainer

3 files changed, 94 insertions, 10 deletions

diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
index d39f32a7aa59..4b04174ab4d7 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-ab
@@ -1,6 +1,6 @@
---- src/osdep/unix/Makefile.orig	Wed Jan 27 01:17:39 1999
-+++ src/osdep/unix/Makefile	Sat Feb 27 17:16:00 1999
-@@ -100,7 +100,7 @@
+--- src/osdep/unix/Makefile.orig	Wed Nov 17 04:05:48 1999
++++ src/osdep/unix/Makefile	Wed Dec 22 00:43:23 1999
+@@ -104,7 +104,7 @@
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
   unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
@@ -9,8 +9,8 @@
  MAKE=make
  MV=mv
  RM=rm -rf
-@@ -115,6 +115,10 @@
-  PASSWDTYPE=$(PASSWDTYPE)
+@@ -119,6 +119,10 @@
+  PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS="$(SPECIALAUTHENTICATORS)"
  BUILD=$(MAKE) build $(BUILDOPTIONS)
  
 +# Need this for the shared library rule to work correctly
@@ -20,16 +20,34 @@
  # Here if no make argument established
  
  missing: osdep.h
-@@ -190,7 +194,7 @@
+@@ -178,6 +182,16 @@
+ 	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst= -DNFSKLUDGE" \
+ 	 RANLIB=true ARRC="ar -rc"
+ 
++bfp:	# FreeBSD Pluggable Authentication Modules
++	$(BUILD) `cat EXTRASPECIALS` OS=bsi SIGTYPE=psx \
++	 CHECKPW=pam \
++	 SPOOLDIR=/var \
++	 ACTIVEFILE=/usr/local/news/lib/active \
++	 RSHPATH=/usr/bin/rsh \
++	 LOCKPGM=$(PREFIX)/libexec/mlock \
++	 BASECFLAGS="-DNFSKLUDGE" \
++	 BASELDFLAGS="-lpam -lcrypt"
++
+ bs3:	# BSD/i386 3.0 or higher
+ 	$(BUILD) `cat EXTRASPECIALS` OS=bsi CHECKPW=bsi LOGINPW=bsi \
+ 	 SPOOLDIR=/var NEWSSPOOL=/var/news/spool \
+@@ -194,7 +208,8 @@
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
 -	 BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \
-+	 BASECFLAGS="-DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS" \
++	 LOCKPGM=$(PREFIX)/libexec/mlock \
++	 BASECFLAGS="-DNFSKLUDGE" \
  	 BASELDFLAGS="-lcrypt"
  
  bsi:	# BSD/i386
-@@ -606,19 +610,31 @@
+@@ -627,19 +642,31 @@
  
  # Build it!
  
@@ -63,7 +81,7 @@
  
  
  # Dependencies
-@@ -652,7 +668,7 @@
+@@ -673,7 +700,7 @@
  
  # OS-dependent
  
@@ -72,7 +90,7 @@
  	osdep.h env_unix.h tcp_unix.h \
  	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
  	auths.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \
-@@ -664,7 +680,12 @@
+@@ -685,7 +712,12 @@
  	write.c \
  	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
  	OSCFLAGS
diff --git a/mail/imap-uw/files/patch-ad b/mail/imap-uw/files/patch-ad
new file mode 100644
index 000000000000..464a98cd60ec
--- /dev/null
+++ b/mail/imap-uw/files/patch-ad
@@ -0,0 +1,19 @@
+--- Makefile.orig	Mon Nov 15 22:20:34 1999
++++ Makefile	Sun Dec 19 14:52:58 1999
+@@ -49,6 +49,7 @@
+ # art	AIX 2.2.1 for RT
+ # asv	Altos SVR4
+ # aux	A/UX
++# bfp	FreeBSD with Pluggable Authentication Modules (PAM)
+ # bs3	BSD/i386 3.0 and higher
+ # bsd	generic BSD 4.3 (as in ancient 1980s version)
+ # bsf	FreeBSD
+@@ -293,7 +294,7 @@
+ 
+ # Note on SCO you may have to set LN to "ln".
+ 
+-a32 a41 aix bs3 bsf bsi bso d-g d54 do4 drs epx gas gh9 ghp gs5 gso gsu gul hpp hpx lnp lyn mct mnt neb nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx sol sos uw2: an
++a32 a41 aix bfp bs3 bsf bsi bso d-g d54 do4 drs epx gas gh9 ghp gs5 gso gsu gul hpp hpx lnp lyn mct mnt neb nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx sol sos uw2: an
+ 	$(BUILD) OS=$@
+ 
+ # If you use sv4, you may find that it works to move it to use the an process.
diff --git a/mail/imap-uw/files/patch-ae b/mail/imap-uw/files/patch-ae
new file mode 100644
index 000000000000..a3b490909a09
--- /dev/null
+++ b/mail/imap-uw/files/patch-ae
@@ -0,0 +1,47 @@
+--- src/mtest/mtest.c.orig	Sat May 29 08:07:06 1999
++++ src/mtest/mtest.c	Sun Dec 19 15:29:29 1999
+@@ -95,6 +95,7 @@
+ void status (MAILSTREAM *stream);
+ void prompt (char *msg,char *txt);
+ void smtptest (long debug);
++char *safegets(char *buf);
+ 
+ /* Main program - initialization */
+ 
+@@ -528,7 +529,7 @@
+ void prompt (char *msg,char *txt)
+ {
+   printf ("%s",msg);
+-  gets (txt);
++  safegets (txt);
+ }
+ 
+ /* Interfaces to C-client */
+@@ -713,7 +714,7 @@
+   puts (" Msg (end with a line with only a '.'):");
+   body->type = TYPETEXT;
+   *text = '\0';
+-  while (gets (line)) {
++  while (safegets (line)) {
+     if (line[0] == '.') {
+       if (line[1] == '\0') break;
+       else strcat (text,".");
+@@ -744,4 +745,18 @@
+   else puts ("[Can't open connection to any server]");
+   mail_free_envelope (&msg);
+   mail_free_body (&body);
++}
++
++char *safegets(char *buf) {
++ char *p;
++
++ if (!fgets(buf, MAILTMPLEN, stdin)) {
++  return NULL;
++ }
++
++ if ((p = strchr(buf, '\n')) != NULL) {
++  *p = '\0';
++ }
++
++ return buf;
+ }