From owner-freebsd-ports Mon Feb 28 12:50:13 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id B908737B93A for ; Mon, 28 Feb 2000 12:50:07 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id MAA58085; Mon, 28 Feb 2000 12:50:07 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from sabami.seaslug.org (ip18.gte13.rb1.bel.nwlink.com [207.202.150.18]) by hub.freebsd.org (Postfix) with ESMTP id 61BDD37B93A for ; Mon, 28 Feb 2000 12:44:13 -0800 (PST) (envelope-from scott@sabmail.rresearch.com) Received: by sabami.seaslug.org (Postfix, from userid 1000) id D597E1F17; Mon, 28 Feb 2000 12:39:18 -0800 (PST) Message-Id: <20000228203918.D597E1F17@sabami.seaslug.org> Date: Mon, 28 Feb 2000 12:39:18 -0800 (PST) From: scott@sabami.seaslug.org Reply-To: scott@sabami.seaslug.org To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/17055: update mail/nmh port to nmh-1.0.3 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 17055 >Category: ports >Synopsis: update mail/nmh port to nmh-1.0.3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 28 12:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Scott Blachowicz >Release: FreeBSD 3.2-RELEASE i386 >Organization: >Environment: FreeBSD >Description: Version 1.0.3 of nmh was recently released to patch a recently discovered security hole. This patch updates the mail/nmh port for 1.0.3 and also introduces a Makefile know to adjust how nmh locks the mail spool file (in case something other than the FLOCK_LOCKING define is needed...flock appears to be what the stock mail.local uses). >How-To-Repeat: >Fix: Apply appended patch. diff -urN ../nmh-curr/Makefile ./Makefile --- ../nmh-curr/Makefile Tue Feb 8 02:14:55 2000 +++ ./Makefile Mon Feb 28 11:55:33 2000 @@ -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 # @@ -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/ @@ -48,6 +54,11 @@ .ifdef NMH_PAGER 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 \ diff -urN ../nmh-curr/files/md5 ./files/md5 --- ../nmh-curr/files/md5 Wed Dec 22 19:40:29 1999 +++ ./files/md5 Mon Feb 28 09:57:51 2000 @@ -1 +1 @@ -MD5 (nmh-1.0.2.tar.gz) = eb0ab031b13bf9d10406661c7ad86e50 +MD5 (nmh-1.0.3.tar.gz) = 02519bf8f7ff8590ecfbee9f9500ea07 diff -urN ../nmh-curr/patches/patch-aa ./patches/patch-aa --- ../nmh-curr/patches/patch-aa Sun Dec 26 02:13:25 1999 +++ ./patches/patch-aa Mon Feb 28 10:22:33 2000 @@ -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 -urN ../nmh-curr/patches/patch-ab ./patches/patch-ab --- ../nmh-curr/patches/patch-ab Wed Dec 22 19:40:30 1999 +++ ./patches/patch-ab Mon Feb 28 10:23:33 2000 @@ -9,9 +9,9 @@ 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 @@ # 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 -urN ../nmh-curr/patches/patch-ba ./patches/patch-ba --- ../nmh-curr/patches/patch-ba Wed Dec 31 16:00:00 1969 +++ ./patches/patch-ba Mon Feb 28 11:23:48 2000 @@ -0,0 +1,22 @@ +diff -ur ../../../nmh-1.0.3-DIST/uip/slocal.c ./uip/slocal.c +--- ../../../nmh-1.0.3-DIST/uip/slocal.c Sun Feb 6 04:41:00 2000 ++++ ./uip/slocal.c Mon Feb 28 10:42:31 2000 +@@ -32,11 +32,17 @@ + #include /* initgroups() is here on Solaris 2.6 */ + #include /* initgroups() is here on HP-UX 10.20 */ + ++#if !defined(BSD44) ++/* On FreeBSD 3.2 (at least), initgroups is prototyped in unistd.h with a ++ 'int' arg instead of a 'gid_t' (which is unsigned) arg. The prototype below ++ produces a "conflicting types for `initgroups'" error. */ ++ + /* On AIX 4.1, initgroups() is defined and even documented (giving the parameter + types as "char*" and "int"), but doesn't have a prototype in any of the + system header files. On other OSes, this should be a duplicate prototype + that won't cause any errors or warnings. */ + extern int initgroups(const char*, gid_t); ++#endif + + #ifdef HAVE_DB1_NDBM_H + #include + diff -urN ../nmh-curr/pkg/PLIST ./pkg/PLIST --- ../nmh-curr/pkg/PLIST Wed Dec 22 19:40:30 1999 +++ ./pkg/PLIST Mon Feb 28 11:49:34 2000 @@ -18,7 +18,6 @@ bin/mhpath bin/mhshow bin/mhstore -bin/mhtest bin/msgchk bin/msh bin/next @@ -32,6 +31,7 @@ bin/rmm bin/scan bin/send +bin/sendfiles bin/show bin/sortm bin/viamail @@ -68,12 +68,12 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message