ports/128306: [maintainer-update] net-mgmt/nagios: Update to 3.0.4

[Jarrod Sayers]

>Number:         128306
>Category:       ports
>Synopsis:       [maintainer-update] net-mgmt/nagios: Update to 3.0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 23 00:40:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Jarrod Sayers
>Release:        FreeBSD 7.0-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD manhattan.netleader.com.au 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #3: Sat Sep 6 22:13:15 CST 2008 root at manhattan.netleader.com.au:/usr/obj/usr/src/sys/MANHATTAN i386
>Description:
Update to Nagios 3.0.4.

Included are updated suggestions from ports/128226.  The correction to the ping
command has been extended into the online documentation and the -U option
removed as it's not supported.  Also, the default for time_change_threshold is
set to that in include/nagios.h.

Modified files:
- ports/net-mgmt/nagios/Makefile
- ports/net-mgmt/nagios/distinfo
- ports/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in

Added files:
- ports/net-mgmt/nagios/files/patch-html-docs-configcgi.html
- ports/net-mgmt/nagios/files/patch-sample-config-cgi.cfg.in
>How-To-Repeat:
>Fix:
Downloadable diff from:
http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-3.0.4.diff

--- net-mgmt-nagios-3.0.4.diff begins here ---
diff -ruN ports/net-mgmt/nagios.orig/Makefile ports/net-mgmt/nagios/Makefile
--- ports/net-mgmt/nagios.orig/Makefile	2008-09-03 10:00:55.000000000 +0930
+++ ports/net-mgmt/nagios/Makefile	2008-10-23 10:12:48.000000000 +1030
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nagios
-DISTVERSION=	3.0.3
+DISTVERSION=	3.0.4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
diff -ruN ports/net-mgmt/nagios.orig/distinfo ports/net-mgmt/nagios/distinfo
--- ports/net-mgmt/nagios.orig/distinfo	2008-09-03 10:00:55.000000000 +0930
+++ ports/net-mgmt/nagios/distinfo	2008-10-23 10:12:55.000000000 +1030
@@ -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
diff -ruN ports/net-mgmt/nagios.orig/files/patch-html-docs-configcgi.html ports/net-mgmt/nagios/files/patch-html-docs-configcgi.html
--- ports/net-mgmt/nagios.orig/files/patch-html-docs-configcgi.html	1970-01-01 09:30:00.000000000 +0930
+++ ports/net-mgmt/nagios/files/patch-html-docs-configcgi.html	2008-10-23 10:33:15.000000000 +1030
@@ -0,0 +1,11 @@
+--- html/docs/configcgi.html.orig	2007-08-31 08:05:04.000000000 +0930
++++ html/docs/configcgi.html	2008-10-23 10:32:37.000000000 +1030
+@@ -616,7 +616,7 @@
+ </tr>
+ <tr>
+ <td valign=top>Example:</td>
+-<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td>
++<td><font color="red"><strong>ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$</strong></font></td>
+ </tr>
+ </table>
+ 
diff -ruN ports/net-mgmt/nagios.orig/files/patch-sample-config-cgi.cfg.in ports/net-mgmt/nagios/files/patch-sample-config-cgi.cfg.in
--- ports/net-mgmt/nagios.orig/files/patch-sample-config-cgi.cfg.in	1970-01-01 09:30:00.000000000 +0930
+++ ports/net-mgmt/nagios/files/patch-sample-config-cgi.cfg.in	2008-10-23 10:33:40.000000000 +1030
@@ -0,0 +1,11 @@
+--- sample-config/cgi.cfg.in.orig	2007-10-08 05:12:52.000000000 +0930
++++ sample-config/cgi.cfg.in	2008-10-23 10:31:31.000000000 +1030
+@@ -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 -c 5 $HOSTADDRESS$
+ 
+ 
+ 
diff -ruN ports/net-mgmt/nagios.orig/files/patch-sample-config-nagios.cfg.in ports/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in
--- ports/net-mgmt/nagios.orig/files/patch-sample-config-nagios.cfg.in	2008-09-03 10:00:55.000000000 +0930
+++ ports/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in	2008-10-23 10:36:09.000000000 +1030
@@ -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 09:10:08.000000000 +1030
++++ sample-config/nagios.cfg.in	2008-10-23 10:35:10.000000000 +1030
 @@ -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=900
+ 
+ 
+ 
--- net-mgmt-nagios-3.0.4.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: