Attachment 105581 Details for Bug 146081 – file.diff

[patch] file.diff

file.diff (text/plain), 10.08 KB, created by hizel on 2010-04-27 10:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: hizel

Created: 2010-04-27 10:20:02 UTC

Size: 10.08 KB

patch

obsolete

>diff --git a/net-mgmt/nagiosgraph/Makefile b/net-mgmt/nagiosgraph/Makefile
>index 0f036ea..4425f33 100644
>--- a/net-mgmt/nagiosgraph/Makefile
>+++ b/net-mgmt/nagiosgraph/Makefile
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	nagiosgraph
>-PORTVERSION=	1.4.1
>-PORTREVISION=	1
>+PORTVERSION=	1.4.2
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF
> 
>@@ -20,11 +19,13 @@ RUN_DEPENDS=	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios \
> USE_PERL5_RUN=	yes
> NO_BUILD=	yes
> 
>-PORTDOCS=	AUTHORS CHANGELOG INSTALL README README.map TODO
>+PORTDOCS=	AUTHORS CHANGELOG INSTALL README TODO
> NAGIOSWWWDIR?=	www/nagios
> CGIFILES=	show.cgi showgraph.cgi showhost.cgi showservice.cgi testcolor.cgi showgroup.cgi
> LIBFILES=	insert.pl
>-CFGFILES=	nagiosgraph.conf servdb.conf groupdb.conf hostdb.conf map
>+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 \
>+		rrdopts.conf
> 
> PLIST_SUB=	NAGIOSWWWDIR=${NAGIOSWWWDIR} PORTNAME=${PORTNAME}
> 
>@@ -59,7 +60,7 @@ do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/cgi/$i ${PREFIX}/${NAGIOSWWWDIR}/cgi-bin/${PORTNAME}/
> .endfor
> 
>-.for i in share/nagiosgraph.css share/nagiosgraph.js
>+.for i in share/nagiosgraph.css share/nagiosgraph.js share/nagiosgraph.ssi
> 	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${NAGIOSWWWDIR}/stylesheets
> .endfor
> 
>@@ -68,7 +69,7 @@ do-install:
> 
> .if !defined(NOPORTEXAMPLES)
> 	${MKDIR} ${EXAMPLESDIR}
>-.for i in utils/authz.pl utils/testentry.pl utils/upgrade.pl
>+.for i in utils/testentry.pl utils/upgrade.pl
> 	${INSTALL_SCRIPT} ${WRKSRC}/$i ${EXAMPLESDIR}/
> .endfor
> .endif
>diff --git a/net-mgmt/nagiosgraph/distinfo b/net-mgmt/nagiosgraph/distinfo
>index a4e5a20..8cc076d 100644
>--- a/net-mgmt/nagiosgraph/distinfo
>+++ b/net-mgmt/nagiosgraph/distinfo
>@@ -1,3 +1,3 @@
>-MD5 (nagiosgraph-1.4.1.tar.gz) = 4b9d7d81d1e6f3c1cabc2a76c6d8fd3e
>-SHA256 (nagiosgraph-1.4.1.tar.gz) = 078ec882758e3a56fb2705494e72f38ca9232658d1e7c3d7c3c7afd1f66c6b49
>-SIZE (nagiosgraph-1.4.1.tar.gz) = 79340
>+MD5 (nagiosgraph-1.4.2.tar.gz) = 085c01c1f2534d050b21815af1986282
>+SHA256 (nagiosgraph-1.4.2.tar.gz) = 798509946bbfc0d4f63fbf0d988dde4a40dcea9c5f935ee9c1ebd27158dff210
>+SIZE (nagiosgraph-1.4.2.tar.gz) = 108561
>diff --git a/net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in b/net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in
>index 5000852..e570386 100644
>--- a/net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in
>+++ b/net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in
>@@ -1,54 +1,72 @@
>---- etc/nagiosgraph.conf.orig	2010-03-05 10:24:25.000000000 +0000
>-+++ etc/nagiosgraph.conf	2010-03-05 10:44:53.000000000 +0000
>-@@ -8,41 +8,41 @@
>+--- etc/nagiosgraph.conf.orig	2010-04-27 08:14:25.000000000 +0000
>++++ etc/nagiosgraph.conf	2010-04-27 08:18:16.000000000 +0000
>+@@ -8,19 +8,19 @@
>  # Author:  (c) 2010 Matthew Wall
>  
>  # Location of nagiosgraph log file.  Debug output ends up here.
> -logfile = /var/log/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 nagios performance data log file. Comment out if not used.
> -perflog = /var/nagios/perfdata.log
> +perflog = /var/spool/nagios/perfdata.log
>  
>  # Directory to store rrd database files
>--rrddir = /var/nagiosgraph/rrd
>-+rrddir = /var/spool/nagios/rrd
>+ rrddir = /var/nagiosgraph/rrd
>  
>  # File containing regular expressions to identify service and perf data
> -mapfile = /etc/nagiosgraph/map
> +mapfile = %%PREFIX%%/etc/nagios/nagiosgraph/map
>  
>- # Location of showhost control file
>--hostdb = /etc/nagiosgraph/hostdb.conf
>-+hostdb = %%PREFIX%%/etc/nagios/nagiosgraph/hostdb.conf
>- 
>- # Location of showservice control file
>--servdb = /etc/nagiosgraph/servdb.conf
>-+servdb = %%PREFIX%%/etc/nagios/nagiosgraph/servdb.conf
>- 
>- # Location of showgroup control file
>--groupdb = /etc/nagiosgraph/groupdb.conf
>-+groupdb = %%PREFIX%%/etc/nagios/nagiosgraph/groupdb.conf
>- 
>- # File containing data sets that should be selected in service queries.
>- #datasetdb = /opt/nagiosgraph/etc/datasetdb.conf
>- 
>  # Nagiosgraph CGI URL.
>--nagiosgraphcgiurl = /nagiosgraph/cgi-bin
>-+nagiosgraphcgiurl = /nagios/cgi-bin/nagiosgraph
>- 
>- # Nagios CGI URL.  If the Nagiosgraph CGI scripts are in a directory other
>- # than the Nagios CGI directory, then specify the Nagios CGI URL here.
>+ 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
>  
>- # Stylesheet: URL to the nagiosgraph stylesheet.  Comment out if not used.
>+ # Stylesheet: URL to the nagiosgraph stylesheet.
> -stylesheet = /nagiosgraph/nagiosgraph.css
> +stylesheet = /nagios/stylesheets/nagiosgraph.css
>  
>+ # File containing labels for services and data (optional)
>+-#labelfile = /etc/nagiosgraph/labels.conf
>++#labelfile = %%PREFIX%%/etc/nagios/nagiosgraph/labels.conf
>+ 
>+ # Location of showhost control file (optional)
>+-#hostdb = /etc/nagiosgraph/hostdb.conf
>++#hostdb = %%PREFIX%%/etc/nagios/nagiosgraph/hostdb.conf
>+ 
>+ # Location of showservice control file (optional)
>+-#servdb = /etc/nagiosgraph/servdb.conf
>++#servdb = %%PREFIX%%/etc/nagios/nagiosgraph/servdb.conf
>+ 
>+ # Location of showgroup control file (required for showgroup.cgi)
>+-groupdb = /etc/nagiosgraph/groupdb.conf
>++groupdb = %%PREFIX%%/etc/nagios/nagiosgraph/groupdb.conf
>+ 
>+ # File containing data sets that should be selected in queries (optional)
>+-#datasetdb = /etc/nagiosgraph/datasetdb.conf
>++#datasetdb = %%PREFIX%%/etc/nagios/nagiosgraph/datasetdb.conf
>+ 
>+ # 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.
>+ #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
>+ # For access control via nagiosgraph, specify a single access control file.
>+ #authzmethod = nagiosgraph
>+-#authzfile = /etc/nagiosgraph/access.conf
>++#authzfile = %%PREFIX%%/etc/nagios/nagiosgraph/access.conf
>+ 
>  
>- # Debug can be enabled for a specific CGI script and/or specific hosts or
>+ # Logging can be enabled for a specific CGI script and/or specific hosts or
>diff --git a/net-mgmt/nagiosgraph/pkg-plist b/net-mgmt/nagiosgraph/pkg-plist
>index b31a740..7fa567b 100644
>--- a/net-mgmt/nagiosgraph/pkg-plist
>+++ b/net-mgmt/nagiosgraph/pkg-plist
>@@ -10,10 +10,31 @@ etc/nagios/%%PORTNAME%%/map.sample
> @unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf.sample %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf; fi
> etc/nagios/%%PORTNAME%%/nagiosgraph.conf.sample
> @exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf ] ; then cp -p %D/%F %B/nagiosgraph.conf; fi
>+@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/nagiosgraph_de.conf.sample %D/etc/nagios/%%PORTNAME%%/nagiosgraph_de.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_de.conf; fi
>+etc/nagios/%%PORTNAME%%/nagiosgraph_de.conf.sample
>+@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_de.conf ] ; then cp -p %D/%F %B/nagiosgraph_de.conf; fi
>+@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/nagiosgraph_es.conf.sample %D/etc/nagios/%%PORTNAME%%/nagiosgraph_es.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_es.conf; fi
>+etc/nagios/%%PORTNAME%%/nagiosgraph_es.conf.sample
>+@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_es.conf ] ; then cp -p %D/%F %B/nagiosgraph_es.conf; fi
>+@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/nagiosgraph_fr.conf.sample %D/etc/nagios/%%PORTNAME%%/nagiosgraph_fr.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_fr.conf; fi
>+etc/nagios/%%PORTNAME%%/nagiosgraph_fr.conf.sample
>+@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_fr.conf ] ; then cp -p %D/%F %B/nagiosgraph_fr.conf; fi
> etc/nagios/%%PORTNAME%%/ngshared.pm
> @unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/servdb.conf.sample %D/etc/nagios/%%PORTNAME%%/servdb.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/servdb.conf; fi
> etc/nagios/%%PORTNAME%%/servdb.conf.sample
> @exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/servdb.conf ] ; then cp -p %D/%F %B/servdb.conf; fi
>+@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/datasetdb.conf.sample %D/etc/nagios/%%PORTNAME%%/datasetdb.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/datasetdb.conf; fi
>+etc/nagios/%%PORTNAME%%/datasetdb.conf.sample
>+@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/datasetdb.conf ] ; then cp -p %D/%F %B/datasetdb.conf; fi
>+@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/access.conf.sample %D/etc/nagios/%%PORTNAME%%/access.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/access.conf; fi
>+etc/nagios/%%PORTNAME%%/access.conf.sample
>+@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/access.conf ] ; then cp -p %D/%F %B/access.conf; fi
>+@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/labels.conf.sample %D/etc/nagios/%%PORTNAME%%/labels.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/labels.conf; fi
>+etc/nagios/%%PORTNAME%%/labels.conf.sample
>+@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/labels.conf ] ; then cp -p %D/%F %B/labels.conf; fi
>+@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/rrdopts.conf.sample %D/etc/nagios/%%PORTNAME%%/rrdopts.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/rrdopts.conf; fi
>+etc/nagios/%%PORTNAME%%/rrdopts.conf.sample
>+@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%%/showgraph.cgi
>@@ -26,7 +47,7 @@ libexec/%%PORTNAME%%/insert.pl
> @unexec mv %D/%%NAGIOSWWWDIR%%%/images/action.gif.bak %D/%%NAGIOSWWWDIR%%/images/action.gif
> %%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.css
> %%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.js
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/authz.pl
>+%%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.ssi
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testentry.pl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade.pl
> @dirrm libexec/%%PORTNAME%%

Actions: View | Diff

Attachments on bug 146081: 105581