Date: Thu, 2 Nov 2006 23:01:56 +0200 From: "Alex Samorukov" <samm@os2.kiev.ua> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/105088: [patch] net-mgmt/flowviewer Message-ID: <1162501316.13351@samm.local> Resent-Message-ID: <200611022110.kA2LALDG085688@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105088
>Category: ports
>Synopsis: [patch] net-mgmt/flowviewer
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 02 21:10:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alex Samorukov
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
Shevchenko Didkovskiy and Partners
>Environment:
System: FreeBSD 6.1-RELEASE #2: Wed May 17 22:22:18 EEST 2006
root@samm.local:/usr/obj/usr/src/sys/SAMMKRNL
>Description:
After testing on my servers i found some bugs in my port which i corrected there:
1) work_directory statement in config file was lost.
2) filter_directory and rrdtool_directory now pointed to %%FLOWDIR%%/tmp
3) Now installation script create directories for flowviewer data with ${WWWOWN}:${WWWGRP} owner.
4) fixed typo in the pkg-message.in file (forgotten "/")
>How-To-Repeat:
>Fix:
diff -ruN --exclude=CVS /usr/ports/net-mgmt/flowviewer/Makefile /usr/home/samm/tmp/flowviewer/Makefile
--- /usr/ports/net-mgmt/flowviewer/Makefile Wed Nov 1 00:20:48 2006
+++ /usr/home/samm/tmp/flowviewer/Makefile Thu Nov 2 22:50:43 2006
@@ -61,6 +61,12 @@
@${INSTALL_DATA} ${WRKSRC}/FlowTracker.png ${FLOWVIEWERDIR}
@${INSTALL_DATA} ${WRKSRC}/FlowTracker_Links.png ${FLOWVIEWERDIR}
@${INSTALL_DATA} ${WRKSRC}/FlowViewer.png ${FLOWVIEWERDIR}
+ @${MKDIR} ${FLOWVIEWERDIR}/tmp ${FLOWVIEWERDIR}/reports \
+ ${FLOWVIEWERDIR}/graphs ${FLOWVIEWERDIR}/tracker
+ @${CHOWN} ${WWWOWN}:${WWWGRP} ${FLOWVIEWERDIR}/tmp \
+ ${FLOWVIEWERDIR}/reports ${FLOWVIEWERDIR}/graphs \
+ ${FLOWVIEWERDIR}/tracker
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff -ruN --exclude=CVS /usr/ports/net-mgmt/flowviewer/files/patch-config /usr/home/samm/tmp/flowviewer/files/patch-config
--- /usr/ports/net-mgmt/flowviewer/files/patch-config Wed Nov 1 00:20:49 2006
+++ /usr/home/samm/tmp/flowviewer/files/patch-config Thu Nov 2 22:21:10 2006
@@ -1,6 +1,6 @@
---- FlowViewer_Configuration.pm.dist Tue Oct 17 23:39:53 2006
-+++ FlowViewer_Configuration.pm Wed Oct 18 00:19:10 2006
-@@ -43,22 +43,25 @@
+--- FlowViewer_Configuration.pm.orig Wed Oct 4 23:19:00 2006
++++ FlowViewer_Configuration.pm Thu Nov 2 22:21:03 2006
+@@ -43,22 +43,26 @@
# Directories and Files:
@@ -12,7 +12,6 @@
-$tracker_short = "/FlowTracker";
-$cgi_bin_directory = "/htp/cgi-bin/FlowViewer_3.0";
-$cgi_bin_short = "/cgi-bin/FlowViewer_3.0";
--$work_directory = "/tmp";
+$reports_directory = "%%FLOWVIEWERDIR%%/reports";
+$reports_short = "/FlowViewer/reports";
+$graphs_directory = "%%FLOWVIEWERDIR%%/graphs";
@@ -25,11 +24,12 @@
+$reports_short = "/FlowViewer/reports";
+$graphs_directory = "%%FLOWVIEWERDIR%%/graphs";
+$graphs_short = "/FlowViewer/graphs";
+ $work_directory = "/tmp";
$names_directory = "/tmp";
-$filter_directory = "/htp/cgi-bin/Flow_Temp/FlowTracker_Filters";
-$rrdtool_directory = "/htp/cgi-bin/Flow_Temp/FlowTracker_RRDtool";
-+$filter_directory = "%%FLOWVIEWERDIR%%/tracker_filters";
-+$rrdtool_directory = "%%FLOWVIEWERDIR%%/tracket_rrdtools";
++$filter_directory = "%%FLOWVIEWERDIR%%/tmp/filters";
++$rrdtool_directory = "%%FLOWVIEWERDIR%%/tmp/rrdtools";
-$flow_data_directory = "/htp/flows";
-$flow_bin_directory = "/usr/bin";
diff -ruN --exclude=CVS /usr/ports/net-mgmt/flowviewer/files/pkg-message.in /usr/home/samm/tmp/flowviewer/files/pkg-message.in
--- /usr/ports/net-mgmt/flowviewer/files/pkg-message.in Wed Nov 1 00:20:49 2006
+++ /usr/home/samm/tmp/flowviewer/files/pkg-message.in Thu Nov 2 22:23:15 2006
@@ -8,10 +8,10 @@
To make FlowViewer available through your web site, I suggest
that you add something like the following to httpd.conf:
- Alias /FlowViewer/ "%%FLOWVIEWERDIR%%"
+ Alias /FlowViewer/ "%%FLOWVIEWERDIR%%/"
- <Directory "%%FLOWVIEWERDIR%%">
+ <Directory "%%FLOWVIEWERDIR%%/">
Options +ExecCGI
AddHandler cgi-script .cgi
Order allow,deny
diff -ruN --exclude=CVS /usr/ports/net-mgmt/flowviewer/pkg-plist /usr/home/samm/tmp/flowviewer/pkg-plist
--- /usr/ports/net-mgmt/flowviewer/pkg-plist Wed Nov 1 00:20:48 2006
+++ /usr/home/samm/tmp/flowviewer/pkg-plist Thu Nov 2 22:31:34 2006
@@ -15,5 +15,9 @@
%%FLOWVIEWERDIR%%/FlowTracker_Links.png
%%FLOWVIEWERDIR%%/FlowViewer.png
%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%FLOWVIEWERDIR%%
+@dirrmtry %%FLOWVIEWERDIR%%/reports
+@dirrmtry %%FLOWVIEWERDIR%%/graphs
+@dirrmtry %%FLOWVIEWERDIR%%/tracker
+@dirrmtry %%FLOWVIEWERDIR%%/tmp
+@dirrmtry %%FLOWVIEWERDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1162501316.13351>