Upgrade to 4.58, a security and bugfix release which addresses the following:

* Potential security problems caused by maliciously-formed RFC 2231 attachment
parameters

Several other bugs fixed as well.

All users of Pine are highly encouraged to upgrade.

Improvements to the port:
* DOCSDIR'ification of plist
* Patches regenerated to remove fuzz

Approved by:	security-officer, portmgr

10 files changed, 52 insertions, 52 deletions

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 15879c33c538..ec370c3ba168 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pine
-PORTVERSION=	4.56
+PORTVERSION=	4.58
 CATEGORIES=	mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		http://mirror.sit.wisc.edu/pub/net/mail/pine/ \
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index 7b8aeb110d03..b3d50f214655 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1 +1 @@
-MD5 (pine4.56.tar.gz) = 0e1fc91afffd8a6e20c527562f6a432f
+MD5 (pine4.58.tar.gz) = 9fff1ca5fa2363f5684c144a9da4c7ef
diff --git a/mail/pine4/files/patch-ac b/mail/pine4/files/patch-ac
index d0496b728ddd..d5e533d5fcb0 100644
--- a/mail/pine4/files/patch-ac
+++ b/mail/pine4/files/patch-ac
@@ -1,5 +1,5 @@
-*** pine/osdep/os-bsf.h.orig	Tue Feb  6 17:30:45 2001
---- pine/osdep/os-bsf.h	Wed Mar  5 05:30:16 2003
+*** pine/osdep/os-bsf.h.orig	Fri May 23 09:05:21 2003
+--- pine/osdep/os-bsf.h	Fri Sep  5 01:44:20 2003
 ***************
 *** 87,93 ****
      NOTE: You'll also have to make sure the appropriate osdep/postreap.*
@@ -18,8 +18,8 @@
   
   
 ***************
-*** 203,208 ****
---- 203,210 ----
+*** 209,214 ****
+--- 209,216 ----
   #define DF_KBLOCK_PASSWD_COUNT    "1"
   #define DF_REMOTE_ABOOK_HISTORY   "3"
   
@@ -29,7 +29,7 @@
      The default printer when pine starts up for the first time with no printer
    ----*/
 ***************
-*** 268,274 ****
+*** 280,286 ****
          8
          9 logs gross details of command execution
    ----*/
@@ -37,7 +37,7 @@
   
   
   
---- 270,276 ----
+--- 282,288 ----
          8
          9 logs gross details of command execution
    ----*/
diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af
index 0c01a932969c..59fc8fa4300c 100644
--- a/mail/pine4/files/patch-af
+++ b/mail/pine4/files/patch-af
@@ -1,6 +1,6 @@
---- imap/src/osdep/unix/Makefile.orig	Wed Aug 29 12:15:15 2001
-+++ imap/src/osdep/unix/Makefile	Fri Sep 28 00:08:24 2001
-@@ -97,7 +97,7 @@
+--- imap/src/osdep/unix/Makefile.orig	Mon Jul 14 18:35:30 2003
++++ imap/src/osdep/unix/Makefile	Fri Sep  5 01:44:20 2003
+@@ -98,7 +98,7 @@
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
@@ -9,7 +9,7 @@
  LN=ln -s
  RANLIB=ranlib
  
-@@ -115,7 +115,7 @@
+@@ -116,7 +116,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
@@ -18,7 +18,7 @@
  
  CAT=cat
  MAKE=make
-@@ -217,8 +217,9 @@
+@@ -218,8 +218,9 @@
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
diff --git a/mail/pine4/files/patch-ai b/mail/pine4/files/patch-ai
index b963348653c8..5687a2ae77a4 100644
--- a/mail/pine4/files/patch-ai
+++ b/mail/pine4/files/patch-ai
@@ -1,7 +1,7 @@
-*** pine/send.c.Dist	Mon Aug 27 10:54:33 2001
---- pine/send.c	Fri Sep 28 00:19:47 2001
+*** pine/send.c.orig	Fri Aug 29 15:03:08 2003
+--- pine/send.c	Fri Sep  5 01:44:20 2003
 ***************
-*** 7689,7701 ****
+*** 8251,8263 ****
   		body->subtype = cpystr("octet-stream");
   	    }
   
