Update c-client to that found in UW's imap-2000.

Update imap-uw to the latest version (imap-2000).
Update pine4 to the latest version (pine-4.31).
Despite the fact that the new releases of imap-uw and pine are
intended to improve security, the security warnings on the pine
and imap-uw ports have been left intact until they have proven
themselves.

7 files changed, 102 insertions, 221 deletions

diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af
index 18bd351bff7e..831a742da849 100644
--- a/mail/pine4/files/patch-af
+++ b/mail/pine4/files/patch-af
@@ -1,36 +1,32 @@
-*** imap/src/osdep/unix/Makefile.orig	Wed Jan 27 01:19:19 1999
---- imap/src/osdep/unix/Makefile	Tue Feb  9 21:32:44 1999
-***************
-*** 82,88 ****
-  # Commands possibly overriden by the individual port
-  
-  ARRC=ar rc
-! CC=cc
-  LN=ln -s
-  RANLIB=ranlib
-  
---- 82,88 ----
-  # Commands possibly overriden by the individual port
-  
-  ARRC=ar rc
-! #CC=cc
-  LN=ln -s
-  RANLIB=ranlib
-  
-***************
-*** 100,106 ****
-   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
-! CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
-  MAKE=make
-  MV=mv
-  RM=rm -rf
---- 100,106 ----
-   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
-! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
-  MAKE=make
-  MV=mv
-  RM=rm -rf
+--- imap/src/osdep/unix/Makefile.orig	Tue Oct 31 13:56:45 2000
++++ imap/src/osdep/unix/Makefile	Mon Dec 18 01:59:06 2000
+@@ -74,7 +74,7 @@
+ # Commands possibly overriden by the individual port
+ 
+ ARRC=ar rc
+-CC=cc
++#CC=cc
+ LN=ln -s
+ RANLIB=ranlib
+ 
+@@ -92,7 +92,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
+-CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
++CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+ 
+ CAT=cat
+ MAKE=make
+@@ -194,8 +194,9 @@
+ 	 SPOOLDIR=/var \
+ 	 ACTIVEFILE=/usr/local/news/lib/active \
+ 	 RSHPATH=/usr/bin/rsh \
+-	 BASECFLAGS="-g -O -pipe" \
+-	 BASELDFLAGS="-lcrypt"
++	 LOCKPGM=$(PREFIX)/libexec/mlock \
++	 BASECFLAGS="-DNFSKLUDGE" \
++	 BASELDFLAGS="-lpam -lcrypt"
+ 
+ bsi:	# BSD/i386
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al
index e47b0ff84392..70f1eced6944 100644
--- a/mail/pine4/files/patch-al
+++ b/mail/pine4/files/patch-al
@@ -1,6 +1,6 @@
---- build.orig	Mon Nov 15 14:16:25 1999
-+++ build	Wed Jul  5 21:22:26 2000
-@@ -80,8 +80,9 @@
+--- build.orig	Wed Nov  8 12:31:25 2000
++++ build	Mon Dec 18 02:12:09 2000
+@@ -95,8 +95,9 @@
   pine   The Pine mailer. Once compiled this should work just fine on
          your system with no other files than this binary, and no
          modifications to your system. Optionally you may create two
@@ -12,8 +12,8 @@
   
   pico   The standalone editor similar to the Pine message composer.
          This is a very simple straight forward text editor.
-@@ -277,17 +278,17 @@
- 	  esac
+@@ -304,17 +305,17 @@
+ 	  echo "Including SSL functionality"
  	fi
  
 -        if [ -s c-client ] ; then rm -f c-client ; fi
@@ -23,9 +23,9 @@
 -        if [ -s imapd    ] ; then rm -f imapd    ; fi
 -        ln -s imap/imapd imapd
 -        echo "Making c-client library, mtest and imapd"
--        eval echo make "$makeargs" "$K1" "$K2" $ccltarg
+-        eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 -        cd $PHOME/imap
--        eval make "$makeargs" "$K1" "$K2" $ccltarg
+-        eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 -        echo ''
 +#        if [ -s c-client ] ; then rm -f c-client ; fi
 +#        ln -s imap/c-client c-client
@@ -34,14 +34,14 @@
 +#        if [ -s imapd    ] ; then rm -f imapd    ; fi
 +#        ln -s imap/imapd imapd
 +#        echo "Making c-client library, mtest and imapd"
