From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 29 21:40:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBF24106566C for ; Thu, 29 May 2008 21:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 69A0E8FC20 for ; Thu, 29 May 2008 21:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m4TLe2LE052186 for ; Thu, 29 May 2008 21:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m4TLe2eX052185; Thu, 29 May 2008 21:40:02 GMT (envelope-from gnats) Resent-Date: Thu, 29 May 2008 21:40:02 GMT Resent-Message-Id: <200805292140.m4TLe2eX052185@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Brad Davis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CDB81065674 for ; Thu, 29 May 2008 21:35:50 +0000 (UTC) (envelope-from brad@liquidneon.com) Received: from valentine.liquidneon.com (unknown [IPv6:2001:4830:2407:8000:230:48ff:fe71:c2a2]) by mx1.freebsd.org (Postfix) with ESMTP id BE44A8FC2C for ; Thu, 29 May 2008 21:35:49 +0000 (UTC) (envelope-from brad@liquidneon.com) Received: by valentine.liquidneon.com (Postfix, from userid 1001) id 2B15B8FDC0; Thu, 29 May 2008 15:35:49 -0600 (MDT) Message-Id: <20080529213549.2B15B8FDC0@valentine.liquidneon.com> Date: Thu, 29 May 2008 15:35:49 -0600 (MDT) From: Brad Davis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/124113: [patch] Update net-mgmt/nfsen to 1.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Brad Davis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 May 2008 21:40:03 -0000 >Number: 124113 >Category: ports >Synopsis: [patch] Update net-mgmt/nfsen to 1.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu May 29 21:40:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Brad Davis >Release: FreeBSD 7.0-STABLE amd64 >Organization: >Environment: FreeBSD mccaffrey.den.so14k.com 7.0-STABLE FreeBSD 7.0-STABLE #0: Mon May 26 20:27:22 MDT 2008 root@mccaffrey.den.so14k.com:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update net-mgmt/nfsen to 1.3 Note the removal of files/patch-html_navigator.php, it is not needed any longer. >How-To-Repeat: >Fix: diff -ruN nfsen.ori/Makefile nfsen/Makefile --- nfsen.ori/Makefile 2007-09-07 18:02:51.000000000 -0700 +++ nfsen/Makefile 2008-05-29 14:25:48.000000000 -0700 @@ -6,12 +6,11 @@ # PORTNAME= nfsen -PORTVERSION= 1.2.4.20060810 +PORTVERSION= 1.3 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://nfsen.sourceforge.net/ MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-snapshot-20060810 MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Web based frontend to nfdump netflow collector diff -ruN nfsen.ori/distinfo nfsen/distinfo --- nfsen.ori/distinfo 2006-11-12 11:17:30.000000000 -0800 +++ nfsen/distinfo 2008-05-29 14:25:48.000000000 -0700 @@ -1,3 +1,3 @@ -MD5 (nfsen-snapshot-20060810.tar.gz) = 4274e60f8a007e4a01923e975a18ef65 -SHA256 (nfsen-snapshot-20060810.tar.gz) = 11c73c5207ea608a2a1d50d84cddeee6ecbd59e048d0622b322e07100e8af50d -SIZE (nfsen-snapshot-20060810.tar.gz) = 3362157 +MD5 (nfsen-1.3.tar.gz) = 1c4f057bbb3766090b40bda3ab6b81d2 +SHA256 (nfsen-1.3.tar.gz) = c34a6893fa88d142606c856a181d9fa04017608e3ecd6793de1d969cf570edf6 +SIZE (nfsen-1.3.tar.gz) = 6537807 diff -ruN nfsen.ori/files/nfsen.sh.in nfsen/files/nfsen.sh.in --- nfsen.ori/files/nfsen.sh.in 2006-04-25 11:22:23.000000000 -0700 +++ nfsen/files/nfsen.sh.in 2008-05-29 14:25:48.000000000 -0700 @@ -2,7 +2,7 @@ # PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=%%PREFIX%%/bin/nfsen.rc +DAEMON=%%PREFIX%%/bin/nfsen NAME=nfsen test -x $DAEMON || exit 0 diff -ruN nfsen.ori/files/patch-etc_nfsen-dist.conf nfsen/files/patch-etc_nfsen-dist.conf --- nfsen.ori/files/patch-etc_nfsen-dist.conf 2006-04-25 11:22:23.000000000 -0700 +++ nfsen/files/patch-etc_nfsen-dist.conf 2008-05-29 14:25:48.000000000 -0700 @@ -1,9 +1,6 @@ - -$FreeBSD: ports/net-mgmt/nfsen/files/patch-etc_nfsen-dist.conf,v 1.3 2006/04/25 18:22:23 pav Exp $ - ---- etc/nfsen-dist.conf.orig -+++ etc/nfsen-dist.conf -@@ -26,7 +26,7 @@ +--- etc/nfsen-dist.conf.ori 2008-05-29 13:33:01.000000000 -0700 ++++ etc/nfsen-dist.conf 2008-05-29 13:56:53.000000000 -0700 +@@ -18,7 +18,7 @@ # # Required for default layout @@ -12,7 +9,7 @@ # # Where to install the NfSen binaries -@@ -34,7 +34,7 @@ +@@ -26,7 +26,7 @@ # # Where to install the NfSen Perl modules @@ -21,16 +18,16 @@ # # Where to install the config files -@@ -44,7 +44,7 @@ +@@ -36,7 +36,7 @@ # NfSen html pages directory: # All php scripts will be installed here. # URL: Entry point for nfsen: http:///nfsen/nfsen.php -$HTMLDIR = "/var/www/nfsen/"; -+$HTMLDIR = "%%PREFIX%%/www/%%PORTNAME%%/"; ++$HTMLDIR = "%%PREFIX%%/www/%%PORTNAME%%"; # # Where to install the docs -@@ -52,20 +52,20 @@ +@@ -44,7 +44,7 @@ # # Var space for NfSen @@ -38,15 +35,18 @@ +$VARDIR="${BASEDIR}/var/%%PORTNAME%%"; # + # directory for all pid files +@@ -53,15 +53,15 @@ + # # The Profiles stat directory, where all profile information - # RRD DBs and gif pictures of the profile are stored --$PROFILESTATDIR="${BASEDIR}/profiles"; -+$PROFILESTATDIR="${VARDIR}/profiles"; + # RRD DBs and png pictures of the profile are stored +-$PROFILESTATDIR="${BASEDIR}/profiles-stat"; ++$PROFILESTATDIR="${VARDIR}/profiles-stat"; # # The Profiles directory, where all netflow data is stored --$PROFILEDATADIR="${BASEDIR}/profiles"; -+$PROFILEDATADIR="${VARDIR}/profiles"; +-$PROFILEDATADIR="${BASEDIR}/profiles-data"; ++$PROFILEDATADIR="${VARDIR}/profiles-data"; # # Where go all the backend plugins @@ -55,7 +55,7 @@ # # Where go all the frontend plugins -@@ -73,7 +73,7 @@ +@@ -69,7 +69,7 @@ # # nfdump tools path @@ -63,8 +63,8 @@ +$PREFIX = '%%PREFIX%%/bin'; # - # BASEDIR unrelated vars: -@@ -82,7 +82,7 @@ + # nfsend communication socket +@@ -81,7 +81,7 @@ # This may be a different or the same uid than your web server. # Note: This user must be in group $WWWGROUP, otherwise nfcapd # is not able to write data files! @@ -73,12 +73,3 @@ # user and group of the web server process # All netflow processing will be done with this user -@@ -106,7 +106,7 @@ - - %sources = ( - 'upstream1' => { 'port' => '9995', 'col' => '#0000ff', 'type' => 'netflow' }, -- 'peer1' => { 'port' => '9996', 'col' => '#ff0000' }, -+# 'peer1' => { 'port' => '9996', 'col' => '#ff0000' }, - ); - - # diff -ruN nfsen.ori/files/patch-html_navigator.php nfsen/files/patch-html_navigator.php --- nfsen.ori/files/patch-html_navigator.php 2005-09-09 06:48:43.000000000 -0700 +++ nfsen/files/patch-html_navigator.php 1969-12-31 16:00:00.000000000 -0800 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/net-mgmt/nfsen/files/patch-html_navigator.php,v 1.1 2005/09/09 13:48:43 lawrance Exp $ - ---- html/navigator.php.orig -+++ html/navigator.php -@@ -18,7 +18,7 @@ - * Copy the doc directory into HTML dir - */ - -- // print "Docu\n"; -+ print "Docu\n"; - - print "Bookmark URL\n"; - print "Selected Profile: \n"; >Release-Note: >Audit-Trail: >Unformatted: