Upgrade from version 2.1.1 to 2.5 of exmh, as prompted by Steve

Bellovin in PR 13990.  Changes are bug fixes, and a few enhancements,
a lot of them related to PGP and gpg.  This upgrade also closes the
security hole in 2.1.1.

3 files changed, 35 insertions, 36 deletions

diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index 52052b0543a..097f60b28d8 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2001/05/05 19:51:16 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/10/11 09:26:03 agc Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/02/15 05:36:54 peter Exp
 #
 
-DISTNAME=	exmh-2.1.1
+DISTNAME=	exmh-2.5
 CATEGORIES=	mail tk80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/exmh/
 
@@ -31,7 +31,7 @@ TCLSH=		tclsh
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \
-		WISH=${PREFIX}/bin/${WISH} WRKSRC=${WRKSRC} \
+		WISH=${PREFIX}/../tk-8.3.2nb1/bin/${WISH} WRKSRC=${WRKSRC} \
 		FILESDIR=${FILESDIR} ${SH} ${SCRIPTDIR}/build
 
 do-install:
diff --git a/mail/exmh/distinfo b/mail/exmh/distinfo
index 3ad9f2afafc..bac2e420ece 100644
--- a/mail/exmh/distinfo
+++ b/mail/exmh/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:09:56 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/11 09:26:04 agc Exp $
 
-SHA1 (exmh-2.1.1/exmh-2.1.1.tar.gz) = d8708662bd06da18d50ce0b90bfe58b5a1e9af05
-Size (exmh-2.1.1/exmh-2.1.1.tar.gz) = 867497 bytes
+SHA1 (exmh-2.5/exmh-2.5.tar.gz) = eb24358ae4f12b940b7ad5af64c7cf1f10e9e7fa
+Size (exmh-2.5/exmh-2.5.tar.gz) = 867121 bytes
 SHA1 (patch-aw) = d75b933531abfff577e989f5b372fb9189830424
diff --git a/mail/exmh/pkg/PLIST b/mail/exmh/pkg/PLIST
index b3a2beeb62b..603007cd533 100644
--- a/mail/exmh/pkg/PLIST
+++ b/mail/exmh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/03/16 13:07:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/10/11 09:26:04 agc Exp $
 bin/exmh
 bin/exmh-async
 bin/exmh-bg
@@ -39,8 +39,12 @@ lib/${PKGNAME}/flag.tcl
 lib/${PKGNAME}/flagdown.bitmap
 lib/${PKGNAME}/flagdown.gif
 lib/${PKGNAME}/flagdown.mask
+lib/${PKGNAME}/flagspool.bitmap
+lib/${PKGNAME}/flagspool.gif
+lib/${PKGNAME}/flagspool.mask
 lib/${PKGNAME}/flagup.bitmap
 lib/${PKGNAME}/flagup.gif
+lib/${PKGNAME}/flagup.mask
 lib/${PKGNAME}/flist.tcl
 lib/${PKGNAME}/folder.tcl
 lib/${PKGNAME}/folderNew.tcl
@@ -48,6 +52,7 @@ lib/${PKGNAME}/fontsel.tcl
 lib/${PKGNAME}/ftoc.tcl
 lib/${PKGNAME}/ftocColor.tcl
 lib/${PKGNAME}/ftocFind.tcl
+lib/${PKGNAME}/ftp_get.tcl
 lib/${PKGNAME}/getnews.tcl
 lib/${PKGNAME}/glimpse.tcl
 lib/${PKGNAME}/help.tcl
@@ -62,6 +67,7 @@ lib/${PKGNAME}/html/AddressBk.html
 lib/${PKGNAME}/html/AliasAddr.html
 lib/${PKGNAME}/html/Aliases.html
 lib/${PKGNAME}/html/Bindings.html
+lib/${PKGNAME}/html/DSN-MDN.html
 lib/${PKGNAME}/html/Font.html
 lib/${PKGNAME}/html/Import.html
 lib/${PKGNAME}/html/Intro.html
@@ -73,36 +79,33 @@ lib/${PKGNAME}/html/Reply.html
 lib/${PKGNAME}/html/Search.html
 lib/${PKGNAME}/html/Sedit.html
 lib/${PKGNAME}/html/Seditpref.html
+lib/${PKGNAME}/html/Y2K.html
 lib/${PKGNAME}/html/blu-ball.gif
+lib/${PKGNAME}/html/bugfixes.html
 lib/${PKGNAME}/html/copyright.html
+lib/${PKGNAME}/html/custom.html
 lib/${PKGNAME}/html/exmh-fans.html
 lib/${PKGNAME}/html/exmh-faq.html
+lib/${PKGNAME}/html/exmh.CHANGES.txt
 lib/${PKGNAME}/html/exmh.README.html
 lib/${PKGNAME}/html/exmh.pref.gif
 lib/${PKGNAME}/html/exmh.snap1.gif