-+#        eval echo make "$makeargs" "$K1" "$K2" $ccltarg
++#        eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 +#        cd $PHOME/imap
-+#        eval make "$makeargs" "$K1" "$K2" $ccltarg
++#        eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 +#        echo ''
  
          echo "Making Pico and Pilot"
          cd $PHOME/pico
-@@ -304,14 +305,14 @@
+@@ -331,14 +332,14 @@
          cd $PHOME/bin
          rm -f pine mtest imapd pico pilot
          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
@@ -59,7 +59,7 @@
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -321,15 +322,15 @@
+@@ -348,15 +349,15 @@
  
  
      clean) # This only sort of works 
diff --git a/mail/pine4/files/patch-as b/mail/pine4/files/patch-as
index 5bb66b9d8953..0a5cc4d1d2e2 100644
--- a/mail/pine4/files/patch-as
+++ b/mail/pine4/files/patch-as
@@ -1,22 +1,3 @@
-*** pine/init.c.orig	Tue Jan 26 21:57:56 1999
---- pine/init.c	Tue Feb  9 22:14:08 1999
-***************
-*** 326,332 ****
-  
-  /*----------------------------------------------------------------------
-  These are the variables that control a number of pine functions.  They
-! come out of the .pinerc and the /usr/local/lib/pine.conf files.  Some can
-  be set by the user while in Pine.  Eventually all the local ones should
-  be so and maybe the global ones too.
-  
---- 326,332 ----
-  
-  /*----------------------------------------------------------------------
-  These are the variables that control a number of pine functions.  They
-! come out of the .pinerc and the @@PREFIX@@/etc/pine.conf files.  Some can
-  be set by the user while in Pine.  Eventually all the local ones should
-  be so and maybe the global ones too.
-
 *** pico/edef.h.orig	Thu Apr 23 02:53:44 1998
 --- pico/edef.h	Tue Feb  9 22:14:08 1999
 ***************
diff --git a/mail/pine4/files/patch-at b/mail/pine4/files/patch-at
index 4a8564a88065..e7e64a79a9cc 100644
--- a/mail/pine4/files/patch-at
+++ b/mail/pine4/files/patch-at
@@ -1,101 +1,59 @@
-*** pine/pine.hlp.orig	Fri Feb  5 01:07:54 1999
---- pine/pine.hlp	Tue Feb  9 22:10:02 1999
-***************
-*** 455,463 ****
-  
-   executable     <Unix search path>/pine
-   persnl cfg     ~/.pinerc
-!  global cfg     /usr/local/lib/pine.conf
-!  fixed cfg      /usr/local/lib/pine.conf.fixed
-!  local help     /usr/local/lib/pine.info
-  
-   interrupted    ~/.pine-interrupted-mail
-   debug          ~/.pine-debugN
---- 455,463 ----
-  
-   executable     <Unix search path>/pine
-   persnl cfg     ~/.pinerc
-!  global cfg     @@PREFIX@@/etc/pine.conf
-!  fixed cfg      @@PREFIX@@/etc/pine.conf.fixed
-!  local help     @@PREFIX@@/etc/pine.info
-  
-   interrupted    ~/.pine-interrupted-mail
-   debug          ~/.pine-debugN
-***************
-*** 469,476 ****
-   postponed#     ~/mail/postponed-msgs
-   sentmail#      ~/mail/sent-mail
-   mailcap#       ~/.mailcap + /etc/mailcap
-!                            + /usr/etc/mailcap + /usr/local/etc/mailcap
-!  mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
-  
-   news-spool	varies across Unix flavors, e.g. /usr/spool/news or /var/news
-   active-news	varies across Unix flavors, e.g. /usr/lib/news/active
---- 469,476 ----
-   postponed#     ~/mail/postponed-msgs
-   sentmail#      ~/mail/sent-mail
-   mailcap#       ~/.mailcap + /etc/mailcap
-!                            + /usr/etc/mailcap + @@PREFIX@@/etc/mailcap
-!  mimetypes#     ~/.mime.types + /etc/mime.types + @@PREFIX@@/etc/mime.types
-  
-   news-spool	varies across Unix flavors, e.g. /usr/spool/news or /var/news
-   active-news	varies across Unix flavors, e.g. /usr/lib/news/active
-***************
-*** 856,864 ****
-  this link now to send a message to it:<BR>
-  <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
-  <!--chtml endif-->
-! <!--chtml if [ -r /usr/local/lib/pine.info ]-->
-  <HR WIDTH="75%">Local Support Contacts:<P>
-! <!--#include file="/usr/local/lib/pine.info"-->
-  <HR WIDTH="75%">
-  <!--chtml endif-->
-  <P> 
---- 856,864 ----
-  this link now to send a message to it:<BR>
-  <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
-  <!--chtml endif-->
-! <!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
-  <HR WIDTH="75%">Local Support Contacts:<P>
-! <!--#include file="@@PREFIX@@/etc/pine.info"-->
-  <HR WIDTH="75%">
-  <!--chtml endif-->
-  <P> 
-***************
-*** 945,951 ****
-  <OL>
-    <LI> <A HREF="#intro">Introduction</A>
-    <LI> <A HREF="#pine_help">Pine Help</A>
-! <!--chtml if [ -r /usr/local/lib/pine.info ]-->
-    <LI> <A HREF="#local_support">Local Support Contacts</A>
-  <!--chtml endif-->
-    <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
---- 945,951 ----
-  <OL>
-    <LI> <A HREF="#intro">Introduction</A>
-    <LI> <A HREF="#pine_help">Pine Help</A>
-! <!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
-    <LI> <A HREF="#local_support">Local Support Contacts</A>
-  <!--chtml endif-->
-    <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
-***************
-*** 1052,1060 ****
-  at your site.)
-  
-  
-! <!--chtml if [ -r /usr/local/lib/pine.info ]-->
-  <H2><A NAME="local_support">Local Support Contacts</A></H2>
-! <!--#include file="/usr/local/lib/pine.info"-->
-  <!--chtml endif-->
-  
-  <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
---- 1052,1060 ----
-  at your site.)
-  
-  
-! <!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
-  <H2><A NAME="local_support">Local Support Contacts</A></H2>
-! <!--#include file="@@PREFIX@@/etc/pine.info"-->
-  <!--chtml endif-->
-  
-  <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
+--- pine/pine.hlp.orig	Fri Dec  1 16:12:53 2000
++++ pine/pine.hlp	Mon Dec 18 02:20:21 2000
+@@ -580,9 +580,9 @@
+  executable     &lt;Unix search path&gt;/pine
+  persnl cfg     ~/.pinerc
+  except cfg     ~/.pinercex
+- global cfg     /usr/local/lib/pine.conf
+- fixed cfg      /usr/local/lib/pine.conf.fixed
+- local help     /usr/local/lib/pine.info
++ global cfg     @@PREFIX@@/etc/pine.conf
++ fixed cfg      @@PREFIX@@/etc/pine.conf.fixed
++ local help     @@PREFIX@@/etc/pine.info
+ 
+  interrupted    ~/.pine-interrupted-mail
+  debug          ~/.pine-debugN
+@@ -594,8 +594,8 @@
+  postponed#     ~/mail/postponed-msgs
+  sentmail#      ~/mail/sent-mail
+  mailcap#       ~/.mailcap + /etc/mailcap
+-                           + /usr/etc/mailcap + /usr/local/etc/mailcap
+- mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
++                           + /usr/etc/mailcap + @@PREFIX@@/etc/mailcap
++ mimetypes#     ~/.mime.types + /etc/mime.types + @@PREFIX@@/etc/mime.types
+ 
+  news-spool	varies across Unix flavors, e.g. /usr/spool/news or /var/news
+  active-news	varies across Unix flavors, e.g. /usr/lib/news/active
+@@ -1052,9 +1052,9 @@
+ this link now to send a message to it:<BR>
+ <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
+ <!--chtml endif-->
+-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
++<!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
+ <HR WIDTH="75%">Local Support Contacts:<P>
+-<!--#include file="/usr/local/lib/pine.info"-->
++<!--#include file="@@PREFIX@@/etc/pine.info"-->
+ <HR WIDTH="75%">
+ <!--chtml endif-->
+ <P> 
+@@ -1142,7 +1142,7 @@
+ <OL>
+   <LI> <A HREF="#intro">Introduction</A>
+   <LI> <A HREF="#pine_help">Pine Help</A>
+-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
++<!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
+   <LI> <A HREF="#local_support">Local Support Contacts</A>
+ <!--chtml endif-->
+   <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
+@@ -1251,9 +1251,9 @@
+ at your site.)
+ 
+ 
+-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
++<!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
+ <H2><A NAME="local_support">Local Support Contacts</A></H2>
+-<!--#include file="/usr/local/lib/pine.info"-->
++<!--#include file="@@PREFIX@@/etc/pine.info"-->
+ <!--chtml endif-->
+ 
+ <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
diff --git a/mail/pine4/files/patch-aw b/mail/pine4/files/patch-aw
deleted file mode 100644
index ae3ad3c1e484..000000000000
--- a/mail/pine4/files/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
---- imap/src/osdep/unix/env_unix.c.orig	Sun Oct 10 13:43:21 1999
-+++ imap/src/osdep/unix/env_unix.c	Wed Oct 13 20:11:32 1999
-@@ -825,7 +825,8 @@
- 	    }
- 	    close (pi[0]); close (pi[1]);
- 	  }
--	  if (lockEaccesError) {/* punt silently if paranoid site */
-+	  if (strncmp(base->lock,"/var/mail/",10) && lockEaccesError) {
-+	  /* punt silently if paranoid site */
- 	    sprintf (tmp,"Mailbox vulnerable - directory %.80s",hitch);
- 	    if (s = strrchr (tmp,'/')) *s = '\0';
- 	    strcat (tmp," must have 1777 protection");
diff --git a/mail/pine4/files/patch-az b/mail/pine4/files/patch-az
index ac90942e3645..ae3c4ec5d334 100644
--- a/mail/pine4/files/patch-az
+++ b/mail/pine4/files/patch-az
@@ -9,17 +9,6 @@
  
  
  /*----------------------------------------------------------------------
---- pine/abookcpy.c.orig	Wed Jul  5 22:13:36 2000
-+++ pine/abookcpy.c	Wed Jul  5 22:13:56 2000
-@@ -63,7 +63,7 @@
-     FILE       *fp;
-     int         trimsize;
- 
--#include "../c-client/linkage.c"
-+#include "c-client/linkage.c"
- 
-     trimsize = parse_args(argc, argv, &local, &remote);
- 
 --- pine/pine.c.orig	Wed Jul  5 22:16:28 2000
 +++ pine/pine.c	Mon Sep 20 16:17:58 1999
 @@ -40,7 +40,7 @@
@@ -40,17 +29,6 @@
  
      /*------- ... then tune the drivers just installed -------*/ 
  #ifdef	DOS
---- pine/adrbklib.c.orig	Wed Jul  5 22:18:28 2000
-+++ pine/adrbklib.c	Wed Jul  5 22:18:46 2000
-@@ -41,7 +41,7 @@
- 
- #include "headers.h"
- #include "adrbklib.h"
--#include "../c-client/imap4r1.h"  /* for LEVELSTATUS() */
-+#include "c-client/imap4r1.h"  /* for LEVELSTATUS() */
- 
- /*
-  * We don't want any end of line fixups to occur, so include "b" in DOS modes.
 --- pine/mailindx.c.orig	Wed Jul  5 22:19:38 2000
 +++ pine/mailindx.c	Wed Jul  5 22:19:49 2000
 @@ -50,7 +50,7 @@
diff --git a/mail/pine4/files/patch-ba b/mail/pine4/files/patch-ba
deleted file mode 100644
index 84b342953976..000000000000
--- a/mail/pine4/files/patch-ba
+++ /dev/null
@@ -1,20 +0,0 @@
-*** pine/newmail.c.orig	Mon Sep 25 15:07:01 2000
---- pine/newmail.c	Tue Sep 26 15:34:24 2000
-***************
-*** 342,348 ****
-  					   e->from->personal, NULL),
-  		   ps_global->ttyo->screen_cols);
-  	else
-! 	  sprintf(from + ((number > 1L) ? 18 : 6), "%s%s%s", 
-  		  e->from->mailbox,
-  		  e->from->host ? "@" : "",
-  		  e->from->host ? e->from->host : "");
---- 342,349 ----
-  					   e->from->personal, NULL),
-  		   ps_global->ttyo->screen_cols);
-  	else
-! 	  snprintf(from + ((number > 1L) ? 18 : 6), sizeof(from) - strlen(from),
-!                   "%s%s%s", 
-  		  e->from->mailbox,
-  		  e->from->host ? "@" : "",
-  		  e->from->host ? e->from->host : "");