From nobody@FreeBSD.org  Fri Aug  6 10:51:44 2010
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 21DFC106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  6 Aug 2010 10:51:44 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 101508FC27
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  6 Aug 2010 10:51:44 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o76AphEW021100
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 6 Aug 2010 10:51:43 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o76Aphxj021096;
	Fri, 6 Aug 2010 10:51:43 GMT
	(envelope-from nobody)
Message-Id: <201008061051.o76Aphxj021096@www.freebsd.org>
Date: Fri, 6 Aug 2010 10:51:43 GMT
From: Ildar Hizbulin <hizel@vyborg.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MANTAINER UPDATE] net-mgmt/nagiosgraph to 1.4.3
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         149358
>Category:       ports
>Synopsis:       [MANTAINER UPDATE] net-mgmt/nagiosgraph to 1.4.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 06 11:00:10 UTC 2010
>Closed-Date:    Tue Aug 17 21:44:19 UTC 2010
>Last-Modified:  Tue Aug 17 21:44:19 UTC 2010
>Originator:     Ildar Hizbulin
>Release:        8.1-RELEASE
>Organization:
Ariadna-Link, ISP
>Environment:
FreeBSD o.vyborg.ru 8.1-RC2 FreeBSD 8.1-RC2 #2: Tue Jul 13 14:55:08 MSD 2010     root@server.vyborg.ru:/usr/obj/usr/src/sys/SERVER  amd64
>Description:
1.4.3 TBD

* new configuration options (see nagiosgraph.conf for details):
     stack
* added graph zooming.  zooming happens in-place (no separate window).
   drag to zoom.  right-click to revert the graph.
* added mouseovers that display time under the cursor.
* optionally specify heartbeat, step, and resolution per host/service.
* clean up insert.pl in preparation for additional processing modes and
   performance data sources.
* fix to javascript to display hosts and services when specified via CGI
   even if they do not appear in the host and service menus.
* fixed bug in handling of backslashes in service and database names.
* added support for rrdtool STACK.  stack can be specified using the 'stack'
   directive and/or using the 'lineformat' directive.  see nagiosgraph.conf
   for details and examples.

>How-To-Repeat:

>Fix:
diff -ruN net-mgmt/nagiosgraph/Makefile hizel/nagiosgraph/Makefile
--- net-mgmt/nagiosgraph/Makefile	2010-05-02 16:11:04.000000000 +0400
+++ hizel/nagiosgraph/Makefile	2010-08-06 14:42:55.000000000 +0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nagiosgraph
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
@@ -30,14 +30,14 @@
 PLIST_SUB=	NAGIOSWWWDIR=${NAGIOSWWWDIR} PORTNAME=${PORTNAME}
 
 post-patch:
