Attachment 156943 Details for Bug 200329 – patch

[patch] patch

flowviewer.patch (text/plain), 7.31 KB, created by Pavel Timofeev on 2015-05-19 14:15:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2015-05-19 14:15:32 UTC

Size: 7.31 KB

patch

obsolete

>diff -ruN /home/timp/flowviewer.orig/Makefile /usr/ports/net-mgmt/flowviewer/Makefile
>--- /home/timp/flowviewer.orig/Makefile	2015-05-19 10:42:42.861255000 +0300
>+++ /usr/ports/net-mgmt/flowviewer/Makefile	2015-05-19 17:07:45.150173000 +0300
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	flowviewer
> PORTVERSION=	4.5
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/${PORTNAME}
> DISTNAME=	FlowViewer_${DISTVERSION}
>@@ -26,25 +26,31 @@
> 
> FLOWVIEWERDIR?=	${PREFIX}/www/flowviewer
> 
>-PLIST_SCRIPT=	FV.cgi FV_Relay.cgi FlowGrapher.cgi FlowGrapher_Main.cgi \
>-		FlowGrapher_Replay.cgi FlowGrapher_Sort.cgi \
>+FLOWVIEWERSCRIPTS=	FV.cgi FV_Relay.cgi FlowGrapher.cgi FlowGrapher_Analyze.cgi \
>+		FlowGrapher_Main.cgi FlowGrapher_Replay.cgi FlowGrapher_Sort.cgi \
> 		FlowMonitor.cgi FlowMonitor_Dashboard.cgi FlowMonitor_Display.cgi \
> 		FlowMonitor_DisplayPublic.cgi FlowMonitor_Dumper.cgi \
> 		FlowMonitor_Group.cgi FlowMonitor_Main.cgi FlowMonitor_Management.cgi \
>-		FlowMonitor_Replay.cgi FlowViewer.cgi dscan.suppress.dst dscan.suppress.src \
>-		FlowViewer_Main.cgi FlowViewer_Replay.cgi \
>-		FlowViewer_Save.cgi FlowViewer_SaveManage.cgi FlowViewer_Sort.cgi \
>-		FlowViewer_UI.pm FlowViewer_Utilities.pm FlowGrapher_Colors \
>+		FlowMonitor_Replay.cgi FlowViewer.cgi FlowViewer_Main.cgi \
>+		FlowViewer_Replay.cgi FlowViewer_Save.cgi FlowViewer_SaveManage.cgi \
>+		FlowViewer_Sort.cgi FlowViewer_UI.pm FlowViewer_Utilities.pm \
> 		FlowMonitor_Collector FlowMonitor_Grapher \
> 		FlowMonitor_Recreate FlowMonitor_Thumbnail FlowViewer_CleanASCache \
> 		FlowViewer_CleanFiles FlowViewer_CleanHostCache FlowViewer_CleanSiLK
>-PLIST_DATA=	FG_button.png FM_button.png FV_button.png FlowViewer.css
>-PLIST_TOOLS=	flowcapture_restart resize_rrdtools flowmonitor_grapher_nonlazy \
>-		date_to_epoch_gm performance_check flowmonitor_restart \
>-		convert_pre40_filters analyze_flowmonitor_debug flowmonitor_grapher_recent \
>-		flow-capture-table.conf rsync_monitors epoch_to_date_local rwflowpack_start \
>-		epoch_to_date_gm rsync_htmls flowmonitor_archive_restore \
>-		date_to_epoch_local analyze_netflow_packets rsync_flows
>+FLOWVIEWERDATA=	FG_button.png FM_button.png FV_button.png FlowViewer.css
>+SHEBANG_TOOLS=	tools/analyze_flowmonitor_debug tools/analyze_netflow_packets \
>+		tools/convert_pre40_filters tools/create_ports_file tools/date_to_epoch_gm \
>+		tools/date_to_epoch_local tools/epoch_to_date_gm tools/epoch_to_date_local \
>+		tools/flowmonitor_archive_restore tools/flowmonitor_grapher_nonlazy \
>+		tools/flowmonitor_grapher_recent tools/performance_check tools/resize_rrdtools
>+FLOWVIEWERTOOLS=	${SHEBANG_TOOLS} \
>+		tools/flowcapture_restart tools/flowmonitor_restart \
>+		tools/flow-capture-table.conf tools/rsync_monitors tools/rwflowpack_start \
>+		tools/rsync_htmls tools/rsync_flows
>+FLOWVIEWERCONFIGS=	FlowViewer_Configuration.pm \
>+		FlowGrapher_Colors FlowGrapher_Ports \
>+		NamedInterfaces_Devices NamedInterfaces_Exporters \
>+		dscan.suppress.dst dscan.suppress.src
> 
> PLIST_SUB+=	FLOWVIEWERDIR="${FLOWVIEWERDIR}" \
> 		WWWOWN=${WWWOWN} \
>@@ -53,7 +59,8 @@
> 		"PKGNAME=${PKGNAME}"
> SUB_FILES=	pkg-message
> 
>-USES=		perl5
>+USES=		perl5 shebangfix
>+SHEBANG_FILES=	${FLOWVIEWERSCRIPTS} ${SHEBANG_TOOLS} FlowViewer_Configuration.pm
> NO_BUILD=	yes
> 
> PORTDOCS=	README
>@@ -69,20 +76,20 @@
> do-install:
> 	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}
> 	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tools
>-	${INSTALL_DATA} ${WRKSRC}/FlowViewer_Configuration.pm ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Configuration.pm.sample
>-	${INSTALL_DATA} ${WRKSRC}/NamedInterfaces_Devices ${STAGEDIR}${FLOWVIEWERDIR}/NamedInterfaces_Devices.sample
>-	${INSTALL_DATA} ${WRKSRC}/NamedInterfaces_Exporters ${STAGEDIR}${FLOWVIEWERDIR}/NamedInterfaces_Exporters.sample
> 	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tmp ${STAGEDIR}${FLOWVIEWERDIR}/reports ${STAGEDIR}${FLOWVIEWERDIR}/graphs \
> 	${STAGEDIR}${FLOWVIEWERDIR}/monitor ${STAGEDIR}${FLOWVIEWERDIR}/working ${STAGEDIR}${FLOWVIEWERDIR}/saves \
> 	${STAGEDIR}${FLOWVIEWERDIR}/names ${STAGEDIR}${FLOWVIEWERDIR}/ipsets ${STAGEDIR}${FLOWVIEWERDIR}/filters \
> 	${STAGEDIR}${FLOWVIEWERDIR}/rrdtools ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Dashboard
>-.for i in ${PLIST_SCRIPT}
>+.for i in ${FLOWVIEWERCONFIGS}
>+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}/${i}.sample
>+.endfor
>+.for i in ${FLOWVIEWERSCRIPTS}
> 	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}
> .endfor
>-.for i in ${PLIST_TOOLS}
>-	${INSTALL_SCRIPT} ${WRKSRC}/tools/${i} ${STAGEDIR}${FLOWVIEWERDIR}/tools
>+.for i in ${FLOWVIEWERTOOLS}
>+	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}/tools
> .endfor
>-.for i in ${PLIST_DATA}
>+.for i in ${FLOWVIEWERDATA}
> 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}/reports
> .endfor
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>diff -ruN /home/timp/flowviewer.orig/files/pkg-message.in /usr/ports/net-mgmt/flowviewer/files/pkg-message.in
>--- /home/timp/flowviewer.orig/files/pkg-message.in	2015-05-19 10:42:42.907905000 +0300
>+++ /usr/ports/net-mgmt/flowviewer/files/pkg-message.in	2015-05-19 16:00:33.302838000 +0300
>@@ -2,10 +2,7 @@
> 
>     %%FLOWVIEWERDIR%%
> 
>-Please copy FlowViewer_Configuration.pm.sample to FlowViewer_Configuration.pm,
>-NamedInterfaces_Devices.sample to NamedInterfaces_Devices,
>-NamedInterfaces_Exporters.sample to NamedInterfaces_Exporters
>-and edit them to suit your needs.
>+Please edit at least FlowViewer_Configuration.pm to suit your needs.
> 
> To make FlowViewer available through your web site, I suggest
> that you add something like the following to httpd.conf:
>diff -ruN /home/timp/flowviewer.orig/pkg-plist /usr/ports/net-mgmt/flowviewer/pkg-plist
>--- /home/timp/flowviewer.orig/pkg-plist	2015-05-19 10:42:43.249518000 +0300
>+++ /usr/ports/net-mgmt/flowviewer/pkg-plist	2015-05-19 16:35:18.806613000 +0300
>@@ -1,8 +1,10 @@
> %%FLOWVIEWERDIR%%/FV.cgi
> %%FLOWVIEWERDIR%%/FV_Relay.cgi
> %%FLOWVIEWERDIR%%/FlowGrapher.cgi
>-%%FLOWVIEWERDIR%%/FlowGrapher_Colors
>+%%FLOWVIEWERDIR%%/FlowGrapher_Analyze.cgi
>+@sample %%FLOWVIEWERDIR%%/FlowGrapher_Colors.sample
> %%FLOWVIEWERDIR%%/FlowGrapher_Main.cgi
>+@sample %%FLOWVIEWERDIR%%/FlowGrapher_Ports.sample
> %%FLOWVIEWERDIR%%/FlowGrapher_Replay.cgi
> %%FLOWVIEWERDIR%%/FlowGrapher_Sort.cgi
> %%FLOWVIEWERDIR%%/FlowMonitor.cgi
>@@ -23,7 +25,7 @@
> %%FLOWVIEWERDIR%%/FlowViewer_CleanFiles
> %%FLOWVIEWERDIR%%/FlowViewer_CleanHostCache
> %%FLOWVIEWERDIR%%/FlowViewer_CleanSiLK
>-%%FLOWVIEWERDIR%%/FlowViewer_Configuration.pm.sample
>+@sample %%FLOWVIEWERDIR%%/FlowViewer_Configuration.pm.sample
> %%FLOWVIEWERDIR%%/FlowViewer_Main.cgi
> %%FLOWVIEWERDIR%%/FlowViewer_Replay.cgi
> %%FLOWVIEWERDIR%%/FlowViewer_Save.cgi
>@@ -31,13 +33,14 @@
> %%FLOWVIEWERDIR%%/FlowViewer_Sort.cgi
> %%FLOWVIEWERDIR%%/FlowViewer_UI.pm
> %%FLOWVIEWERDIR%%/FlowViewer_Utilities.pm
>-%%FLOWVIEWERDIR%%/NamedInterfaces_Devices.sample
>-%%FLOWVIEWERDIR%%/NamedInterfaces_Exporters.sample
>-%%FLOWVIEWERDIR%%/dscan.suppress.dst
>-%%FLOWVIEWERDIR%%/dscan.suppress.src
>+@sample %%FLOWVIEWERDIR%%/NamedInterfaces_Devices.sample
>+@sample %%FLOWVIEWERDIR%%/NamedInterfaces_Exporters.sample
>+@sample %%FLOWVIEWERDIR%%/dscan.suppress.dst.sample
>+@sample %%FLOWVIEWERDIR%%/dscan.suppress.src.sample
> %%FLOWVIEWERDIR%%/tools/analyze_flowmonitor_debug
> %%FLOWVIEWERDIR%%/tools/analyze_netflow_packets
> %%FLOWVIEWERDIR%%/tools/convert_pre40_filters
>+%%FLOWVIEWERDIR%%/tools/create_ports_file
> %%FLOWVIEWERDIR%%/tools/date_to_epoch_gm
> %%FLOWVIEWERDIR%%/tools/date_to_epoch_local
> %%FLOWVIEWERDIR%%/tools/epoch_to_date_gm

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 200329: 156943