From nobody@FreeBSD.org  Fri Feb  4 10:50:36 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 065F8106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  4 Feb 2011 10:50:36 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id E94078FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  4 Feb 2011 10:50:35 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p14AoZgD062395
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 4 Feb 2011 10:50:35 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p14AoZtA062394;
	Fri, 4 Feb 2011 10:50:35 GMT
	(envelope-from nobody)
Message-Id: <201102041050.p14AoZtA062394@red.freebsd.org>
Date: Fri, 4 Feb 2011 10:50:35 GMT
From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [UPDATE] net-mgmt/nagiosgraph: update to 1.4.4 [feature safe]
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: hizel@vyborg.ru

>Number:         154507
>Category:       ports
>Synopsis:       [UPDATE] net-mgmt/nagiosgraph: update to 1.4.4 [feature safe]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 04 11:00:16 UTC 2011
>Closed-Date:    Sat Feb 05 10:59:31 UTC 2011
>Last-Modified:  Sat Feb  5 11:00:50 UTC 2011
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Feb 4 11:00:25 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154507 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: hizel@vyborg.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/154507: [UPDATE] net-mgmt/nagiosgraph: update to 1.4.4 [feature safe]
Date: Fri, 4 Feb 2011 11:00:21 UT

 Maintainer of net-mgmt/nagiosgraph,
 
 Please note that PR ports/154507 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/154507
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Fri Feb 4 16:13:46 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154507 

From: Ildar Hizbulin <hizel@vyborg.ru>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/154507: [UPDATE] net-mgmt/nagiosgraph: update to 1.4.4
 [feature safe]
Date: Fri, 04 Feb 2011 23:10:30 +0300

 I approve. Thanks!
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Feb 5 10:59:29 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154507 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/154507: commit references a PR
Date: Sat,  5 Feb 2011 10:59:23 +0000 (UTC)

 miwi        2011-02-05 10:59:19 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/nagiosgraph Makefile distinfo pkg-plist 
     net-mgmt/nagiosgraph/files patch-etc__nagiosgraph.conf.in 
   Log:
   - Update to 1.4.4.
   
   PR:             154507
   Submitted by:   Ruslan Mahmatkhanov <cvs-src@yandex.ru>
   Approved by:    maintainer
   Feature safe:   yes
   
   Revision  Changes    Path
   1.17      +4 -3      ports/net-mgmt/nagiosgraph/Makefile
   1.7       +2 -3      ports/net-mgmt/nagiosgraph/distinfo
   1.2       +17 -20    ports/net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in
   1.5       +1 -0      ports/net-mgmt/nagiosgraph/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