-	${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/etc/nagiosgraph.conf
+	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/etc/nagiosgraph.conf
 .for i in ${CGIFILES}
-	${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
+	@${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
 		-e 's!/opt/nagiosgraph/etc!${PREFIX}/etc/nagios/nagiosgraph!g' ${WRKSRC}/cgi/$i
 .endfor
 
 .for i in ${LIBFILES}
-	${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
+	@${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
 		-e 's!/opt/nagiosgraph/etc!${PREFIX}/etc/nagios/nagiosgraph!g' ${WRKSRC}/lib/$i
 .endfor
 
diff -ruN net-mgmt/nagiosgraph/distinfo hizel/nagiosgraph/distinfo
--- net-mgmt/nagiosgraph/distinfo	2010-05-02 16:11:04.000000000 +0400
+++ hizel/nagiosgraph/distinfo	2010-08-06 14:42:55.000000000 +0400
@@ -1,3 +1,3 @@
-MD5 (nagiosgraph-1.4.2.tar.gz) = 085c01c1f2534d050b21815af1986282
-SHA256 (nagiosgraph-1.4.2.tar.gz) = 798509946bbfc0d4f63fbf0d988dde4a40dcea9c5f935ee9c1ebd27158dff210
-SIZE (nagiosgraph-1.4.2.tar.gz) = 108561
+MD5 (nagiosgraph-1.4.3.tar.gz) = e00ac92d9d51a7605e08617d19b64080
+SHA256 (nagiosgraph-1.4.3.tar.gz) = f5c75abc782020d150c99417316dc838b640480be6b481cdd791b528954cd74f
+SIZE (nagiosgraph-1.4.3.tar.gz) = 113534
diff -ruN net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in hizel/nagiosgraph/files/patch-etc-nagiosgraph.conf.in
--- net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in	2010-05-02 16:11:05.000000000 +0400
+++ hizel/nagiosgraph/files/patch-etc-nagiosgraph.conf.in	2010-08-06 14:42:55.000000000 +0400
@@ -1,5 +1,5 @@
---- etc/nagiosgraph.conf.orig	2010-04-27 08:14:25.000000000 +0000
-+++ etc/nagiosgraph.conf	2010-04-27 08:18:16.000000000 +0000
+--- etc/nagiosgraph.conf.orig	2010-08-06 13:10:56.000000000 +0400
++++ etc/nagiosgraph.conf	2010-08-06 13:16:12.000000000 +0400
 @@ -8,19 +8,19 @@
  # Author:  (c) 2010 Matthew Wall
  
@@ -15,7 +15,8 @@
 +perflog = /var/spool/nagios/perfdata.log
  
  # Directory to store rrd database files
- rrddir = /var/nagiosgraph/rrd
+-rrddir = /var/nagiosgraph/rrd
++rrddir = /var/spool/nagios/rrd
  
  # File containing regular expressions to identify service and perf data
 -mapfile = /etc/nagiosgraph/map
@@ -47,8 +48,7 @@
 +#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
+ groupdb = /etc/nagiosgraph/groupdb.conf
  
  # File containing data sets that should be selected in queries (optional)
 -#datasetdb = /etc/nagiosgraph/datasetdb.conf

>Release-Note:
>Audit-Trail:

From: Ildar Hizbulin <hizel@vyborg.ru>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/149358: [MANTAINER UPDATE] net-mgmt/nagiosgraph to 1.4.3
Date: Wed, 11 Aug 2010 16:16:08 +0400

 it's me, ok :)
 ---
 e-mail: hizel@vyborg.ru
 jid: hizel@vyborg.ru, hizel@jabber.ru
State-Changed-From-To: open->feedback 
State-Changed-By: ohauer 
State-Changed-When: Mon Aug 16 13:41:46 UTC 2010 
State-Changed-Why:  
I'll take it 

To maintainer: 
Is there a reason to move the groupdb file from  
%%PREFIX%%/etc/ to /etc ? 

It also looks like the path for the RRDs has changed. 
Are the old RRD files no longer compatible? Or should 
they moved to the new location? 


http://www.freebsd.org/cgi/query-pr.cgi?pr=149358 
Responsible-Changed-From-To: freebsd-ports-bugs->ohauer 
Responsible-Changed-By: ohauer 
Responsible-Changed-When: Mon Aug 16 13:48:12 UTC 2010 
Responsible-Changed-Why:  
I'll take it 

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

From: Ildar Hizbulin <hizel@vyborg.ru>
To: ohauer@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org,
        bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/149358: [MANTAINER UPDATE] net-mgmt/nagiosgraph to 1.4.3
Date: Tue, 17 Aug 2010 09:26:07 +0400

 >  Is there a reason to move the groupdb file from 
 >  %%PREFIX%%/etc/ to /etc ?
 oops, is a mistake, fixed now
 > 
 > It also looks like the path for the RRDs has changed.
 > Are the old RRD files no longer compatible? Or should
 > they moved to the new location?
 
 RRDs compatible, is a mistake in the previous PR :-[
 
 but, tuning nagios is not trivial, and users have their own settings
 and port does not create this directory
 
 diff -ruN net-mgmt/nagiosgraph/Makefile hizel/nagiosgraph/Makefile
 --- net-mgmt/nagiosgraph/Makefile	2010-05-02 16:11:04.000000000 +0400
 +++ hizel/nagiosgraph/Makefile	2010-08-06 14:42:55.000000000 +0400
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	nagiosgraph
 -PORTVERSION=	1.4.2
 +PORTVERSION=	1.4.3
  CATEGORIES=	net-mgmt
  MASTER_SITES=	SF
  
 @@ -30,14 +30,14 @@
  PLIST_SUB=	NAGIOSWWWDIR=${NAGIOSWWWDIR} PORTNAME=${PORTNAME}
  
  post-patch:
 -	${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/etc/nagiosgraph.conf
 +	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/etc/nagiosgraph.conf
  .for i in ${CGIFILES}
 -	${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
 +	@${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
  		-e 's!/opt/nagiosgraph/etc!${PREFIX}/etc/nagios/nagiosgraph!g' ${WRKSRC}/cgi/$i
  .endfor
  
  .for i in ${LIBFILES}
 -	${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
 +	@${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
  		-e 's!/opt/nagiosgraph/etc!${PREFIX}/etc/nagios/nagiosgraph!g' ${WRKSRC}/lib/$i
  .endfor
  
 diff -ruN net-mgmt/nagiosgraph/distinfo hizel/nagiosgraph/distinfo
 --- net-mgmt/nagiosgraph/distinfo	2010-05-02 16:11:04.000000000 +0400
 +++ hizel/nagiosgraph/distinfo	2010-08-06 14:42:55.000000000 +0400
 @@ -1,3 +1,3 @@
 -MD5 (nagiosgraph-1.4.2.tar.gz) = 085c01c1f2534d050b21815af1986282
 -SHA256 (nagiosgraph-1.4.2.tar.gz) = 798509946bbfc0d4f63fbf0d988dde4a40dcea9c5f935ee9c1ebd27158dff210
 -SIZE (nagiosgraph-1.4.2.tar.gz) = 108561
 +MD5 (nagiosgraph-1.4.3.tar.gz) = e00ac92d9d51a7605e08617d19b64080
 +SHA256 (nagiosgraph-1.4.3.tar.gz) = f5c75abc782020d150c99417316dc838b640480be6b481cdd791b528954cd74f
 +SIZE (nagiosgraph-1.4.3.tar.gz) = 113534
 diff -ruN net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in hizel/nagiosgraph/files/patch-etc-nagiosgraph.conf.in
 --- net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in	2010-05-02 16:11:05.000000000 +0400
 +++ hizel/nagiosgraph/files/patch-etc-nagiosgraph.conf.in	2010-08-16 20:01:24.000000000 +0400
 @@ -1,5 +1,5 @@
 ---- etc/nagiosgraph.conf.orig	2010-04-27 08:14:25.000000000 +0000
 -+++ etc/nagiosgraph.conf	2010-04-27 08:18:16.000000000 +0000
 +--- nagiosgraph.conf.orig	2010-08-16 18:02:22.000000000 +0400
 ++++ nagiosgraph.conf	2010-08-16 18:01:55.000000000 +0400
  @@ -8,19 +8,19 @@
   # Author:  (c) 2010 Matthew Wall
   
 @@ -15,7 +15,8 @@
  +perflog = /var/spool/nagios/perfdata.log
   
   # Directory to store rrd database files
 - rrddir = /var/nagiosgraph/rrd
 +-rrddir = /var/nagiosgraph/rrd
 ++rrddir = /var/spool/nagios/rrd
   
   # File containing regular expressions to identify service and perf data
  -mapfile = /etc/nagiosgraph/map

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/149358: commit references a PR
Date: Tue, 17 Aug 2010 21:33:07 +0000 (UTC)

 ohauer      2010-08-17 21:32:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/nagiosgraph Makefile distinfo 
   Added files:
     net-mgmt/nagiosgraph/files patch-etc__nagiosgraph.conf.in 
   Removed files:
     net-mgmt/nagiosgraph/files patch-etc-nagiosgraph.conf.in 
   Log:
    - update to version 1.4.3
   
   * new configuration options (see nagiosgraph.conf for details): stack
   * added graph zooming. zooming happens in-place (no separate window).
     drag to zoom. right-click to revert the graph.
   * added mouseovers that display time under the cursor.
   * optionally specify heartbeat, step, and resolution per host/service.
   * clean up insert.pl in preparation for additional processing modes and
     performance data sources.
   * fix to javascript to display hosts and services when specified via CGI
     even if they do not appear in the host and service menus.
   * fixed bug in handling of backslashes in service and database names.
   * added support for rrdtool STACK. stack can be specified using the 'stack'
     directive and/or using the 'lineformat' directive. see nagiosgraph.conf
     for details and examples.
   
   PR:             149358
   Submitted by:   Ildar Hizbulin <hizel _at_ vyborg.ru> (maintainer)
   Approved by:    glarkin (mentor)
   
   Revision  Changes    Path
   1.16      +11 -8     ports/net-mgmt/nagiosgraph/Makefile
   1.6       +3 -3      ports/net-mgmt/nagiosgraph/distinfo
   1.3       +0 -72     ports/net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in (dead)
   1.1       +73 -0     ports/net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in (new)
 _______________________________________________
 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"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: ohauer 
State-Changed-When: Tue Aug 17 21:43:12 UTC 2010 
State-Changed-Why:  
committed with minor changes 

Approved by: glarkin (mentor) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149358 
>Unformatted:
