Attachment 152155 Details for Bug 196013 – new patch

[patch] new patch

flowviewer.patch (text/plain), 3.28 KB, created by Pavel Timofeev on 2015-01-26 07:08:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2015-01-26 07:08:50 UTC

Size: 3.28 KB

patch

obsolete

>--- Makefile.orig	2014-12-13 15:08:11.000000000 +0300
>+++ Makefile	2015-01-26 10:05:55.000000000 +0300
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	flowviewer
> PORTVERSION=	4.5
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/${PORTNAME}
> DISTNAME=	FlowViewer_${DISTVERSION}
>@@ -36,8 +37,7 @@
> 		FlowViewer_UI.pm FlowViewer_Utilities.pm FlowGrapher_Colors \
> 		FlowMonitor_Collector FlowMonitor_Grapher \
> 		FlowMonitor_Recreate FlowMonitor_Thumbnail FlowViewer_CleanASCache \
>-		FlowViewer_CleanFiles FlowViewer_CleanHostCache FlowViewer_CleanSiLK \
>-		NamedInterfaces_Devices NamedInterfaces_Exporters
>+		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 \
>@@ -69,7 +69,9 @@
> do-install:
> 	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}
> 	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tools
>-	${INSTALL_DATA} ${WRKSRC}/FlowViewer_Configuration.pm ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Configuration.pm.dist
>+	${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 \
>--- pkg-plist.orig	2014-12-13 15:08:11.000000000 +0300
>+++ pkg-plist	2015-01-26 09:47:15.000000000 +0300
>@@ -23,7 +23,7 @@
> %%FLOWVIEWERDIR%%/FlowViewer_CleanFiles
> %%FLOWVIEWERDIR%%/FlowViewer_CleanHostCache
> %%FLOWVIEWERDIR%%/FlowViewer_CleanSiLK
>-%%FLOWVIEWERDIR%%/FlowViewer_Configuration.pm.dist
>+%%FLOWVIEWERDIR%%/FlowViewer_Configuration.pm.sample
> %%FLOWVIEWERDIR%%/FlowViewer_Main.cgi
> %%FLOWVIEWERDIR%%/FlowViewer_Replay.cgi
> %%FLOWVIEWERDIR%%/FlowViewer_Save.cgi
>@@ -31,8 +31,8 @@
> %%FLOWVIEWERDIR%%/FlowViewer_Sort.cgi
> %%FLOWVIEWERDIR%%/FlowViewer_UI.pm
> %%FLOWVIEWERDIR%%/FlowViewer_Utilities.pm
>-%%FLOWVIEWERDIR%%/NamedInterfaces_Devices
>-%%FLOWVIEWERDIR%%/NamedInterfaces_Exporters
>+%%FLOWVIEWERDIR%%/NamedInterfaces_Devices.sample
>+%%FLOWVIEWERDIR%%/NamedInterfaces_Exporters.sample
> %%FLOWVIEWERDIR%%/dscan.suppress.dst
> %%FLOWVIEWERDIR%%/dscan.suppress.src
> %%FLOWVIEWERDIR%%/tools/analyze_flowmonitor_debug
>--- files/pkg-message.in.orig	2014-03-03 18:21:44.000000000 +0400
>+++ files/pkg-message.in	2015-01-26 09:47:15.000000000 +0300
>@@ -2,8 +2,10 @@
> 
>     %%FLOWVIEWERDIR%%
> 
>-Please copy FlowViewer_Configuration.pm.dist to FlowViewer_Configuration.pm
>-and edit it to suit your needs.
>+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.
> 
> To make FlowViewer available through your web site, I suggest
> that you add something like the following to httpd.conf:

Actions: View | Diff

Attachments on bug 196013: 150625 | 152153 | 152155