+lib/${PKGNAME}/html/guide.html
 lib/${PKGNAME}/html/index.html
 lib/${PKGNAME}/html/left-arrow.gif
 lib/${PKGNAME}/html/maillist.html
+lib/${PKGNAME}/html/mime.attack.html
+lib/${PKGNAME}/html/newfeatures.html
 lib/${PKGNAME}/html/overview.html
 lib/${PKGNAME}/html/ppp.howto.html
 lib/${PKGNAME}/html/red-ball.gif
+lib/${PKGNAME}/html/reference.html
 lib/${PKGNAME}/html/right-arrow.gif
 lib/${PKGNAME}/html/software.html
+lib/${PKGNAME}/html/symlink.html
+lib/${PKGNAME}/html/tutorial.html
 lib/${PKGNAME}/html/whatis.html
 lib/${PKGNAME}/html/yel-ball.gif
-lib/${PKGNAME}/html/DSN-MDN.html
-lib/${PKGNAME}/html/Y2K.html
-lib/${PKGNAME}/html/bugfixes.html
-lib/${PKGNAME}/html/custom.html
-lib/${PKGNAME}/html/exmh.CHANGES.txt
-lib/${PKGNAME}/html/exmh.key.color.gif
-lib/${PKGNAME}/html/exmh.snap.10.99.gif
-lib/${PKGNAME}/html/guide.html
-lib/${PKGNAME}/html/mime.attack.html
-lib/${PKGNAME}/html/newfeatures.html
-lib/${PKGNAME}/html/pspbrwse.jbf
-lib/${PKGNAME}/html/reference.html
-lib/${PKGNAME}/html/tutorial.html
 lib/${PKGNAME}/html_cache.tcl
 lib/${PKGNAME}/html_content.tcl
 lib/${PKGNAME}/html_dpackage.tcl
@@ -138,11 +141,21 @@ lib/${PKGNAME}/mosaic.tcl
 lib/${PKGNAME}/msg.tcl
 lib/${PKGNAME}/msgShow.tcl
 lib/${PKGNAME}/partial.tcl
+lib/${PKGNAME}/pgpBase.tcl
 lib/${PKGNAME}/pgpEWN.tcl
 lib/${PKGNAME}/pgpExec.tcl
+lib/${PKGNAME}/pgpGpg.tcl
+lib/${PKGNAME}/pgpMain.tcl
 lib/${PKGNAME}/pgpMatch.tcl
 lib/${PKGNAME}/pgpMisc.tcl
+lib/${PKGNAME}/pgpOld.tcl
+lib/${PKGNAME}/pgpPgp2.tcl
+lib/${PKGNAME}/pgpPgp5.tcl
+lib/${PKGNAME}/pgpPgp65.tcl
+lib/${PKGNAME}/pgpShared.tcl
+lib/${PKGNAME}/pgpWWW.tcl
 lib/${PKGNAME}/pick.tcl
+lib/${PKGNAME}/pop.tcl
 lib/${PKGNAME}/post.tcl
 lib/${PKGNAME}/preferences.tcl
 lib/${PKGNAME}/print.tcl
@@ -174,6 +187,7 @@ lib/${PKGNAME}/tioga.tcl
 lib/${PKGNAME}/unseenwin.tcl
 lib/${PKGNAME}/uri.tcl
 lib/${PKGNAME}/url.bitmap
+lib/${PKGNAME}/urlFace.tcl
 lib/${PKGNAME}/user.tcl
 lib/${PKGNAME}/utils.tcl
 lib/${PKGNAME}/widgetMenu.tcl
@@ -181,21 +195,6 @@ lib/${PKGNAME}/widgetText.tcl
 lib/${PKGNAME}/widgets.tcl
 lib/${PKGNAME}/xns.tcl
 lib/${PKGNAME}/xnsgetmail.exp
-lib/${PKGNAME}/flagspool.bitmap
-lib/${PKGNAME}/flagspool.gif
-lib/${PKGNAME}/flagspool.mask
-lib/${PKGNAME}/flagup.mask
-lib/${PKGNAME}/ftp_get.tcl
-lib/${PKGNAME}/pgpBase.tcl
-lib/${PKGNAME}/pgpGpg.tcl
-lib/${PKGNAME}/pgpMain.tcl
-lib/${PKGNAME}/pgpOld.tcl
-lib/${PKGNAME}/pgpPgp2.tcl
-lib/${PKGNAME}/pgpPgp5.tcl
-lib/${PKGNAME}/pgpShared.tcl
-lib/${PKGNAME}/pgpWWW.tcl
-lib/${PKGNAME}/pop.tcl
-lib/${PKGNAME}/urlFace.tcl
-man/man1/exmh.1.gz
+man/man1/exmh.1
 @dirrm lib/${PKGNAME}/html
 @dirrm lib/${PKGNAME}