ports/154507: [UPDATE] net-mgmt/nagiosgraph: update to 1.4.4 [feature safe]
Ruslan Mahmatkhanov
cvs-src at yandex.ru
Fri Feb 4 11:00:17 UTC 2011
>Number: 154507
>Category: ports
>Synopsis: [UPDATE] net-mgmt/nagiosgraph: update to 1.4.4 [feature safe]
>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: Fri Feb 04 11:00:16 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ruslan Mahmatkhanov
>Release: FreeBSD 8.2-RC1
>Organization:
>Environment:
FreeBSD 8.2-RC1 i386
tested with nagios 3.2.3 and successfully updated from 1.4.3 to 1.4.4
>Description:
- update to 1.4.4
this release brings a lot of bug fixes and improvements, fully backward compatible.
changelog: http://nagiosgraph.svn.sourceforge.net/svnroot/nagiosgraph/trunk/nagiosgraph/CHANGELOG
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruNa nagiosgraph.orig/Makefile nagiosgraph/Makefile
--- nagiosgraph.orig/Makefile 2010-08-18 01:32:58.000000000 +0400
+++ nagiosgraph/Makefile 2011-02-03 16:20:19.000000000 +0300
@@ -6,7 +6,7 @@
#
PORTNAME= nagiosgraph
-PORTVERSION= 1.4.3
+PORTVERSION= 1.4.4
CATEGORIES= net-mgmt
MASTER_SITES= SF
@@ -21,7 +21,8 @@
PORTDOCS= AUTHORS CHANGELOG INSTALL README TODO
NAGIOSWWWDIR?= www/nagios
-CGIFILES= show.cgi showgraph.cgi showhost.cgi showservice.cgi testcolor.cgi showgroup.cgi
+CGIFILES= show.cgi showconfig.cgi showgraph.cgi showgroup.cgi showhost.cgi \
+ showservice.cgi testcolor.cgi
LIBFILES= insert.pl
CFGFILES= nagiosgraph.conf nagiosgraph_de.conf nagiosgraph_es.conf nagiosgraph_fr.conf \
servdb.conf groupdb.conf hostdb.conf datasetdb.conf map access.conf labels.conf \
@@ -68,7 +69,7 @@
.endfor
${MV} ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif.bak
- ${INSTALL_DATA} ${WRKSRC}/share/action.gif ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif
+ ${INSTALL_DATA} ${WRKSRC}/share/graph.gif ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif
.if !defined(NOPORTEXAMPLES)
${MKDIR} ${EXAMPLESDIR}
diff -ruNa nagiosgraph.orig/distinfo nagiosgraph/distinfo
--- nagiosgraph.orig/distinfo 2010-08-18 01:32:58.000000000 +0400
+++ nagiosgraph/distinfo 2011-02-03 16:20:19.000000000 +0300
@@ -1,3 +1,2 @@
-MD5 (nagiosgraph-1.4.3.tar.gz) = e00ac92d9d51a7605e08617d19b64080
-SHA256 (nagiosgraph-1.4.3.tar.gz) = f5c75abc782020d150c99417316dc838b640480be6b481cdd791b528954cd74f
-SIZE (nagiosgraph-1.4.3.tar.gz) = 113534
+SHA256 (nagiosgraph-1.4.4.tar.gz) = e6c7091fbbf7dc44a5a3e8584d3f85dfbf20171dcb253c744ac15300cc9804a1
+SIZE (nagiosgraph-1.4.4.tar.gz) = 157955
diff -ruNa nagiosgraph.orig/files/patch-etc__nagiosgraph.conf.in nagiosgraph/files/patch-etc__nagiosgraph.conf.in
--- nagiosgraph.orig/files/patch-etc__nagiosgraph.conf.in 2010-08-18 01:32:58.000000000 +0400
+++ nagiosgraph/files/patch-etc__nagiosgraph.conf.in 2011-02-03 16:20:19.000000000 +0300
@@ -1,20 +1,20 @@
---- ./etc/nagiosgraph.conf.orig 2010-06-07 18:30:21.000000000 +0200
-+++ ./etc/nagiosgraph.conf 2010-08-17 21:50:26.000000000 +0200
+--- ./etc/nagiosgraph.conf.orig 2011-01-15 09:27:44.000000000 +0300
++++ ./etc/nagiosgraph.conf 2011-02-03 16:08:34.000000000 +0300
@@ -8,19 +8,19 @@
# Author: (c) 2010 Matthew Wall
- # Location of nagiosgraph log file. Debug output ends up here.
--logfile = /var/log/nagiosgraph.log
+ # Location of output from nagiosgraph data processing
+-logfile = /var/nagiosgraph/nagiosgraph.log
+logfile = /var/spool/nagios/nagiosgraph.log
- # Optionally keep logging from CGI scripts in a separate file.
- #cgilogfile = /var/log/nagiosgraph-cgi.log
+ # Location of output from nagiosgraph CGI scripts
+ cgilogfile = /var/nagiosgraph/nagiosgraph-cgi.log
- # Location of nagios performance data log file. Comment out if not used.
+ # Location of nagios performance data log file.
-perflog = /var/nagios/perfdata.log
+perflog = /var/spool/nagios/perfdata.log
- # Directory to store rrd database files
+ # Directory in which to store RRD files
-rrddir = /var/nagiosgraph/rrd
+rrddir = /var/spool/nagios/nagiosgraph/rrd
@@ -24,12 +24,8 @@
# Nagiosgraph CGI URL.
nagiosgraphcgiurl = /nagiosgraph/cgi-bin
-@@ -30,36 +30,36 @@
- #nagioscgiurl = /nagios/cgi-bin
-
- # JavaScript: URL to the nagiosgraph javascript file.
--javascript = /nagiosgraph/nagiosgraph.js
-+javascript = /nagios/stylesheets/nagiosgraph.js
+@@ -33,22 +33,22 @@
+ javascript = /nagiosgraph/nagiosgraph.js
# Stylesheet: URL to the nagiosgraph stylesheet.
-stylesheet = /nagiosgraph/nagiosgraph.css
@@ -57,14 +53,15 @@
# Access control configuration (optional)
# The authorization method can be one of nagios3 or nagiosgraph. If no
- # method is defined, access will be granted to all hosts and services.
- # For access control via nagios, specify the nagios configuration files.
+@@ -61,12 +61,12 @@
+ # authorized_for_all_hosts, authorized_for_all_services, and default_user_name
+ # variables to determine permissions.
#authzmethod = nagios3
--#authznagios_cfg = /etc/nagios/nagios.cfg
--#authzcgi_cfg = /etc/nagios/cgi.cfg
-+#authznagios_cfg = %%PREFIX%%/etc/nagios/nagios.cfg
-+#authzcgi_cfg = %%PREFIX%%/etc/nagios/cgi.cfg
+-#authzfile = /etc/nagios/cgi.cfg
++#authzfile = %%PREFIX%%/etc/nagios/cgi.cfg
+
# For access control via nagiosgraph, specify a single access control file.
+ # See the sample access control file for syntax and examples.
#authzmethod = nagiosgraph
-#authzfile = /etc/nagiosgraph/access.conf
+#authzfile = %%PREFIX%%/etc/nagios/nagiosgraph/access.conf
diff -ruNa nagiosgraph.orig/pkg-plist nagiosgraph/pkg-plist
--- nagiosgraph.orig/pkg-plist 2010-05-02 16:11:04.000000000 +0400
+++ nagiosgraph/pkg-plist 2011-02-03 16:20:19.000000000 +0300
@@ -37,6 +37,7 @@
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/rrdopts.conf ] ; then cp -p %D/%F %B/rrdopts.conf; fi
libexec/%%PORTNAME%%/insert.pl
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/show.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showconfig.cgi
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showgraph.cgi
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showgroup.cgi
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showhost.cgi
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list