Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Feb 2014 16:31:29 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342572 - in head/net-mgmt/flowviewer: . files
Message-ID:  <201402041631.s14GVTSO049098@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Tue Feb  4 16:31:28 2014
New Revision: 342572
URL: http://svnweb.freebsd.org/changeset/ports/342572
QAT: https://qat.redports.org/buildarchive/r342572/

Log:
  - Update to 4.2.2
  
  Changes:	http://sourceforge.net/projects/flowviewer/files/README/view
  PR:		ports/184126
  Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com>
  Approved by:	maintainer (timeout, 10 weeks)

Added:
  head/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm   (contents, props changed)
Deleted:
  head/net-mgmt/flowviewer/files/patch-config
Modified:
  head/net-mgmt/flowviewer/Makefile
  head/net-mgmt/flowviewer/distinfo
  head/net-mgmt/flowviewer/pkg-plist

Modified: head/net-mgmt/flowviewer/Makefile
==============================================================================
--- head/net-mgmt/flowviewer/Makefile	Tue Feb  4 16:31:14 2014	(r342571)
+++ head/net-mgmt/flowviewer/Makefile	Tue Feb  4 16:31:28 2014	(r342572)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	flowviewer
-PORTVERSION=	3.3.1
-PORTREVISION=	4
+PORTVERSION=	4.2.2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://ensight.eos.nasa.gov/FlowViewer/
+MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	FlowViewer_${DISTVERSION}
 EXTRACT_SUFX=	.tar
 
@@ -13,15 +12,41 @@ MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	Web-based user interface for the flow-tools NetFlow data
 
 RUN_DEPENDS=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		flow-cat:${PORTSDIR}/net-mgmt/flow-tools
+		rrdtool:${PORTSDIR}/databases/rrdtool
 
-.ifndef WITHOUT_WWWDIR
-FLOWVIEWERDIR?=	${PREFIX}/www/flowviewer
-.else
-FLOWVIEWERDIR?=	${PREFIX}/flowviewer
-.endif
+OPTIONS_DEFINE=	DOCS
+OPTIONS_SINGLE=	NETFLOWv
+OPTIONS_SINGLE_NETFLOWv=	NETFLOWv5 NETFLOWv9
+OPTIONS_DEFAULT=	NETFLOWv5
+NETFLOWv5_DESC=	Support for NETFLOWv5
+NETFLOWv9_DESC=	Support for IPFIX/NETFLOWv9
+NETFLOWv5_RUN_DEPENDS=	flow-cat:${PORTSDIR}/net-mgmt/flow-tools-ng
+NETFLOWv9_RUN_DEPENDS=	rwptoflow:${PORTSDIR}/security/silktools
+
+FLOWVIEWERDIR?=	${STAGEDIR}${PREFIX}/www/flowviewer
+
+PLIST_SCRIPT=	FV.cgi FV_Relay.cgi FlowGrapher.cgi FlowGrapher_Main.cgi \
+		FlowGrapher_Relay.cgi FlowGrapher_Replay.cgi FlowGrapher_Sort.cgi \
+		FlowTracker.cgi FlowTracker_Dashboard.cgi FlowTracker_Display.cgi \
+		FlowTracker_DisplayPublic.cgi FlowTracker_Dumper.cgi \
+		FlowTracker_Group.cgi FlowTracker_Main.cgi FlowTracker_Management.cgi \
+		FlowTracker_Relay.cgi FlowTracker_Replay.cgi FlowViewer.cgi \
+		FlowViewer_Main.cgi FlowViewer_Relay.cgi FlowViewer_Replay.cgi \
+		FlowViewer_Save.cgi FlowViewer_SaveManage.cgi FlowViewer_Sort.cgi \
+		FlowViewer_UI.pm FlowViewer_Utilities.pm FlowGrapher_Colors \
+		FlowTracker_AltDashboard FlowTracker_Collector FlowTracker_Grapher \
+		FlowTracker_Recreate FlowTracker_Thumbnail FlowViewer_CleanASCache \
+		FlowViewer_CleanFiles FlowViewer_CleanHostCache FlowViewer_CleanSiLK \
+		NamedInterfaces_Devices NamedInterfaces_Exporters
+PLIST_DATA=	FG_button.png FT_button.png FV_button.png FlowViewer.css
+PLIST_TOOLS=	flowcapture_restart resize_rrdtools flowtracker_grapher_nonlazy \
+		date_to_epoch_gm performance_check edc_rwflowappend flowtracker_restart \
+		convert_pre40_filters analyze_flowtracker_debug flowtracker_grapher_recent \
+		flow-capture-table.conf rsync_trackings epoch_to_date_local rwflowpack_start \
+		edc_rwreceiver epoch_to_date_gm rsync_htmls flowtracker_archive_restore \
+		date_to_epoch_local analyze_netflow_packets rsync_flows copy_netflow_jpl
 
