Pullup ticket 1054 - requested by Lubomir Sedlacik

security update for pine (and update of pico)

Revisions pulled up:
- pkgsrc/editors/pico/Makefile		1.66
- pkgsrc/editors/pico/buildlink3.mk	1.8
- pkgsrc/editors/pico/distinfo		1.23
- pkgsrc/editors/pico/patches/patch-aa	1.16
- pkgsrc/editors/pico/patches/patch-ab	removed
- pkgsrc/editors/pico/patches/patch-ac	1.11
- pkgsrc/editors/pico/patches/patch-ae	1.9
- pkgsrc/editors/pico/patches/patch-af	1.6
- pkgsrc/editors/pico/patches/patch-ag	1.4
- pkgsrc/editors/pico/patches/patch-ah	1.4
- pkgsrc/mail/pine/Makefile		1.108
- pkgsrc/mail/pine/PLIST		1.7
- pkgsrc/mail/pine/distinfo		1.32

   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Thu Jan 12 21:00:52 UTC 2006

   Modified Files:
           pkgsrc/editors/pico: Makefile buildlink3.mk distinfo
           pkgsrc/editors/pico/patches: patch-aa patch-ac patch-ae patch-af
               patch-ag patch-ah
   Removed Files:
           pkgsrc/editors/pico/patches: patch-ab

   Log Message:
   Synchronised with pine-4.64
---
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Thu Jan 12 21:02:54 UTC 2006

   Modified Files:
           pkgsrc/mail/pine: Makefile PLIST distinfo

   Log Message:
   Changes 4.64:
   * Fixed buffer overflow vulnerability
   * Several features added

13 files changed, 40 insertions, 86 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 17dda69c1ed..c39869dc1a1 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.65 2005/08/12 20:21:29 tv Exp $
+# $NetBSD: Makefile,v 1.65.4.1 2006/01/25 05:40:36 snj Exp $
 #
 # NOTE:
 # When updating, it is necessary to change the shlib version, located in
 # several files in patches/.  If you do not KNOW that the new version is
 # backwards ABI compatible (usually not), bump the major version,
 # and then bump the BUILDLINK_DEPENDS in buildlink3.mk.
-#
 
-DISTNAME=	pine4.63
+DISTNAME=	pine4.64
 PKGNAME=	pico-4.10
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/
diff --git a/editors/pico/buildlink3.mk b/editors/pico/buildlink3.mk
index 8cdd391652a..6cb7a11321a 100644
--- a/editors/pico/buildlink3.mk
+++ b/editors/pico/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/02/15 18:13:41 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7.8.1 2006/01/25 05:40:36 snj Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PICO_BUILDLINK3_MK:=	${PICO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npico}
 BUILDLINK_PACKAGES+=	pico
 
 .if !empty(PICO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pico+=	pico>=4.9nb2
+BUILDLINK_DEPENDS.pico+=	pico>=4.10
 BUILDLINK_PKGSRCDIR.pico?=	../../editors/pico
 .endif	# PICO_BUILDLINK3_MK
 
diff --git a/editors/pico/distinfo b/editors/pico/distinfo
index 10509922a70..8503b385bd8 100644
--- a/editors/pico/distinfo
+++ b/editors/pico/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.22 2005/12/09 16:19:46 joerg Exp $
+$NetBSD: distinfo,v 1.22.2.1 2006/01/25 05:40:36 snj Exp $
 
-SHA1 (pine4.63.tar.bz2) = ad235c1fad7cc8adfff5c69cea8eb267afa648c9
-RMD160 (pine4.63.tar.bz2) = b04a6f5134aeae6b0a5663acbfa4e812c3fc7762
-Size (pine4.63.tar.bz2) = 3083721 bytes
-SHA1 (patch-aa) = 72d60d767e067e0db23c69fe350359e4042f1c3a
-SHA1 (patch-ab) = 9bdecf2ea00d14e7abb72c4b4cce74da890e89da
-SHA1 (patch-ac) = b5a6efc3056cb677aceb77ed00a8f71fc84083f3
+SHA1 (pine4.64.tar.bz2) = b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e
+RMD160 (pine4.64.tar.bz2) = 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd
+Size (pine4.64.tar.bz2) = 3110790 bytes
+SHA1 (patch-aa) = cda803b835c5d0d7cb4e4c3f162a680db2b8a0b1
+SHA1 (patch-ac) = a6de88e9ab5f1464d58476cbbeb0579938d51427
 SHA1 (patch-ad) = a5145664372b0ad308a0ee2501211e927d343971
-SHA1 (patch-ae) = dc29440e0e6625dc9674d8498eedfe730a4c0520
-SHA1 (patch-af) = 50559e76706fd1107b96979b2aedcb760abf9f88
-SHA1 (patch-ag) = 88a8a8ca456355165726425de7cf18a13435a3a2
-SHA1 (patch-ah) = 2c18b4fb1b57a0bdd1e164c7eefe0bd684f26764
+SHA1 (patch-ae) = 143fa40c6c597c23fc7ac187c683cbff7bf85688
+SHA1 (patch-af) = 430922a5388d6924461445af9701f75c0fcf3922
+SHA1 (patch-ag) = e92dbb0cacb7104570c356f093ad2fb1cd3b9d2d
+SHA1 (patch-ah) = 65f713181af150c64a28ec6547fc966eddae1961
 SHA1 (patch-ai) = 7e2a70ee4322aa85de80089c2e4470ec12bfe110
diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa
index d2113161dda..d6414da8fb0 100644
--- a/editors/pico/patches/patch-aa
+++ b/editors/pico/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.15 2005/08/12 20:21:29 tv Exp $
+$NetBSD: patch-aa,v 1.15.4.1 2006/01/25 05:40:36 snj Exp $
 
 --- pico/makefile.neb.orig	2001-10-24 00:19:07.000000000 +0200
 +++ pico/makefile.neb	2003-07-28 14:04:16.000000000 +0200
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.15 2005/08/12 20:21:29 tv Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+			-version-info 5:1
++			-version-info 6:0
  
  clean:
  		rm -f *.a *.o *~ pico_os.c os.h pico pilot
diff --git a/editors/pico/patches/patch-ab b/editors/pico/patches/patch-ab
deleted file mode 100644
index 4103a0e480d..00000000000
--- a/editors/pico/patches/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2005/08/12 20:21:30 tv Exp $
-
---- pico/makefile.sfu.orig	2005-02-15 13:08:55.000000000 -0500
-+++ pico/makefile.sfu
-@@ -34,15 +34,12 @@ LN=          ln -s
- MAKE=        make
- OPTIMIZE=    # -O
- PROFILE=     # -pg
--DEBUG=       -g -DDEBUG
-+DEBUG=       # -g -DDEBUG
- 
- STDCFLAGS=	-Dsfu -DJOB_CONTROL -DPOSIX -DMOUSE
- CFLAGS=         $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
- 
- # switches for library building
--LIBCMD=		ar
--LIBARGS=	ru
--RANLIB=		true
- 
- LIBS=		$(EXTRALDFLAGS) -lcurses
- 
-@@ -57,17 +54,17 @@ HFILES=		headers.h estruct.h edef.h efun
- # dependencies for the Unix versions of pico and libpico.a
- #
- all:		pico pilot
--pico pilot:	libpico.a
-+pico pilot:	libpico.la
- 
- pico:		main.o
--		$(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
-+		$(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
- 
- pilot:		pilot.o
--		$(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
-+		$(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
- 
--libpico.a:	$(OFILES)
--		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
--		$(RANLIB) libpico.a
-+libpico.la:	$(OFILES)
-+		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+			-version-info 5:1
- 
- clean:
- 		rm -f *.a *.o *~ pico_os.c os.h pico pilot
diff --git a/editors/pico/patches/patch-ac b/editors/pico/patches/patch-ac
index 801da1d8928..e5be05b788f 100644
--- a/editors/pico/patches/patch-ac
+++ b/editors/pico/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2005/01/25 10:07:56 adam Exp $
+$NetBSD: patch-ac,v 1.10.8.1 2006/01/25 05:40:36 snj Exp $
 
---- build.orig	2004-12-27 17:36:53.000000000 +0000
+--- build.orig	2005-05-04 23:22:22.000000000 +0200
 +++ build
-@@ -393,63 +393,6 @@ case $maketarg in
+@@ -394,63 +394,6 @@ case $maketarg in
  	  echo "Including SSL functionality"
  	fi
  
@@ -66,7 +66,7 @@ $NetBSD: patch-ac,v 1.10 2005/01/25 10:07:56 adam Exp $
          echo "Making Pico and Pilot"
          cd "$PHOME/pico"
          eval echo make "$makeargs" -f makefile.$picotarg
-@@ -458,50 +401,8 @@ case $maketarg in
+@@ -459,50 +402,8 @@ case $maketarg in
  	if [ $rc != "0" ] ; then exit $rc ; fi
          echo ''
  
diff --git a/editors/pico/patches/patch-ae b/editors/pico/patches/patch-ae
index 1dd37ac9728..5d503b39fe6 100644
--- a/editors/pico/patches/patch-ae
+++ b/editors/pico/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.8 2005/08/12 20:21:30 tv Exp $
+$NetBSD: patch-ae,v 1.8.4.1 2006/01/25 05:40:36 snj Exp $
 
 --- pico/makefile.sol.orig	Tue Oct 23 22:19:09 2001
 +++ pico/makefile.sol	Fri Dec 14 19:11:59 2001
@@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.8 2005/08/12 20:21:30 tv Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+		-version-info 5:1
++			-version-info 6:0
  
  clean:
  		rm -f *.a *.o *~ pico_os.c os.h pico pilot
diff --git a/editors/pico/patches/patch-af b/editors/pico/patches/patch-af
index d0a323c3bc8..d7a64044080 100644
--- a/editors/pico/patches/patch-af
+++ b/editors/pico/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2005/08/12 20:21:30 tv Exp $
+$NetBSD: patch-af,v 1.5.4.1 2006/01/25 05:40:36 snj Exp $
 
 --- pico/makefile.osx.orig	Fri Sep 20 14:23:15 2002
 +++ pico/makefile.osx
@@ -35,7 +35,7 @@ $NetBSD: patch-af,v 1.5 2005/08/12 20:21:30 tv Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+			-version-info 5:1
++			-version-info 6:0
  
  clean:
  		rm -f *.a *.o *~ pico_os.c os.h pico pilot
diff --git a/editors/pico/patches/patch-ag b/editors/pico/patches/patch-ag
index f25d586ed7d..151b80d7f1c 100644
--- a/editors/pico/patches/patch-ag
+++ b/editors/pico/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 2005/08/12 20:21:30 tv Exp $
+$NetBSD: patch-ag,v 1.3.4.1 2006/01/25 05:40:36 snj Exp $
 
 --- pico/makefile.lnx.orig	Tue Oct 23 15:19:06 2001
 +++ pico/makefile.lnx
@@ -43,7 +43,7 @@ $NetBSD: patch-ag,v 1.3 2005/08/12 20:21:30 tv Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+			-version-info 5:1
++			-version-info 6:0
  
  clean:
  		rm -f *.a *.o *~ pico_os.c os.h pico pilot
diff --git a/editors/pico/patches/patch-ah b/editors/pico/patches/patch-ah
index 2435cb4c0ef..d524918304e 100644
--- a/editors/pico/patches/patch-ah
+++ b/editors/pico/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.3 2005/08/12 20:21:30 tv Exp $
+$NetBSD: patch-ah,v 1.3.4.1 2006/01/25 05:40:36 snj Exp $
 
 --- pico/makefile.sgi.orig	Mon Jan 17 22:03:01 2005
 +++ pico/makefile.sgi	Mon Jan 17 22:04:34 2005
@@ -39,7 +39,7 @@ $NetBSD: patch-ah,v 1.3 2005/08/12 20:21:30 tv Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+			-version-info 5:1
++			-version-info 6:0
  
  clean:
  		rm -f *.a *.o *~ pico_os.c os.h pico pilot
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index eae58d5dfb4..a3b8f6ccc6a 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2005/08/12 20:23:00 tv Exp $
+# $NetBSD: Makefile,v 1.106.4.1 2006/01/25 05:40:36 snj Exp $
 
-DISTNAME=	pine4.63
-PKGNAME=	pine-4.63
+DISTNAME=	pine4.64
+PKGNAME=	pine-4.64
 CATEGORIES=	mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/
diff --git a/mail/pine/PLIST b/mail/pine/PLIST
index 403bd199750..ff80e45ead7 100644
--- a/mail/pine/PLIST
+++ b/mail/pine/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.6 2005/04/15 16:36:39 tron Exp $
+@comment $NetBSD: PLIST,v 1.6.6.1 2006/01/25 05:40:36 snj Exp $
 bin/pine
 bin/rpdump
 bin/rpload
 man/man1/pine.1
 man/man1/rpdump.1
 man/man1/rpload.1
-share/pine/tech-notes.txt
+share/examples/pine/pine.conf
+share/examples/pine/pine.conf.fixed
 share/pine/contrib/krb5-setup
 share/pine/contrib/ldap-setup
 share/pine/contrib/utils/ansiprt.c
@@ -15,8 +16,7 @@ share/pine/contrib/utils/pwd2pine
 share/pine/contrib/utils/sendit.sh
 share/pine/contrib/utils/sendtoall
 share/pine/contrib/utils/txtcc.sh
-share/examples/pine/pine.conf
-share/examples/pine/pine.conf.fixed
+share/pine/tech-notes.txt
 @dirrm share/pine/contrib/utils
 @dirrm share/pine/contrib
 @dirrm share/pine
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index ca28b0a6b4a..a2095985e3e 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2005/12/05 20:50:34 rillig Exp $
+$NetBSD: distinfo,v 1.31.2.1 2006/01/25 05:40:36 snj Exp $
 
-SHA1 (pine4.63.tar.bz2) = ad235c1fad7cc8adfff5c69cea8eb267afa648c9
-RMD160 (pine4.63.tar.bz2) = b04a6f5134aeae6b0a5663acbfa4e812c3fc7762
-Size (pine4.63.tar.bz2) = 3083721 bytes
+SHA1 (pine4.64.tar.bz2) = b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e
+RMD160 (pine4.64.tar.bz2) = 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd
+Size (pine4.64.tar.bz2) = 3110790 bytes
 SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
 SHA1 (patch-ab) = cfac4d24763dbd4285e03c6c25891469c5ac1953
 SHA1 (patch-ac) = 870d7d414e25b37e47c5f62447210fe7800c733b