- Update to version 4.5 [1]

- Remove optional installation of PORTDOCS, staging takes care of that
- Unmute install commands
- Use @dir() instead of one big chown to set directory permissions

PR:		194921 [1]
Submitted by:	timp87@gmail.com [1]
Approved by:	maintainer

1 files changed, 25 insertions, 18 deletions

diff --git a/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm b/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm
index 434fef37c67e..a458c048bb3c 100644
--- a/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm
+++ b/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm
@@ -1,6 +1,6 @@
---- FlowViewer_Configuration.pm.orig	2014-02-24 17:44:27.000000000 +0400
-+++ FlowViewer_Configuration.pm	2014-02-24 17:54:45.000000000 +0400
-@@ -56,31 +56,31 @@
+--- FlowViewer_Configuration.pm.orig	2014-11-10 11:04:45.000000000 +0300
++++ FlowViewer_Configuration.pm	2014-11-10 11:25:39.000000000 +0300
+@@ -64,36 +64,36 @@
  
  # Service
  
@@ -13,33 +13,40 @@
 -$reports_short           = "/FlowViewer";
 -$graphs_directory        = "/var/www/html/FlowGrapher";
 -$graphs_short            = "/FlowGrapher";
--$tracker_directory       = "/var/www/html/FlowTracker";
--$tracker_short           = "/FlowTracker";
--$cgi_bin_directory       = "/var/www/cgi-bin/FlowViewer_4.3";
--$cgi_bin_short           = "/cgi-bin/FlowViewer_4.3";
--$work_directory          = "/var/www/cgi-bin/FlowViewer_4.3/Flow_Working";
+-$monitor_directory       = "/var/www/html/FlowMonitor";
+-$monitor_short           = "/FlowMonitor";
+-$cgi_bin_directory       = "/var/www/cgi-bin/FlowViewer_4.5";
+-$cgi_bin_short           = "/cgi-bin/FlowViewer_4.5";
+-$work_directory          = "/var/www/cgi-bin/FlowViewer_4.5/Flow_Working";
 -$save_directory          = "/var/www/html/FlowViewer_Saves";
 -$save_short              = "/FlowViewer_Saves";
--$names_directory         = "/var/www/cgi-bin/FlowViewer_4.3";
--$filter_directory        = "/var/www/cgi-bin/FlowTracker_Files/FlowTracker_Filters";  
--$rrdtool_directory       = "/var/www/cgi-bin/FlowTracker_Files/FlowTracker_RRDtool";
+-$names_directory         = "/var/www/cgi-bin/FlowViewer_4.5";
+-$ipset_directory         = "/var/www/cgi-bin/FlowViewer_4.5";     # Where FlowViewer can find IPset files
+-$filter_directory        = "/var/www/cgi-bin/FlowMonitor_Files/FlowMonitor_Filters";  
+-$rrdtool_directory       = "/var/www/cgi-bin/FlowMonitor_Files/FlowMonitor_RRDtool";
 -$dashboard_directory     = "/var/www/html/FlowViewer_Dashboard";
 +$reports_directory       = "%%FLOWVIEWERDIR%%/reports";
 +$reports_short           = "/FlowViewer/reports";
 +$graphs_directory        = "%%FLOWVIEWERDIR%%/graphs";
 +$graphs_short            = "/FlowViewer/graphs";
-+$tracker_directory       = "%%FLOWVIEWERDIR%%/tracker";
-+$tracker_short           = "/FlowViewer/tracker";
++$monitor_directory       = "%%FLOWVIEWERDIR%%/monitor";
++$monitor_short           = "/FlowMonitor/monitor";
 +$cgi_bin_directory       = "%%FLOWVIEWERDIR%%";
 +$cgi_bin_short           = "/FlowViewer";
 +$work_directory          = "%%FLOWVIEWERDIR%%/working";
 +$save_directory          = "%%FLOWVIEWERDIR%%/saves";
 +$save_short              = "/FlowViewer/saves";
 +$names_directory         = "%%FLOWVIEWERDIR%%/names";
++$ipset_directory         = "%%FLOWVIEWERDIR%%/ipsets";     # Where FlowViewer can find IPset files
 +$filter_directory        = "%%FLOWVIEWERDIR%%/filters";  
 +$rrdtool_directory       = "%%FLOWVIEWERDIR%%/rrdtools";
 +$dashboard_directory     = "%%FLOWVIEWERDIR%%/FlowViewer_Dashboard";
  $dashboard_short         = "/FlowViewer_Dashboard";
+ #@other_dashboards       = ();          # Set to empty if you have just the one nominal Dashboard
+-@other_dashboards        = ("/var/www/html/SOC","/var/www/html/NetOps");
++@other_dashboards        = ("%%FLOWVIEWERDIR%%/SOC","%%FLOWVIEWERDIR%%/NetOps");
+ #@dashboard_titles       = ();          # Set to empty if you have just the one nominal Dashboard
+ @dashboard_titles        = ("Performance","SOC","NetOps"); # titles must be in the same order as the directories
  
 -$flow_data_directory     = "/data/flows";
 -$exporter_directory      = "/data/flows/all_routers";
@@ -50,13 +57,13 @@
 +$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
+ # SiLK parameters
+ 
+@@ -207,7 +207,7 @@
+ # Monitor parameters
   
  $actives_webpage    = "index.html";
--$log_directory      = "/var/www/cgi-bin/FlowViewer_4.3/logs";
+-$log_directory      = "/var/www/cgi-bin/FlowViewer_4.5/logs";
 +$log_directory      = "%%FLOWVIEWERDIR%%/logs";
  $log_collector_short= "Y";
  $log_collector_med  = "N";