From nobody@FreeBSD.org  Sun Oct 19 16:31:11 2008
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 883011065693
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 19 Oct 2008 16:31:11 +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 76EAB8FC1B
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 19 Oct 2008 16:31:11 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id m9JGVBND099065
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 19 Oct 2008 16:31:11 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id m9JGVBH5099064;
	Sun, 19 Oct 2008 16:31:11 GMT
	(envelope-from nobody)
Message-Id: <200810191631.m9JGVBH5099064@www.freebsd.org>
Date: Sun, 19 Oct 2008 16:31:11 GMT
From: olli hauer <ohauer@gmx.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] net-mgmt/nagios update to nagios-3.0.4
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: jarrod@netleader.com.au

>Number:         128226
>Category:       ports
>Synopsis:       [patch] net-mgmt/nagios update to nagios-3.0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 19 16:40:01 UTC 2008
>Closed-Date:    Fri Oct 24 14:22:33 UTC 2008
>Last-Modified:  Fri Oct 24 14:22:33 UTC 2008
>Originator:     olli hauer
>Release:        FreeBSD 7.0-RELEASE-p5
>Organization:
>Environment:
>Description:
update nagios to nagios-3.0.4

add patch for cgi-cfg.in

extend files/patch-sample-config-nagios.cfg.in
(comment out the new paramter time_change_threshold in nagios.cfg)
see http://article.gmane.org/gmane.network.nagios.devel/5637


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig       2008-09-03 02:30:55.000000000 +0200
+++ Makefile    2008-10-19 14:23:16.000000000 +0200
@@ -6,7 +6,7 @@
 #

 PORTNAME=      nagios
-DISTVERSION=   3.0.3
+DISTVERSION=   3.0.4
 CATEGORIES=    net-mgmt
 MASTER_SITES=  SF

--- distinfo.orig       2008-09-03 02:30:55.000000000 +0200
+++ distinfo    2008-10-19 14:29:53.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (nagios-3.0.3.tar.gz) = 151df7bf19b696f7498410fb76fb7caf
-SHA256 (nagios-3.0.3.tar.gz) = 65e96d7da182b40d4f9a8c63da1ef861fdfb9502be36a983f8a2e803f711d53c
-SIZE (nagios-3.0.3.tar.gz) = 2759396
+MD5 (nagios-3.0.4.tar.gz) = c14f8099488014b1f0e37699448d0a5c
+SHA256 (nagios-3.0.4.tar.gz) = 5b4531322530c5866875da41944ee911869fe55c68b2020ecf6d9b89e9299298
+SIZE (nagios-3.0.4.tar.gz) = 2760530
--- files/patch-sample-config-nagios.cfg.in.orig        2008-09-03 02:30:55.000000000 +0200
+++ files/patch-sample-config-nagios.cfg.in     2008-10-19 14:27:25.000000000 +0200
@@ -1,5 +1,5 @@
---- sample-config/nagios.cfg.in.orig   Tue Jun 19 02:26:33 2007
-+++ sample-config/nagios.cfg.in        Fri Jul 20 13:45:09 2007
+--- sample-config/nagios.cfg.in.orig   2008-10-16 00:40:08.000000000 +0200
++++ sample-config/nagios.cfg.in        2008-10-19 14:26:22.000000000 +0200
 @@ -32,7 +32,7 @@
  cfg_file=@sysconfdir@/objects/timeperiods.cfg
  cfg_file=@sysconfdir@/objects/templates.cfg
@@ -9,3 +9,12 @@
  cfg_file=@sysconfdir@/objects/localhost.cfg

  # Definitions for monitoring a Windows machine
+@@ -548,7 +548,7 @@
+ # These options determine when Nagios will react to detected changes
+ # in system time (either forward or backwards).
+
+-time_change_threshold=
++#time_change_threshold=
+
+
+
--- files/patch-sample-config-cgi.cfg.in.orig   2008-10-19 18:26:30.000000000 +0200
+++ files/patch-sample-config-cgi.cfg.in        2008-10-19 18:23:36.000000000 +0200
@@ -0,0 +1,11 @@
+--- sample-config/cgi.cfg.in.orig      2007-10-07 21:42:52.000000000 +0200
++++ sample-config/cgi.cfg.in   2008-10-19 18:22:11.000000000 +0200
+@@ -229,7 +229,7 @@
+ # OS and distribution, so you may have to tweak this to
+ # work on your system.
+
+-ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$
++ping_syntax=/sbin/ping -n -U -c 5 $HOSTADDRESS$
+
+
+


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Oct 19 16:40:15 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128226 
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sun Oct 19 16:45:18 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jarrod@netleader.com.au
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/128226: [patch] net-mgmt/nagios update to nagios-3.0.4
Date: Sun, 19 Oct 2008 16:40:14 UT

 Maintainer of net-mgmt/nagios,
 
 Please note that PR ports/128226 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/128226
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Oct 24 14:22:31 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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