-PLIST_SUB+=	FLOWVIEWERDIR="${FLOWVIEWERDIR:S,^${PREFIX}/,,}"
+PLIST_SUB+=	FLOWVIEWERDIR="${FLOWVIEWERDIR:S,^${STAGEDIR}${PREFIX}/,,}"
 SUB_LIST+=	"FLOWVIEWERDIR=${FLOWVIEWERDIR}" \
 		"PKGNAME=${PKGNAME}"
 SUB_FILES=	pkg-message
@@ -32,48 +57,41 @@ NO_BUILD=	yes
 PORTDOCS=	README
 
 NO_STAGE=	yes
+.include <bsd.port.options.mk>
 post-patch:
 	@${REINPLACE_CMD} -E \
-		-e "s|%%PREFIX%%|${PREFIX}|" \
+		-e "s|%%PREFIX%%|${STAGEDIR}${PREFIX}|" \
 		${WRKSRC}/FlowViewer_Configuration.pm
 	@${REINPLACE_CMD} -E \
 		-e "s|%%FLOWVIEWERDIR%%|${FLOWVIEWERDIR}|" \
 		${WRKSRC}/FlowViewer_Configuration.pm
 
 do-install:
-	@${MKDIR} ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowGrapher.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowGrapher_Main.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowGrapher_Relay.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowGrapher_Sort.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Dumper.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Relay.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Main.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Relay.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Save.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Group.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Utilities.pm ${FLOWVIEWERDIR}
-	@${INSTALL_DATA} ${WRKSRC}/FlowViewer_Configuration.pm ${FLOWVIEWERDIR}/FlowViewer_Configuration.pm.dist
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Collector ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Grapher ${FLOWVIEWERDIR}
-	@${INSTALL_DATA} ${WRKSRC}/FlowGrapher_Colors ${FLOWVIEWERDIR}
-	@${INSTALL_DATA} ${WRKSRC}/FlowGrapher.png ${FLOWVIEWERDIR}
-	@${INSTALL_DATA} ${WRKSRC}/FlowTracker.png ${FLOWVIEWERDIR}
-	@${INSTALL_DATA} ${WRKSRC}/FlowViewer.png ${FLOWVIEWERDIR}
-	@${MKDIR} ${FLOWVIEWERDIR}/tmp ${FLOWVIEWERDIR}/reports \
-	${FLOWVIEWERDIR}/graphs ${FLOWVIEWERDIR}/tracker
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${FLOWVIEWERDIR}/tmp \
+	${MKDIR} ${FLOWVIEWERDIR}
+	${MKDIR} ${FLOWVIEWERDIR}/tools
+	${INSTALL_DATA} ${WRKSRC}/FlowViewer_Configuration.pm ${FLOWVIEWERDIR}/FlowViewer_Configuration.pm.dist
+	${MKDIR} ${FLOWVIEWERDIR}/tmp ${FLOWVIEWERDIR}/reports \
+	${FLOWVIEWERDIR}/graphs ${FLOWVIEWERDIR}/tracker ${FLOWVIEWERDIR}/working \
+	${FLOWVIEWERDIR}/saves ${FLOWVIEWERDIR}/names ${FLOWVIEWERDIR}/filters \
+	${FLOWVIEWERDIR}/rrdtools ${FLOWVIEWERDIR}/FlowViewer_Dashboard
+	${CHOWN} ${WWWOWN}:${WWWGRP} ${FLOWVIEWERDIR}/tmp \
 	${FLOWVIEWERDIR}/reports ${FLOWVIEWERDIR}/graphs \
-	${FLOWVIEWERDIR}/tracker
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${FLOWVIEWERDIR}/tracker ${FLOWVIEWERDIR}/working ${FLOWVIEWERDIR}/saves \
+	${FLOWVIEWERDIR}/names ${FLOWVIEWERDIR}/filters ${FLOWVIEWERDIR}/rrdtools \
+	${FLOWVIEWERDIR}/FlowViewer_Dashboard ${FLOWVIEWERDIR}/tools
+.for i in ${PLIST_SCRIPT}
+	@${INSTALL_SCRIPT} ${WRKSRC}/${i} ${FLOWVIEWERDIR}
+.endfor
+.for i in ${PLIST_TOOLS}
+	@${INSTALL_SCRIPT} ${WRKSRC}/tools/${i} ${FLOWVIEWERDIR}/tools
+.endfor
+.for i in ${PLIST_DATA}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${FLOWVIEWERDIR}
+.endfor
+
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>

Modified: head/net-mgmt/flowviewer/distinfo
==============================================================================
--- head/net-mgmt/flowviewer/distinfo	Tue Feb  4 16:31:14 2014	(r342571)
+++ head/net-mgmt/flowviewer/distinfo	Tue Feb  4 16:31:28 2014	(r342572)
@@ -1,2 +1,2 @@
-SHA256 (FlowViewer_3.3.1.tar) = 80109a5fb1740beaed067505e19653062ef546664cda7b2f0a26c15066eb5c08
-SIZE (FlowViewer_3.3.1.tar) = 491520
+SHA256 (FlowViewer_4.2.2.tar) = b39f01e199c0b57f928576ae487afcf14d1899c9f7dc47e2af30303e9d1c1b9c
+SIZE (FlowViewer_4.2.2.tar) = 1013760

Added: head/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm	Tue Feb  4 16:31:28 2014	(r342572)
@@ -0,0 +1,59 @@
+--- FlowViewer_Configuration.pm.orig	2013-11-20 17:01:30.000000000 +0600
++++ FlowViewer_Configuration.pm	2013-11-20 17:14:57.000000000 +0600
+@@ -59,28 +59,28 @@
+ 
+ # Directories and Files:
+ 
+-$reports_directory       = "/var/www/html/FlowViewer";
+-$reports_short           = "/FlowViewer";
+-$graphs_directory        = "/var/www/html/FlowGrapher";
+-$graphs_short            = "/FlowGrapher";
+-$tracker_directory       = "/var/www/html/FlowTracker";
+-$tracker_short           = "/FlowTracker";
++$reports_directory       = "%%FLOWVIEWERDIR%%/reports";
++$reports_short           = "/FlowViewer/reports";
++$graphs_directory        = "%%FLOWVIEWERDIR%%/graphs";
++$graphs_short            = "/FlowViewer/graphs";
++$tracker_directory       = "%%FLOWVIEWERDIR%%/tracker";
++$tracker_short           = "/FlowViewer/tracker";
+ $old_tracker_directory   = "/var/www/html/FlowTracker_4.2";
+-$cgi_bin_directory       = "/var/www/cgi-bin/FlowViewer_4.2.1";
+-$cgi_bin_short           = "/cgi-bin/FlowViewer_4.2.1";
+-$work_directory          = "/var/www/cgi-bin/FlowViewer_4.2.1/Flow_Working";
+-$save_directory          = "/var/www/html/FlowViewer_Saves";
+-$save_short              = "/FlowViewer_Saves";
+-$names_directory         = "/var/www/cgi-bin/FlowViewer_4.2.1";
+-$filter_directory        = "/var/www/cgi-bin/FlowTracker_Files/FlowTracker_Filters";  
+-$rrdtool_directory       = "/var/www/cgi-bin/FlowTracker_Files/FlowTracker_RRDtool";
+-$dashboard_directory     = "/var/www/html/FlowViewer_Dashboard";
++$cgi_bin_directory       = "%%FLOWVIEWERDIR%%";
++$cgi_bin_short           = "/FlowViewer";
++$work_directory          = "%%FLOWVIEWERDIR%%/working";
++$save_directory          = "%%FLOWVIEWERDIR%%/saves";
++$save_short              = "/FlowViewer/Saves";
++$names_directory         = "%%FLOWVIEWERDIR%%/names";
++$filter_directory        = "%%FLOWVIEWERDIR%%/filters";
++$rrdtool_directory       = "%%FLOWVIEWERDIR%%/rrdtools";
++$dashboard_directory     = "%%FLOWVIEWERDIR%%/FlowViewer_Dashboard";
+ $dashboard_short         = "/FlowViewer_Dashboard";
+ 
+-$flow_data_directory     = "/data/flows";
+-$exporter_directory      = "/data/flows/all_routers";
+-$flow_bin_directory      = "/usr/local/flow-tools/bin";
+-$rrdtool_bin_directory   = "/usr/bin";
++$flow_data_directory     = "%%PREFIX%%/var/netflow/";
++$exporter_directory      = "%%PREFIX%%/var/netflow/all_routers";
++$flow_bin_directory      = "%%PREFIX%%/bin";
++$rrdtool_bin_directory   = "%%PREFIX%%/bin";
+ 
+ $silk_data_directory     = "/data/flows";
+ $silk_bin_directory      = "/usr/local/bin";
+@@ -167,7 +167,7 @@
+ # Tracking parameters
+  
+ $actives_webpage    = "index.html";
+-$log_directory      = "/var/www/cgi-bin/FlowViewer_4.2.1/logs";
++$log_directory      = "%%FLOWVIEWERDIR%%/logs";
+ $log_collector_short= "Y";
+ $log_collector_med  = "N";
+ $log_collector_long = "N";

Modified: head/net-mgmt/flowviewer/pkg-plist
==============================================================================
--- head/net-mgmt/flowviewer/pkg-plist	Tue Feb  4 16:31:14 2014	(r342571)
+++ head/net-mgmt/flowviewer/pkg-plist	Tue Feb  4 16:31:28 2014	(r342572)
@@ -1,25 +1,77 @@
+%%FLOWVIEWERDIR%%/FG_button.png
+%%FLOWVIEWERDIR%%/FT_button.png
+%%FLOWVIEWERDIR%%/FV.cgi
+%%FLOWVIEWERDIR%%/FV_Relay.cgi
+%%FLOWVIEWERDIR%%/FV_button.png
 %%FLOWVIEWERDIR%%/FlowGrapher.cgi
-%%FLOWVIEWERDIR%%/FlowGrapher.png
 %%FLOWVIEWERDIR%%/FlowGrapher_Colors
 %%FLOWVIEWERDIR%%/FlowGrapher_Main.cgi
 %%FLOWVIEWERDIR%%/FlowGrapher_Relay.cgi
+%%FLOWVIEWERDIR%%/FlowGrapher_Replay.cgi
 %%FLOWVIEWERDIR%%/FlowGrapher_Sort.cgi
 %%FLOWVIEWERDIR%%/FlowTracker.cgi
-%%FLOWVIEWERDIR%%/FlowTracker.png
+%%FLOWVIEWERDIR%%/FlowTracker_AltDashboard
 %%FLOWVIEWERDIR%%/FlowTracker_Collector
+%%FLOWVIEWERDIR%%/FlowTracker_Dashboard.cgi
+%%FLOWVIEWERDIR%%/FlowTracker_Display.cgi
+%%FLOWVIEWERDIR%%/FlowTracker_DisplayPublic.cgi
 %%FLOWVIEWERDIR%%/FlowTracker_Dumper.cgi
 %%FLOWVIEWERDIR%%/FlowTracker_Grapher
 %%FLOWVIEWERDIR%%/FlowTracker_Group.cgi
+%%FLOWVIEWERDIR%%/FlowTracker_Main.cgi
+%%FLOWVIEWERDIR%%/FlowTracker_Management.cgi
+%%FLOWVIEWERDIR%%/FlowTracker_Recreate
 %%FLOWVIEWERDIR%%/FlowTracker_Relay.cgi
+%%FLOWVIEWERDIR%%/FlowTracker_Replay.cgi
+%%FLOWVIEWERDIR%%/FlowTracker_Thumbnail
 %%FLOWVIEWERDIR%%/FlowViewer.cgi
-%%FLOWVIEWERDIR%%/FlowViewer.png
+%%FLOWVIEWERDIR%%/FlowViewer.css
+%%FLOWVIEWERDIR%%/FlowViewer_CleanASCache
+%%FLOWVIEWERDIR%%/FlowViewer_CleanFiles
+%%FLOWVIEWERDIR%%/FlowViewer_CleanHostCache
+%%FLOWVIEWERDIR%%/FlowViewer_CleanSiLK
 %%FLOWVIEWERDIR%%/FlowViewer_Configuration.pm.dist
 %%FLOWVIEWERDIR%%/FlowViewer_Main.cgi
-%%FLOWVIEWERDIR%%/FlowViewer_Save.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_Relay.cgi
+%%FLOWVIEWERDIR%%/FlowViewer_Replay.cgi
+%%FLOWVIEWERDIR%%/FlowViewer_Save.cgi
+%%FLOWVIEWERDIR%%/FlowViewer_SaveManage.cgi
+%%FLOWVIEWERDIR%%/FlowViewer_Sort.cgi
+%%FLOWVIEWERDIR%%/FlowViewer_UI.pm
 %%FLOWVIEWERDIR%%/FlowViewer_Utilities.pm
-@dirrm %%FLOWVIEWERDIR%%/tracker
-@dirrm %%FLOWVIEWERDIR%%/tmp
-@dirrm %%FLOWVIEWERDIR%%/reports
-@dirrm %%FLOWVIEWERDIR%%/graphs
-@dirrm %%FLOWVIEWERDIR%%
+%%FLOWVIEWERDIR%%/NamedInterfaces_Devices
+%%FLOWVIEWERDIR%%/NamedInterfaces_Exporters
+%%FLOWVIEWERDIR%%/tools/analyze_flowtracker_debug
+%%FLOWVIEWERDIR%%/tools/analyze_netflow_packets
+%%FLOWVIEWERDIR%%/tools/convert_pre40_filters
+%%FLOWVIEWERDIR%%/tools/copy_netflow_jpl
+%%FLOWVIEWERDIR%%/tools/date_to_epoch_gm
+%%FLOWVIEWERDIR%%/tools/date_to_epoch_local
+%%FLOWVIEWERDIR%%/tools/edc_rwflowappend
+%%FLOWVIEWERDIR%%/tools/edc_rwreceiver
+%%FLOWVIEWERDIR%%/tools/epoch_to_date_gm
+%%FLOWVIEWERDIR%%/tools/epoch_to_date_local
+%%FLOWVIEWERDIR%%/tools/flow-capture-table.conf
+%%FLOWVIEWERDIR%%/tools/flowcapture_restart
+%%FLOWVIEWERDIR%%/tools/flowtracker_archive_restore
+%%FLOWVIEWERDIR%%/tools/flowtracker_grapher_nonlazy
+%%FLOWVIEWERDIR%%/tools/flowtracker_grapher_recent
+%%FLOWVIEWERDIR%%/tools/flowtracker_restart
+%%FLOWVIEWERDIR%%/tools/performance_check
+%%FLOWVIEWERDIR%%/tools/resize_rrdtools
+%%FLOWVIEWERDIR%%/tools/rsync_flows
+%%FLOWVIEWERDIR%%/tools/rsync_htmls
+%%FLOWVIEWERDIR%%/tools/rsync_trackings
+%%FLOWVIEWERDIR%%/tools/rwflowpack_start
+@dirrmtry %%FLOWVIEWERDIR%%/working
+@dirrmtry %%FLOWVIEWERDIR%%/tracker
+@dirrm %%FLOWVIEWERDIR%%/tools
+@dirrmtry %%FLOWVIEWERDIR%%/tmp
+@dirrmtry %%FLOWVIEWERDIR%%/saves
+@dirrmtry %%FLOWVIEWERDIR%%/rrdtools
+@dirrmtry %%FLOWVIEWERDIR%%/reports
+@dirrmtry %%FLOWVIEWERDIR%%/names
+@dirrmtry %%FLOWVIEWERDIR%%/graphs
+@dirrmtry %%FLOWVIEWERDIR%%/filters
+@dirrmtry %%FLOWVIEWERDIR%%/FlowViewer_Dashboard
+@dirrmtry %%FLOWVIEWERDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402041631.s14GVTSO049098>