Update pine-pgp-filters to 1.1nb2

When displaying 'rows of -', stop at 77 rather than 79 to avoid pine
wrapping the lines.

5 files changed, 82 insertions, 3 deletions

diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile
index a8077c74299..beffd21dbd3 100644
--- a/mail/pine-pgp-filters/Makefile
+++ b/mail/pine-pgp-filters/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/02/04 10:32:30 abs Exp $
+# $NetBSD: Makefile,v 1.3 2005/02/07 15:54:04 abs Exp $
 #
 
 DISTNAME=		pine-pgp-filters-1.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		security mail
 MASTER_SITES=		http://dougbarton.net/FreeBSD/Downloads/
 
diff --git a/mail/pine-pgp-filters/distinfo b/mail/pine-pgp-filters/distinfo
index c71f53e14a1..15318a98655 100644
--- a/mail/pine-pgp-filters/distinfo
+++ b/mail/pine-pgp-filters/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/05 21:42:36 reed Exp $
+$NetBSD: distinfo,v 1.2 2005/02/07 15:54:04 abs Exp $
 
 SHA1 (pine-pgp-filters-1.1.tar.gz) = e81d5ff8c3632d423728aeaed32236093a62a6db
 Size (pine-pgp-filters-1.1.tar.gz) = 6859 bytes
+SHA1 (patch-aa) = 0059bdd731355b7f94e1333c5c476774cffd3ca2
+SHA1 (patch-ab) = 271a81ba0bcc224040e663bf8961c81d136e6edd
+SHA1 (patch-ac) = 4e7ba38d8b4f1d393264fe207ab4ef8e312fcc40
diff --git a/mail/pine-pgp-filters/patches/patch-aa b/mail/pine-pgp-filters/patches/patch-aa
new file mode 100644
index 00000000000..6544399e59f
--- /dev/null
+++ b/mail/pine-pgp-filters/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.1 2005/02/07 15:54:04 abs Exp $
+
+--- scripts/ppf_decrypt.orig	2003-09-06 23:25:42.000000000 +0100
++++ scripts/ppf_decrypt
+@@ -11,11 +11,11 @@ trap "rm -f ${TDIR}/* ; rmdir ${TDIR} ; 
+ pgp_failed () {
+ 	message_file="${1}"
+ 
+-	echo '------------------------------------------------------------------------------' >${TDIR}/error
++	echo '----------------------------------------------------------------------------' >${TDIR}/error
+ 	echo "$0: ${2:-pgp command failed}" >>${TDIR}/error
+ 	echo '' >>${TDIR}/error
+ 	cat ${TDIR}/stderr >>${TDIR}/error
+-	echo '------------------------------------------------------------------------------' >>${TDIR}/error
++	echo '----------------------------------------------------------------------------' >>${TDIR}/error
+ 	echo '' >>${TDIR}/error
+ 	cp ${message_file} ${TDIR}/message
+ 	cat ${TDIR}/error ${TDIR}/message > ${message_file}
+@@ -38,9 +38,9 @@ else
+ 	pgp_failed ${1} "Can't find pgp on this system"
+ fi
+ 
+-echo '----------------------------- PGP Command Output -----------------------------' >${1}
++echo '--------------------------- PGP Command Output -----------------------------' >${1}
+ grep -v '^$' ${TDIR}/stderr >>${1}
+-echo '------------------------------- End PGP Output -------------------------------' >>${1}
++echo '----------------------------- End PGP Output -------------------------------' >>${1}
+ echo '' >>${1}
+ cat ${TDIR}/message >>${1}
+ 
diff --git a/mail/pine-pgp-filters/patches/patch-ab b/mail/pine-pgp-filters/patches/patch-ab
new file mode 100644
index 00000000000..597499f4bdf
--- /dev/null
+++ b/mail/pine-pgp-filters/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2005/02/07 15:54:04 abs Exp $
+
+--- scripts/ppf_mime.orig	2003-09-05 11:23:43.000000000 +0100
++++ scripts/ppf_mime
+@@ -41,9 +41,9 @@ fi
+ egrep -hi '^(From|Resent-From|To|Resent-To|Cc|Resent-cc|Bcc|Newsgroups|Followup-To|Date|Resent-Date|Organization|Subject|Resent-Subject|Reply-To):' ${TDIR}/fa[ab]
+ echo ''
+ 
+-echo '----------------------------- PGP Command Output -----------------------------'
++echo '--------------------------- PGP Command Output -----------------------------'
+ grep -v '^$' ${TDIR}/stderr
+-echo '------------------------------- End PGP Output -------------------------------'
++echo '----------------------------- End PGP Output -------------------------------'
+ 
+ # Remove the MIME headers from the message
+ sed -e '1,2d' -e '3s/^Content-.*//' ${TDIR}/message
diff --git a/mail/pine-pgp-filters/patches/patch-ac b/mail/pine-pgp-filters/patches/patch-ac
new file mode 100644
index 00000000000..2581112fd46
--- /dev/null
+++ b/mail/pine-pgp-filters/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 2005/02/07 15:54:05 abs Exp $
+
+--- scripts/ppf_verify.orig	2003-09-06 23:26:42.000000000 +0100
++++ scripts/ppf_verify
+@@ -11,11 +11,11 @@ trap "rm -f ${TDIR}/* ; rmdir ${TDIR} ; 
+ pgp_failed () {
+ 	message_file="${1}"
+ 
+-	echo '------------------------------------------------------------------------------' >${TDIR}/error
++	echo '----------------------------------------------------------------------------' >${TDIR}/error
+ 	echo "$0: ${2:-pgp command failed}" >>${TDIR}/error
+ 	echo '' >>${TDIR}/error
+ 	cat ${TDIR}/stderr >>${TDIR}/error
+-	echo '------------------------------------------------------------------------------' >>${TDIR}/error
++	echo '----------------------------------------------------------------------------' >>${TDIR}/error
+ 	echo '' >>${TDIR}/error
+ 	cp ${message_file} ${TDIR}/message
+ 	cat ${TDIR}/error ${TDIR}/message > ${message_file}
+@@ -36,9 +36,9 @@ else
+ 	pgp_failed ${1} "Can't find pgp on this system"
+ fi
+ 
+-echo '----------------------------- PGP Command Output -----------------------------' >${1}
++echo '--------------------------- PGP Command Output -----------------------------' >${1}
+ egrep -v '^$|pattern is:' ${TDIR}/stderr >>${1}
+-echo '------------------------------- End PGP Output -------------------------------' >>${1}
++echo '----------------------------- End PGP Output -------------------------------' >>${1}
+ echo '' >>${1}
+ cat ${TDIR}/message >>${1}
+