From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 28 09:40:28 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A45CD16A401 for ; Tue, 28 Mar 2006 09:40:28 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED49D43D78 for ; Tue, 28 Mar 2006 09:40:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2S9eHhM068441 for ; Tue, 28 Mar 2006 09:40:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2S9eHkL068440; Tue, 28 Mar 2006 09:40:17 GMT (envelope-from gnats) Resent-Date: Tue, 28 Mar 2006 09:40:17 GMT Resent-Message-Id: <200603280940.k2S9eHkL068440@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, Janos Mohacsi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2056216A422 for ; Tue, 28 Mar 2006 09:36:52 +0000 (UTC) (envelope-from mohacsi@scone.ki.iif.hu) Received: from scone.ki.iif.hu (scone.ki.iif.hu [193.6.222.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B74D43D6D for ; Tue, 28 Mar 2006 09:36:41 +0000 (GMT) (envelope-from mohacsi@scone.ki.iif.hu) Received: (from mohacsi@localhost) by scone.ki.iif.hu (8.13.4/8.13.4) id k2S9a0XT057449; Tue, 28 Mar 2006 11:36:00 +0200 (CEST) (envelope-from mohacsi) Message-Id: <200603280936.k2S9a0XT057449@scone.ki.iif.hu> Date: Tue, 28 Mar 2006 11:36:00 +0200 (CEST) From: Janos Mohacsi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/95032: [MAINTAINER] net-mgmt/nfsen: update to 1.2.4.20060325 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Janos Mohacsi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 09:40:28 -0000 >Number: 95032 >Category: ports >Synopsis: [MAINTAINER] net-mgmt/nfsen: update to 1.2.4.20060325 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Mar 28 09:40:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Janos Mohacsi >Release: FreeBSD 6.1-PRERELEASE i386 >Organization: NIIF/HUNGARNET >Environment: System: FreeBSD scone.ki.iif.hu 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #11: Fri Mar 24 09:10:25 CET 2006 >Description: Maintainer Update to net-mgmt/nfsen to version 1.2.4.20060325 - nfsen now supports reconfiguration for adding and removing netflow sources. The earlier attempt nfsen.reconfigure was wrong. - Fixes some bugs. - Now reguires nfdump 1.5 (beta also supported) Added file(s): - files/nfsen.sh Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- nfsen-1.2.4.20060325.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfsen.orig/Makefile /usr/ports/net-mgmt/nfsen/Makefile --- /usr/ports/net-mgmt/nfsen.orig/Makefile Wed Mar 15 21:23:35 2006 +++ /usr/ports/net-mgmt/nfsen/Makefile Mon Mar 27 19:48:24 2006 @@ -6,22 +6,19 @@ # PORTNAME= nfsen -PORTVERSION= 1.2.3 +PORTVERSION= 1.2.4.20060325 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://nfsen.sourceforge.net/ MASTER_SITE_SUBDIR= ${PORTNAME} +DISTNAME= ${PORTNAME}-snapshot-20060325 MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Web based frontend to nfdump netflow collector RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool -.if defined(WITH_IPV6) && !defined(NO_INET6) -RUN_DEPENDS+= nfdump:${PORTSDIR}/net-mgmt/nfdump-devel -.else RUN_DEPENDS+= nfdump:${PORTSDIR}/net-mgmt/nfdump -.endif USE_ICONV= yes USE_PERL5= yes @@ -35,19 +32,37 @@ IGNORE= requires at least perl 5.6.0 .endif +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "*****************************************************" + @${ECHO_MSG} "Before upgrading you may backup the original profile " + @${ECHO_MSG} "stat data:" + @${ECHO_MSG} "cd ${WRKSRC}/helpers" + @${ECHO_MSG} "./mk_backup.sh /path/to/your/profilestatdir /path/to/backupdir" + @${ECHO_MSG} "*****************************************************" + @${ECHO_MSG} "" + post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' -e 's,%%PORTNAME%%,${PORTNAME},' \ ${WRKSRC}/etc/nfsen-dist.conf - @${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/install.pl @${RM} ${WRKSRC}/etc/nfsen-dist.conf.* + @${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/install.pl + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${FILESDIR}/nfsen.sh do-install: @${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live @${MKDIR} ${PREFIX}/libexec/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${PREFIX}/libexec/${PORTNAME}/ - ${INSTALL_SCRIPT} ${WRKSRC}/install.pl ${PREFIX}/bin/nfsen-reconfigure - cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${WRKSRC}/etc/nfsen-dist.conf - @${ECHO_MSG} "Configure your ${LOCALBASE}/etc/nfsen.conf to have necessary profiles "; - @${ECHO_MSG} "Then run 'nfsen-reconfigure ${LOCALBASE}/etc/nfsen.conf' to correctly setup profile files"; + ${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${PREFIX}/libexec/${PORTNAME}/ + ${INSTALL_SCRIPT} ${FILESDIR}/nfsen.sh ${PREFIX}/etc/rc.d/nfsen.sh.sample + @ if [ -f ${PREFIX}/etc/nfsen.conf ] ; then \ + ${ECHO_MSG} "installing with existing nfsen.conf"; \ + cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${PREFIX}/etc/nfsen.conf; \ + else \ + ${ECHO_MSG} "installing with sample nfsen.conf"; \ + cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${WRKSRC}/etc/nfsen-dist.conf; \ + fi + @${ECHO_MSG} "Configure your ${LOCALBASE}/etc/nfsen.conf to have necessary sources "; + @${ECHO_MSG} "Then run 'nfsen -R ${LOCALBASE}/etc/nfsen.conf' to correctly setup source, RRD, and profile files"; .include diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfsen.orig/distinfo /usr/ports/net-mgmt/nfsen/distinfo --- /usr/ports/net-mgmt/nfsen.orig/distinfo Wed Mar 15 21:23:35 2006 +++ /usr/ports/net-mgmt/nfsen/distinfo Mon Mar 27 17:42:18 2006 @@ -1,3 +1,2 @@ -MD5 (nfsen-1.2.3.tar.gz) = bb18418d021526fea40bc3f88a837bc1 -SHA256 (nfsen-1.2.3.tar.gz) = dcd362f082d6a92b4400c69bf1784c3ee0c0e95a5c7c617ece36698ce7cba535 -SIZE (nfsen-1.2.3.tar.gz) = 3331295 +MD5 (nfsen-snapshot-20060325.tar.gz) = 709277934654fd061cef5d8d35031698 +SIZE (nfsen-snapshot-20060325.tar.gz) = 3358237 diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfsen.orig/files/nfsen.sh /usr/ports/net-mgmt/nfsen/files/nfsen.sh --- /usr/ports/net-mgmt/nfsen.orig/files/nfsen.sh Thu Jan 1 01:00:00 1970 +++ /usr/ports/net-mgmt/nfsen/files/nfsen.sh Tue Mar 28 10:48:33 2006 @@ -0,0 +1,43 @@ +#! /bin/sh +# + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=%%PREFIX%%/bin/nfsen.rc +NAME=nfsen + +test -x $DAEMON || exit 0 + +set -e + +case "$1" in + start) + echo -n "Starting $NAME" + $DAEMON start + echo "." + ;; + stop) + echo -n "Stopping $NAME " + $DAEMON stop + echo "." + ;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $NAME" + $DAEMON stop + sleep 1 + $DAEMON start + echo "." + ;; + *) + N=/tmp/nfsen-1.2.4.20060325/etc/rc.d/${NAME}.sh + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfsen.orig/files/patch-etc_nfsen-dist.conf /usr/ports/net-mgmt/nfsen/files/patch-etc_nfsen-dist.conf --- /usr/ports/net-mgmt/nfsen.orig/files/patch-etc_nfsen-dist.conf Fri Sep 9 15:48:43 2005 +++ /usr/ports/net-mgmt/nfsen/files/patch-etc_nfsen-dist.conf Mon Mar 27 18:15:09 2006 @@ -1,5 +1,5 @@ -$FreeBSD: ports/net-mgmt/nfsen/files/patch-etc_nfsen-dist.conf,v 1.2 2005/09/09 13:48:43 lawrance Exp $ +$FreeBSD$ --- etc/nfsen-dist.conf.orig +++ etc/nfsen-dist.conf @@ -17,7 +17,7 @@ # # Where to install the NfSen Perl modules -$LIBEXECDIR="${BASEDIR}/libexec"; -+$LIBEXECDIR="${BASEDIR}/libexec/%%PORTNAME%%/"; ++$LIBEXECDIR="${BASEDIR}/libexec/%%PORTNAME%%"; # # Where to install the config files @@ -26,7 +26,7 @@ # 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 @@ -55,6 +55,15 @@ # # Where go all the frontend plugins +@@ -73,7 +73,7 @@ + + # + # nfdump tools path +-$PREFIX = '/usr/local/bin'; ++$PREFIX = '%%PREFIX%%'; + + # + # BASEDIR unrelated vars: @@ -82,7 +82,7 @@ # This may be a different or the same uid than your web server. # Note: This user must be in group $WWWGROUP, otherwise nfcapd diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfsen.orig/pkg-plist /usr/ports/net-mgmt/nfsen/pkg-plist --- /usr/ports/net-mgmt/nfsen.orig/pkg-plist Wed Mar 15 21:23:35 2006 +++ /usr/ports/net-mgmt/nfsen/pkg-plist Mon Mar 27 19:33:38 2006 @@ -1,21 +1,23 @@ bin/nfsen -bin/nfsen-reconfigure -bin/nfsen-run bin/nfsen.rc -bin/pid_check.pl +bin/nfsend bin/testPlugin -@unexec if cmp -s %D/etc/nfsen.conf %D/etc/nfsen-dist.conf; then rm -f %D/etc/nfsen.conf; fi +etc/rc.d/nfsen.sh.sample etc/nfsen-dist.conf +@unexec if cmp -s %D/etc/nfsen.conf %D/etc/nfsen-dist.conf; then rm -f %D/etc/nfsen.conf; fi @exec [ -f %D/etc/nfsen.conf ] || cp %D/etc/nfsen-dist.conf %D/etc/nfsen.conf -etc/nfsen-shell-param libexec/%%PORTNAME%%/CopyRecursive.pm libexec/%%PORTNAME%%/GenGraph.pl libexec/%%PORTNAME%%/Log.pm libexec/%%PORTNAME%%/NfConf.pm libexec/%%PORTNAME%%/NfProfile.pm libexec/%%PORTNAME%%/NfSen.pm +libexec/%%PORTNAME%%/NfSenRC.pm libexec/%%PORTNAME%%/NfSenRRD.pm +libexec/%%PORTNAME%%/Nfcomm.pm +libexec/%%PORTNAME%%/Nfsources.pm libexec/%%PORTNAME%%/Notification.pm +libexec/%%PORTNAME%%/RRDconvertv1.pm libexec/%%PORTNAME%%/plugins/demoplugin.pm www/%%PORTNAME%%/conf.php www/%%PORTNAME%%/EmptyGraph.gif @@ -47,7 +49,6 @@ www/%%PORTNAME%%/doc/InputEnd.png www/%%PORTNAME%%/doc/Navigating.png www/%%PORTNAME%%/doc/NewProfile.png -www/%%PORTNAME%%/doc/NfSen.html www/%%PORTNAME%%/doc/OutOfData.png www/%%PORTNAME%%/doc/ProcessingControls.png www/%%PORTNAME%%/doc/ProcessingOutput.png @@ -66,6 +67,7 @@ www/%%PORTNAME%%/doc/edit.png www/%%PORTNAME%%/doc/exiisting.png www/%%PORTNAME%%/doc/flows.png +www/%%PORTNAME%%/doc/index.html www/%%PORTNAME%%/doc/linegraph.png www/%%PORTNAME%%/doc/nfsen-options.png www/%%PORTNAME%%/doc/overview.png @@ -80,21 +82,7 @@ @dirrm www/%%PORTNAME%%/doc @dirrm www/%%PORTNAME%% @exec mkdir -p %D/var/%%PORTNAME%%/profiles/live/upstream1 -var/%%PORTNAME%%/profiles/live/flows.rrd -var/%%PORTNAME%%/profiles/live/flows_tcp.rrd -var/%%PORTNAME%%/profiles/live/flows_udp.rrd -var/%%PORTNAME%%/profiles/live/flows_icmp.rrd -var/%%PORTNAME%%/profiles/live/flows_other.rrd -var/%%PORTNAME%%/profiles/live/packets.rrd -var/%%PORTNAME%%/profiles/live/packets_tcp.rrd -var/%%PORTNAME%%/profiles/live/packets_udp.rrd -var/%%PORTNAME%%/profiles/live/packets_icmp.rrd -var/%%PORTNAME%%/profiles/live/packets_other.rrd -var/%%PORTNAME%%/profiles/live/traffic.rrd -var/%%PORTNAME%%/profiles/live/traffic_tcp.rrd -var/%%PORTNAME%%/profiles/live/traffic_udp.rrd -var/%%PORTNAME%%/profiles/live/traffic_icmp.rrd -var/%%PORTNAME%%/profiles/live/traffic_other.rrd +var/%%PORTNAME%%/profiles/live/upstream1.rrd var/%%PORTNAME%%/profiles/live/profile.dat @exec mkdir -p %D/var/%%PORTNAME%%/run @exec mkdir -p %D/var/%%PORTNAME%%/filters --- nfsen-1.2.4.20060325.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: