6 files changed, 76 insertions, 215 deletions

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 890eccb9bc04..dd3a4102d410 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	pine
-# Version required:     4.10
+# Version required:     4.20
 # Date created:		09 July 1998
 # Whom:			Adrian Penisoara <ady@freebsd.ady.ro>
 #
@@ -9,8 +9,8 @@
 # pine4-ssl port. Also, please mirror changes to the files/
 # directory to the pine4-ssl port.
 
-DISTNAME?=       pine4.10
-PKGNAME?=        pine-4.10
+DISTNAME?=       pine4.20
+PKGNAME?=        pine-4.20
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index b3204a994a12..2859144ecea3 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1,2 +1 @@
-MD5 (pine4.10.tar.gz) = f871e201b4070da1f060f35d3b8f2ccd
-SIZE (pine4.10.tar.gz) =  2827865
+MD5 (pine4.20.tar.gz) = 9b60a049e3575fc0b1a201f5f0105f14
diff --git a/mail/pine4/files/patch-aa b/mail/pine4/files/patch-aa
deleted file mode 100644
index 19ea424ab676..000000000000
--- a/mail/pine4/files/patch-aa
+++ /dev/null
@@ -1,98 +0,0 @@
-Patch posted on BUGTRAQ & pine-info mailing lists which fixes the
-so-called "remote exploit in pine" bug.
-More info: http://www.washington.edu/pine/pine-info/1999.02/msg00056.html
-*** ./pine/init.c.orig	Tue Jan 26 11:57:56 1999
---- ./pine/init.c	Tue Feb  9 19:23:06 1999
-***************
-*** 1791,1796 ****
---- 1791,1798 ----
-  	 F_QUELL_PARTIAL_FETCH, NO_HELP, PREF_NONE},
-  	{"save-aggregates-copy-sequence",
-  	 F_AGG_SEQ_COPY, NO_HELP, PREF_NONE},
-+ 	{"enable-mailcap-param-substitution",
-+ 	 F_DO_MAILCAP_PARAM_SUBST, NO_HELP, PREF_NONE},
-  	{"termdef-takes-precedence",
-  	 F_TCAP_WINS, NO_HELP, PREF_NONE}
-      };
-*** ./pine/mailcap.c.orig	Wed Nov 18 10:00:15 1998
---- ./pine/mailcap.c	Tue Feb  9 19:23:40 1999
-***************
-*** 739,745 ****
-      dprint(5, (debugfile, "- mc_passes_test -\n"));
-  
-      if(mc->testcommand && *mc->testcommand)
-! 	cmd = mc_bld_test_cmd(mc->testcommand, type, subtype, params);
-      
-      if(!mc->testcommand || !cmd || !*cmd){
-  	if(cmd)
---- 739,746 ----
-      dprint(5, (debugfile, "- mc_passes_test -\n"));
-  
-      if(mc->testcommand && *mc->testcommand)
-! 	if(!(cmd = mc_bld_test_cmd(mc->testcommand, type, subtype, params)))
-! 	  return(FALSE);	/* couldn't be built */
-      
-      if(!mc->testcommand || !cmd || !*cmd){
-  	if(cmd)
-***************
-*** 794,800 ****
-      if(needsterm)
-        *needsterm = mc->needsterminal;
-  
-!     command = mc_cmd_bldr(mc->command, type, subtype, params, tmp_file);
-  
-      dprint(5, (debugfile, "built command: %s\n", command));
-  
---- 795,802 ----
-      if(needsterm)
-        *needsterm = mc->needsterminal;
-  
-!     if(!(command = mc_cmd_bldr(mc->command, type, subtype, params, tmp_file)))
-!       command = cpystr("");
-  
-      dprint(5, (debugfile, "built command: %s\n", command));
-  
-***************
-*** 871,876 ****
---- 873,884 ----
-  		break;
-  
-  	      case '{':			/* insert requested MIME param */
-+ 		if(F_OFF(F_DO_MAILCAP_PARAM_SUBST, ps_global)){
-+ 		    dprint(2,
-+ 			   (debugfile, "mc_cmd_bldr: param subs %s\n", from));
-+ 		   return(NULL);
-+ 		}
-+ 
-  		s = strindex(from, '}');
-  		if(!s){
-  		    q_status_message1(SM_ORDER, 0, 4,
-***************
-*** 956,962 ****
-        sprintf(to, MC_ADD_TMP, tmp_file);
-  
-      return(cpystr(tmp_20k_buf));
-! } 
-  
-  
-  /*
---- 964,970 ----
-        sprintf(to, MC_ADD_TMP, tmp_file);
-  
-      return(cpystr(tmp_20k_buf));
-! }
-  
-  
-  /*
-*** ./pine/pine.h.orig	Thu Jan 28 16:52:00 1999
---- ./pine/pine.h	Tue Feb  9 19:23:21 1999
-***************
-*** 886,891 ****
---- 886,892 ----
-  	F_SHOW_TEXTPLAIN_INT,
-  	F_ROLE_CONFIRM_DEFAULT,
-  	F_NO_FCC_ATTACH,
-+ 	F_DO_MAILCAP_PARAM_SUBST,
-  #ifdef	ENABLE_LDAP
-  	F_ADD_LDAP_TO_ABOOK,
-  #endif
diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al
index dad666485297..a55e334900a9 100644
--- a/mail/pine4/files/patch-al
+++ b/mail/pine4/files/patch-al
@@ -1,100 +1,60 @@
-*** build.orig	Wed Dec 16 01:53:29 1998
---- build	Tue Feb  9 21:38:45 1999
-***************
-*** 80,87 ****
-   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
-!         configuration files, /usr/local/lib/pine.conf and 
-!         /usr/local/lib/pine.info. See the documentation for details.
-   
-   pico   The standalone editor similar to the Pine message composer.
-          This is a very simple straight forward text editor.
---- 80,87 ----
-   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
-!         configuration files, /usr/local/etc/pine.conf and 
-!         /usr/local/etc/pine.info. See the documentation for details.
-   
-   pico   The standalone editor similar to the Pine message composer.
-          This is a very simple straight forward text editor.
-***************
-*** 277,287 ****
+--- build.orig	Fri Feb 19 18:30:54 1999
++++ build	Wed Oct 13 17:53:42 1999
+@@ -80,8 +80,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
+-        configuration files, /usr/local/lib/pine.conf and 
+-        /usr/local/lib/pine.info. See the documentation for details.
++        configuration files, /usr/local/etc/pine.conf and 
++        /usr/local/etc/pine.info. See the documentation for details.
++
   
-          if [ -s c-client ] ; then rm -f c-client ; fi
-          ln -s imap/c-client c-client
-!         if [ -s mtest    ] ; then rm -f mtest    ; fi
-!         ln -s imap/mtest mtest
-!         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
-          cd $PHOME/imap
-          eval make "$makeargs" "$K1" "$K2" $ccltarg
---- 277,287 ----
-  
-          if [ -s c-client ] ; then rm -f c-client ; fi
-          ln -s imap/c-client c-client
-! #       if [ -s mtest    ] ; then rm -f mtest    ; fi
-! #       ln -s imap/mtest mtest
-! #       if [ -s imapd    ] ; then rm -f imapd    ; fi
-! #       ln -s imap/imapd imapd
-!         echo "Making c-client library"
-          eval echo make "$makeargs" "$K1" "$K2" $ccltarg
-          cd $PHOME/imap
-          eval make "$makeargs" "$K1" "$K2" $ccltarg
-***************
-*** 302,315 ****
-          cd $PHOME/bin
-          rm -f pine mtest imapd pico pilot
-          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
-!         if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
-!         if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
-          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
-          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
-          cd $PHOME
-          echo ''
-          echo "Links to executables are in bin directory:"
-!         size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
-          echo "Done"
-          ;;
-  
---- 302,315 ----
-          cd $PHOME/bin
-          rm -f pine mtest imapd pico pilot
-          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
-! #       if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
-! #       if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
-          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
-          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
-          cd $PHOME
-          echo ''
-          echo "Links to executables are in bin directory:"
-!         size bin/pine bin/pico bin/pilot
-          echo "Done"
-          ;;
-  
-***************
-*** 320,329 ****
-  	make clean
-          echo "Cleaning Pine"
-          cd $PHOME/pine
-!         make -f makefile.ult clean
-          echo "Cleaning pico"
-          cd $PHOME/pico
-!         make $makeargs -f makefile.ult clean
-          echo "Done"
-          cd $PHOME
-          ;;
---- 320,329 ----
-  	make clean
-          echo "Cleaning Pine"
-          cd $PHOME/pine
-!         make -f makefile.bsf clean
-          echo "Cleaning pico"
-          cd $PHOME/pico
-!         make $makeargs -f makefile.bsf clean
-          echo "Done"
-          cd $PHOME
-          ;;
+  pico   The standalone editor similar to the Pine message composer.
+         This is a very simple straight forward text editor.
+@@ -278,10 +279,10 @@
+ 
+         if [ -s c-client ] ; then rm -f c-client ; fi
+         ln -s imap/c-client c-client
+-        if [ -s mtest    ] ; then rm -f mtest    ; fi
+-        ln -s imap/mtest mtest
+-        if [ -s imapd    ] ; then rm -f imapd    ; fi
+-        ln -s imap/imapd imapd
++#        if [ -s mtest    ] ; then rm -f mtest    ; fi
++#        ln -s imap/mtest mtest
++#        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
+         cd $PHOME/imap
+@@ -303,14 +304,14 @@
+         cd $PHOME/bin
+         rm -f pine mtest imapd pico pilot
+         if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
+-        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
+-        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
++#        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
++#        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
+         if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
+         if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
+         cd $PHOME
+         echo ''
+         echo "Links to executables are in bin directory:"
+-        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
++        size bin/pine bin/pico bin/pilot
+ 	case $maketarg in
+ 	    mnt)    echo "Fixing stacksizes ..."
+ 		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
+@@ -325,10 +326,10 @@
+ 	make clean
+         echo "Cleaning Pine"
+         cd $PHOME/pine
+-        make -f makefile.ult clean
++        make -f makefile.bsf clean
+         echo "Cleaning pico"
+         cd $PHOME/pico
+-        make $makeargs -f makefile.ult clean
++        make $makeargs -f makefile.bsf clean
+         echo "Done"
+         cd $PHOME
+         ;;
diff --git a/mail/pine4/files/patch-as b/mail/pine4/files/patch-as
index 45495d096750..5bb66b9d8953 100644
--- a/mail/pine4/files/patch-as
+++ b/mail/pine4/files/patch-as
@@ -16,19 +16,7 @@
 ! 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.
-  
-***************
-*** 597,602 ****
---- 597,605 ----
-  #ifdef	DF_SMTP_SERVER
-      GLO_SMTP_SERVER		= parse_list(DF_SMTP_SERVER, 1, NULL);
-  #endif
-+ 
-+     F_TURN_ON(F_TCAP_WINS,ps);
-+     F_TURN_ON(F_QUELL_INTERNAL_MSG,ps);
-  
-      /* Set the default mail directory */
-      build_path(buf, GLO_MAIL_DIRECTORY, "[]");
+
 *** 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-aw b/mail/pine4/files/patch-aw
new file mode 100644
index 000000000000..ae3ad3c1e484
--- /dev/null
+++ b/mail/pine4/files/patch-aw
@@ -0,0 +1,12 @@
+--- 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");