@@ -15,7 +15,7 @@
   	}
       }
   
---- 7689,7705 ----
+--- 8251,8267 ----
   		body->subtype = cpystr("octet-stream");
   	    }
   
@@ -34,7 +34,7 @@
       }
   
 ***************
-*** 8659,8665 ****
+*** 9278,9284 ****
   
   	switch (body->encoding) {	/* all else needs filtering */
   	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
@@ -42,7 +42,7 @@
   	    break;
   
   	  case ENCBINARY:		/* encode binary into BASE64 */
---- 8663,8670 ----
+--- 9282,9289 ----
   
   	switch (body->encoding) {	/* all else needs filtering */
   	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
@@ -52,7 +52,7 @@
   
   	  case ENCBINARY:		/* encode binary into BASE64 */
 ***************
-*** 8761,8767 ****
+*** 9392,9398 ****
   	     && !(so_puts(so, "Content-Transfer-Encoding: ")
   		  && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
   						? ENCBASE64
@@ -60,7 +60,7 @@
   						  ? ENCQUOTEDPRINTABLE
   						  : (body->encoding <= ENCMAX)
   						    ? body->encoding
---- 8766,8772 ----
+--- 9397,9403 ----
   	     && !(so_puts(so, "Content-Transfer-Encoding: ")
   		  && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
   						? ENCBASE64
diff --git a/mail/pine4/files/patch-ak b/mail/pine4/files/patch-ak
index da2c4b494ee8..27702ef00648 100644
--- a/mail/pine4/files/patch-ak
+++ b/mail/pine4/files/patch-ak
@@ -1,7 +1,7 @@
-*** imap/Makefile.orig	Mon Nov  4 16:21:06 2002
---- imap/Makefile	Tue Nov 26 03:08:33 2002
+*** imap/Makefile.orig	Mon Jul 14 18:35:29 2003
+--- imap/Makefile	Fri Sep  5 01:44:20 2003
 ***************
-*** 425,440 ****
+*** 453,468 ****
   	$(TOOLS)/$@ "$(LN)" src/ansilib c-client
   	$(TOOLS)/$@ "$(LN)" src/charset c-client
   	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
@@ -18,7 +18,7 @@
   
   OSTYPE:
   	@echo Building c-client for $(BUILDTYPE)...
---- 425,440 ----
+--- 453,468 ----
   	$(TOOLS)/$@ "$(LN)" src/ansilib c-client
   	$(TOOLS)/$@ "$(LN)" src/charset c-client
   	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
diff --git a/mail/pine4/files/patch-ap b/mail/pine4/files/patch-ap
index 3618544b31e2..f41ce128e49e 100644
--- a/mail/pine4/files/patch-ap
+++ b/mail/pine4/files/patch-ap
@@ -1,7 +1,7 @@
-*** pico/osdep/term.cap.orig	Thu Jun 21 10:48:09 2001
---- pico/osdep/term.cap	Fri Sep 28 00:19:46 2001
+*** pico/osdep/term.cap.orig	Thu Nov 14 09:27:17 2002
+--- pico/osdep/term.cap	Fri Sep  5 01:44:21 2003
 ***************
-*** 280,286 ****
+*** 288,294 ****
       _kppu		= tgetstr("kP", &p);
       _kppd		= tgetstr("kN", &p);
       _kphome		= tgetstr("kh", &p);
@@ -9,7 +9,7 @@
       _kpdel		= tgetstr("kD", &p);
       _kf1		= tgetstr("k1", &p);
       _kf2		= tgetstr("k2", &p);
---- 280,287 ----
+--- 288,295 ----
       _kppu		= tgetstr("kP", &p);
       _kppd		= tgetstr("kN", &p);
       _kphome		= tgetstr("kh", &p);
diff --git a/mail/pine4/files/patch-bb b/mail/pine4/files/patch-bb
index 2e15ed7ffcf0..974aa8510b03 100644
--- a/mail/pine4/files/patch-bb
+++ b/mail/pine4/files/patch-bb
@@ -1,6 +1,6 @@
---- pine/init.c.orig	Wed Mar  5 05:11:10 2003
-+++ pine/init.c	Wed Mar  5 05:21:57 2003
-@@ -1463,6 +1463,9 @@
+--- pine/init.c.orig	Fri May 23 09:10:06 2003
++++ pine/init.c	Fri Sep  5 01:44:21 2003
+@@ -1485,6 +1485,9 @@
      GLO_NORM_FORE_COLOR		= cpystr(colorx(DEFAULT_NORM_FORE));
      GLO_NORM_BACK_COLOR		= cpystr(colorx(DEFAULT_NORM_BACK));
  #endif
diff --git a/mail/pine4/files/patch-reply.c b/mail/pine4/files/patch-reply.c
index 8e38b85419c8..e3548a46b3cb 100644
--- a/mail/pine4/files/patch-reply.c
+++ b/mail/pine4/files/patch-reply.c
@@ -1,6 +1,6 @@
---- pine/reply.c.orig	Wed Dec  4 21:10:12 2002
-+++ pine/reply.c	Mon Dec 16 03:40:23 2002
-@@ -5092,7 +5092,10 @@
+--- pine/reply.c.orig	Fri Aug 29 14:43:38 2003
++++ pine/reply.c	Fri Sep  5 01:44:21 2003
+@@ -5183,7 +5183,10 @@
  char *
  generate_message_id()
  {
@@ -12,7 +12,7 @@
      char        *id;
      time_t       now;
      struct tm   *now_x;
-@@ -5100,14 +5103,11 @@
+@@ -5191,14 +5194,11 @@
  
      now   = time((time_t *)0);
      now_x = localtime(&now);
@@ -31,7 +31,7 @@
  
      hostpart = F_ON(F_ROT13_MESSAGE_ID, ps_global)
  		 ? rot13(ps_global->hostname)
-@@ -5116,8 +5116,8 @@
+@@ -5207,8 +5207,8 @@
      if(!hostpart)
        hostpart = cpystr("huh");
  
diff --git a/mail/pine4/pkg-plist b/mail/pine4/pkg-plist
index bb1e8e20f88d..c3ae80816d9d 100644
--- a/mail/pine4/pkg-plist
+++ b/mail/pine4/pkg-plist
@@ -8,18 +8,18 @@ bin/rpdump
 bin/rpload
 @exec %D/bin/pine -P %D/etc/pine.conf -conf >%D/etc/pine.conf.tmp
 @exec /bin/mv %D/etc/pine.conf.tmp %D/etc/pine.conf
-%%PORTDOCS%%share/doc/pine/README
-%%PORTDOCS%%share/doc/pine/CPYRIGHT
-%%PORTDOCS%%share/doc/pine/brochure.txt
-%%PORTDOCS%%share/doc/pine/tech-notes.txt
-%%PORTDOCS%%share/doc/pine/tech-notes/background.html
-%%PORTDOCS%%share/doc/pine/tech-notes/cmd-line.html
-%%PORTDOCS%%share/doc/pine/tech-notes/config-notes.html
-%%PORTDOCS%%share/doc/pine/tech-notes/config.html
-%%PORTDOCS%%share/doc/pine/tech-notes/index.html
-%%PORTDOCS%%share/doc/pine/tech-notes/installation.html
-%%PORTDOCS%%share/doc/pine/tech-notes/introduction.html
-%%PORTDOCS%%share/doc/pine/tech-notes/low-level.html
-%%PORTDOCS%%share/doc/pine/tech-notes/porting.html
-%%PORTDOCS%%@dirrm share/doc/pine/tech-notes
-%%PORTDOCS%%@dirrm share/doc/pine
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/CPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/brochure.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech-notes/background.html
+%%PORTDOCS%%%%DOCSDIR%%/tech-notes/cmd-line.html
+%%PORTDOCS%%%%DOCSDIR%%/tech-notes/config-notes.html
+%%PORTDOCS%%%%DOCSDIR%%/tech-notes/config.html
+%%PORTDOCS%%%%DOCSDIR%%/tech-notes/index.html
+%%PORTDOCS%%%%DOCSDIR%%/tech-notes/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/tech-notes/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/tech-notes/low-level.html
+%%PORTDOCS%%%%DOCSDIR%%/tech-notes/porting.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech-notes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%