Date: Sun, 7 Nov 2010 01:40:10 +0100 (CET) From: Olli Hauer <ohauer@FreeBSD.org> To: <FreeBSD-gnats-submit@FreeBSD.org> Cc: derfi@vei.ru Subject: ports/151999: [patch] port net-mgmt/nagvis update to 1.5.5 Message-ID: <20101107004010.BF53F204A4@u18-124.dslaccess.de> Resent-Message-ID: <201011070050.oA70o7aY088391@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151999 >Category: ports >Synopsis: [patch] port net-mgmt/nagvis update to 1.5.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Nov 07 00:50:07 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Olli Hauer <ohauer@FreeBSD.org> >Release: FreeBSD 7.3 >Organization: >Environment: >Description: - update nagvis to version 1.5.5 - add OPIONS for ndb2dbo and mk-livestatus brokers - make mk-livestatus the default broker since it needs no database - add pkg-deinstall message Changelog for 1.5.5 =================== NagVis WUI: * Change backend_id field in WUI to dropdown select field for map options NagVis MKLivestatus Backend: * Recode MKLivestatus backend to use fsockopen instead of socket module NagVis Core * State of map objects was not refreshed correctly in 1.5.4 * Increase max username length limitation to sth. larger than 15 * The permission for controlling multisite access is missing Source: http://sourceforge.net/apps/trac/nagvis/report/32 >How-To-Repeat: >Fix: --- patch_nagvis.txt begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagvis/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 1 Nov 2010 20:45:55 -0000 1.1 +++ Makefile 7 Nov 2010 00:24:53 -0000 @@ -6,18 +6,18 @@ # PORTNAME= nagvis -PORTVERSION= 1.5.4 +PORTVERSION= 1.5.5 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/NagVis%201.5/ MAINTAINER= derfi@vei.ru COMMENT= NagVis is a visualization addon for Nagios -RUN_DEPENDS= ndo2db-3x:${PORTSDIR}/net-mgmt/ndoutils - LICENSE= GPLv2 -OPTIONS= GRAPHVIZ "graphviz is needed for automaps" off +OPTIONS= NDO2DB "depend on ndo2db broker" off \ + MKLIVESTATUS "depend on mk-liveview broker (preferred)" on \ + GRAPHVIZ "graphviz is needed for automaps" off NO_BUILD= yes USE_PHP= gd gettext mbstring mysql session json pdo pdo_sqlite @@ -29,12 +29,25 @@ WWW_OWNER?= ${WWWOWN} WWW_GROUP?= ${WWWGRP} SUB_LIST+= WWW_OWNER=${WWW_OWNER} WWW_GROUP=${WWW_GROUP} -SUB_FILES+= pkg-install +SUB_FILES+= pkg-install pkg-deinstall + +.if defined(WITH_NDO2DB) +RUN_DEPENDS+= ndo2db-3x:${PORTSDIR}/net-mgmt/ndoutils +.endif + +.if defined(WITH_MKLIVESTATUS) +RUN_DEPENDS+= mk-livestatus>=0:${PORTSDIR}/net-mgmt/mk-livestatus +.endif .if defined(WITH_GRAPHVIZ) RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz .endif +check-sanity: +.if !defined(WITH_NDO2DB) && !defined(WITH_MKLIVESTATUS) +IGNORE= please choose at least one nagios broker module +.endif + post-extract: @${RM} -f ${WRKSRC}/.gitignore ${WRKSRC}/install.sh ${WRKSRC}/INSTALL Index: distinfo =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagvis/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 1 Nov 2010 20:45:55 -0000 1.1 +++ distinfo 7 Nov 2010 00:24:53 -0000 @@ -1,2 +1,2 @@ -SHA256 (nagvis-1.5.4.tar.gz) = 3257663a9e3a212f84d94e86c7bfa60c5913fe9249d5c16fadf4f0875b4804fc -SIZE (nagvis-1.5.4.tar.gz) = 3257681 +SHA256 (nagvis-1.5.5.tar.gz) = 37b9fd132427b21d129d181b657c1b064af1f3220209e2a0f48bbb33cc5347d0 +SIZE (nagvis-1.5.5.tar.gz) = 3258337 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagvis/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 1 Nov 2010 20:45:55 -0000 1.1 +++ pkg-plist 7 Nov 2010 00:24:53 -0000 @@ -700,10 +700,10 @@ %%WWWDIR%%/uifx/src/modules/gmap/view/controls/LocationMarker.as %%WWWDIR%%/uifx/src/services-config.xml %%WWWDIR%%/uifx/src/shell.mxml -@dirrm %%WWWDIR%%/var/tmpl/compile -@dirrm %%WWWDIR%%/var/tmpl/cache -@dirrm %%WWWDIR%%/var/tmpl -@dirrm %%WWWDIR%%/var +@dirrmtry %%WWWDIR%%/var/tmpl/compile +@dirrmtry %%WWWDIR%%/var/tmpl/cache +@dirrmtry %%WWWDIR%%/var/tmpl +@dirrmtry %%WWWDIR%%/var @dirrm %%WWWDIR%%/uifx/src/modules/gmap/view/controls @dirrm %%WWWDIR%%/uifx/src/modules/gmap/view @dirrm %%WWWDIR%%/uifx/src/modules/gmap/mediator @@ -723,7 +723,7 @@ @dirrm %%WWWDIR%%/uifx/html-template/history @dirrm %%WWWDIR%%/uifx/html-template @dirrm %%WWWDIR%%/uifx -@dirrm %%WWWDIR%%/share/var +@dirrmtry %%WWWDIR%%/share/var @dirrmtry %%WWWDIR%%/share/userfiles/templates @dirrmtry %%WWWDIR%%/share/userfiles/styles @dirrmtry %%WWWDIR%%/share/userfiles/sounds Index: files/pkg-deinstall.in =================================================================== RCS file: files/pkg-deinstall.in diff -N files/pkg-deinstall.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-deinstall.in 7 Nov 2010 00:24:53 -0000 @@ -0,0 +1,20 @@ +#!/bin/sh +# $FreeBSD$ + +if [ "$2" != "POST-DEINSTALL" ]; then + exit 0 +fi + +echo +echo "====================================================" +echo +echo "If you want remove nagvis permanently from you system" +echo "execute following command:" +echo +echo " # rm -rf %%WWWDIR%%" +echo +echo "Do not forget to cleanup your webserver config" +echo "====================================================" +echo + +exit 0 Index: files/pkg-install.in =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagvis/files/pkg-install.in,v retrieving revision 1.1 diff -u -r1.1 pkg-install.in --- files/pkg-install.in 1 Nov 2010 20:45:55 -0000 1.1 +++ files/pkg-install.in 7 Nov 2010 00:24:53 -0000 @@ -1,4 +1,5 @@ #!/bin/sh +# $FreeBSD$ # # fix directory owner if installed via package if [ "$2" = "POST-INSTALL" ]; then --- patch_nagvis.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101107004010.BF53F204A4>