Update to nmh-1.0.3:

	* Fixes a recently discovered security hole.
	* Introduces a new port hook for nmh locking style, which
	  defaults to flock(2).

PR:		17055
Submitted by:	maintainer

5 files changed, 34 insertions, 36 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 22937dfe8527..757ef5fd6239 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	nmh
-# Version required:     1.0.2
+# Version required:     1.0.3
 # Date created:		07 Feb 1999
 # Whom:			Scott Blachowicz <Scott.Blachowicz@seaslug.org>
 #
@@ -28,8 +28,14 @@
 # NMH_PAGER - pass an PAGER specification through to nmh's configure
 #           script's '--with-pager' option.
 #
+# NMH_LOCKING - specify the style of locking to be used by nmh for the
+#           users' spool files (e.g. the 'inc' command). Must match the
+#           locking style used by your MTA - the default is FLOCK_LOCKING
+#           (the documented behavior for the 'mail.local' delivery
+#           program).
+#
 
-DISTNAME=	nmh-1.0.2
+DISTNAME=	nmh-1.0.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mhost.com/pub/nmh/ \
 		http://people.FreeBSD.org/~jkoshy/PORTS/
@@ -49,6 +55,11 @@ CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR}
 CONFIGURE_ARGS+= --with-pager=${NMH_PAGER}
 .endif
 
+.ifndef NMH_LOCKING
+NMH_LOCKING=FLOCK_LOCKING
+.endif
+CFLAGS+= -D$(NMH_LOCKING)
+
 MAN1= ali.1 anno.1 burst.1 comp.1 dist.1 flist.1 folder.1 forw.1 \
       inc.1 mark.1 mh-chart.1 mhbuild.1 mhl.1 mhlist.1 mhmail.1 \
       mhn.1 mhparam.1 mhpath.1 mhshow.1 mhstore.1 msgchk.1 msh.1 \
diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo
index 79489308b0e8..4d7dd673daf9 100644
--- a/mail/nmh/distinfo
+++ b/mail/nmh/distinfo
@@ -1 +1 @@
-MD5 (nmh-1.0.2.tar.gz) = eb0ab031b13bf9d10406661c7ad86e50
+MD5 (nmh-1.0.3.tar.gz) = 02519bf8f7ff8590ecfbee9f9500ea07
diff --git a/mail/nmh/files/patch-aa b/mail/nmh/files/patch-aa
index 6e3e092cac44..a62497eeee13 100644
--- a/mail/nmh/files/patch-aa
+++ b/mail/nmh/files/patch-aa
@@ -1,19 +1,21 @@
---- ../../../nmh-1.0.2-DIST/acconfig.h	Thu Oct 21 11:58:09 1999
-+++ ./acconfig.h	Fri Dec 24 13:50:12 1999
-@@ -22,10 +22,10 @@
+diff -ur ../../../nmh-1.0.3-DIST/acconfig.h ./acconfig.h
+--- ../../../nmh-1.0.3-DIST/acconfig.h	Mon Jan 24 22:13:38 2000
++++ ./acconfig.h	Mon Feb 28 10:20:34 2000
+@@ -22,10 +22,13 @@
   * other programs which may modify your maildrops.
   * Currently you can only use one type.
   */
--#define DOT_LOCKING   1
-+/* #define DOT_LOCKING   1 */
++#if 0
++/* Patched to be specified in CFLAGS by FreeBSD port. */
+ #define DOT_LOCKING   1
  /* #define FCNTL_LOCKING 1 */
  /* #define LOCKF_LOCKING 1 */
--/* #define FLOCK_LOCKING 1 */
-+#define FLOCK_LOCKING 1
+ /* #define FLOCK_LOCKING 1 */
++#endif
  
  /*
   * If you have defined DOT_LOCKING, then the default is to
-@@ -104,7 +104,7 @@
+@@ -104,7 +107,7 @@
   * The prefix which is prepended to the name of messages when they
   * are "removed" by rmm.  This should typically be `,' or `#'
   */
@@ -22,7 +24,7 @@
  
  /*
   * Name of link to file to which you are replying.
-@@ -128,11 +128,11 @@
+@@ -128,11 +131,11 @@
  /* Defined for Solaris 2.x, Irix, OSF/1, HP-UX, AIX */
  #undef SVR4
  /* Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac OS X/Rhapsody */
@@ -36,7 +38,7 @@
  
  /* Defined for SCO5 */
  #undef SCO_5_STDIO
-@@ -231,7 +231,7 @@
+@@ -231,7 +234,7 @@
   * not world writable.  There are no guarantees as to the safety of doing this,
   * but this #define will add some extra security checks.
   */
diff --git a/mail/nmh/files/patch-ab b/mail/nmh/files/patch-ab
index 4f8ff75d30e3..04e24b12f04a 100644
--- a/mail/nmh/files/patch-ab
+++ b/mail/nmh/files/patch-ab
@@ -9,9 +9,9 @@ diff -ur ../../nmh-1.0.2-DIST/Makefile.in ./Makefile.in
  INSTALL_DATA    = @INSTALL_DATA@
  
  .SUFFIXES:
-diff -ur ../../nmh-1.0.2-DIST/etc/Makefile.in ./etc/Makefile.in
---- ../../nmh-1.0.2-DIST/etc/Makefile.in	Thu Jul 15 17:43:04 1999
-+++ ./etc/Makefile.in	Sat Dec 11 12:12:53 1999
+diff -ur ../../../nmh-1.0.3-DIST/etc/Makefile.in ./etc/Makefile.in
+--- ../../../nmh-1.0.3-DIST/etc/Makefile.in	Thu Jan  6 13:30:07 2000
++++ ./etc/Makefile.in	Mon Feb 28 10:20:34 2000
 @@ -20,6 +20,7 @@
  
  INSTALL         = @INSTALL@
@@ -22,25 +22,10 @@ diff -ur ../../nmh-1.0.2-DIST/etc/Makefile.in ./etc/Makefile.in
  # Path to search for programs to handle MIME
 @@ -89,7 +90,7 @@
  install-scripts:
- 	$(top_srcdir)/mkinstalldirs $(libdir)
+ 	$(top_srcdir)/mkinstalldirs $(bindir)
  	for script in $(SCRIPTS); do \
--	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \
-+	  $(INSTALL_SCRIPT) $(srcdir)/$$script $(libdir)/$$script; \
+-	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
++	  $(INSTALL_SCRIPT) $(srcdir)/$$script $(bindir)/$$script; \
  	done
  
  uninstall: uninstall-files uninstall-scripts
-diff -ur ../../nmh-1.0.2-DIST/man/Makefile.in ./man/Makefile.in
---- ../../nmh-1.0.2-DIST/man/Makefile.in	Wed Oct 13 07:56:41 1999
-+++ ./man/Makefile.in	Sat Dec 11 11:52:33 1999
-@@ -146,8 +146,9 @@
- 	  $(INSTALL_DATA) $$file $(mandir)/man$(manext5) ; \
- 	done
- 	if [ ! -f mh_profile.$(manext5) ] ; then \
--	  ( cd $(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \
--            mh_profile.$(manext5) ) \
-+	  ( cd $(mandir)/man$(manext5) ; \
-+	    rm -f mh_profile.$(manext5) ; \
-+	    ln mh-profile.$(manext5) mh_profile.$(manext5) ) \
- 	fi
- 
- # install the man pages in man8
diff --git a/mail/nmh/pkg-plist b/mail/nmh/pkg-plist
index a470ea617fef..7fe0d44cb194 100644
--- a/mail/nmh/pkg-plist
+++ b/mail/nmh/pkg-plist
@@ -18,7 +18,6 @@ bin/mhparam
 bin/mhpath
 bin/mhshow
 bin/mhstore
-bin/mhtest
 bin/msgchk
 bin/msh
 bin/next
@@ -32,6 +31,7 @@ bin/rmf
 bin/rmm
 bin/scan
 bin/send
+bin/sendfiles
 bin/show
 bin/sortm
 bin/viamail
@@ -68,12 +68,12 @@ libexec/nmh/dp
 libexec/nmh/fmtdump
 libexec/nmh/install-mh
 libexec/nmh/mhl
+libexec/nmh/mhtest
 libexec/nmh/post
 libexec/nmh/rcvdist
 libexec/nmh/rcvpack
 libexec/nmh/rcvstore
 libexec/nmh/rcvtty
-libexec/nmh/sendfiles
 libexec/nmh/slocal
 libexec/nmh/spost
 @dirrm etc/nmh