From jarrod@wallace.netleader.com.au  Tue Jan 17 01:17:09 2006
Return-Path: <jarrod@wallace.netleader.com.au>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9879016A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 Jan 2006 01:17:09 +0000 (GMT)
	(envelope-from jarrod@wallace.netleader.com.au)
Received: from rockefeller.netleader.com.au (rockefeller.netleader.com.au [150.101.48.30])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C9ED343D45
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 Jan 2006 01:17:08 +0000 (GMT)
	(envelope-from jarrod@wallace.netleader.com.au)
Received: from wallace.netleader.com.au (wallace.netleader.com.au [150.101.100.174])
	by rockefeller.netleader.com.au (8.13.5/8.13.5) with ESMTP id k0H1H2Nh025476;
	Tue, 17 Jan 2006 11:47:03 +1030 (CST)
	(envelope-from jarrod@wallace.netleader.com.au)
Received: (from jarrod@localhost)
	by wallace.netleader.com.au (8.13.5/8.13.5/Submit) id k0H1GtgO052429;
	Tue, 17 Jan 2006 11:46:55 +1030 (CST)
	(envelope-from jarrod)
Message-Id: <200601170116.k0H1GtgO052429@wallace.netleader.com.au>
Date: Tue, 17 Jan 2006 11:46:55 +1030 (CST)
From: Jarrod Sayers <jarrod@netleader.com.au>
Reply-To: Jarrod Sayers <jarrod@netleader.com.au>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer-update] net-mgmt/nagios: Update to 2.0.r2, inc. fix for issue spotted by pointyhat
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         91892
>Category:       ports
>Synopsis:       [maintainer-update] net-mgmt/nagios: Update to 2.0.r2, inc. fix for issue spotted by pointyhat
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    tdb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 17 01:20:03 GMT 2006
>Closed-Date:    Tue Jan 17 10:40:06 GMT 2006
>Last-Modified:  Tue Jan 17 10:40:06 GMT 2006
>Originator:     Jarrod Sayers
>Release:        FreeBSD 4.11-RELEASE-p14 i386
>Organization:
>Environment:
System: FreeBSD wallace.netleader.com.au 4.11-RELEASE-p14 FreeBSD 4.11-RELEASE-p14 #17: Sun Jan 15 12:17:16 CST 2006 root@wallace.netleader.com.au:/usr/obj/usr/src/sys/WALLACE i386
>Description:
Update to nagios-2.0.r2 includes:
- Added SHA256 checksum to distinfo
- Added reload argument to nagios.sh script
- PERL_SYS_INIT3 fix now committed to Nagios CVS, patch redundant
- Removed duplicated etc/rc.d/nagios.sh from pkg-plist [1]

Files to be removed:
- ports/net-mgmt/nagios/files/patch-base-utils.c

Spotted by:	pointyhat (via kris@) [1]
>How-To-Repeat:
>Fix:
Diff obtainable from:
http://www.netleader.com.au/~jarrod/freebsd/net-mgmt-nagios-2.0.r2.diff

--- net-mgmt-nagios-2.0.r2.diff begins here ---
--- ports/net-mgmt/nagios/Makefile.orig	Mon Jan  9 11:24:01 2006
+++ ports/net-mgmt/nagios/Makefile	Tue Jan 17 11:01:43 2006
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	2.0.r1
-DISTVERSION=	2.0rc1
+PORTVERSION=	2.0.r2
+DISTVERSION=	2.0rc2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
--- ports/net-mgmt/nagios/distinfo.orig	Mon Jan  9 11:24:01 2006
+++ ports/net-mgmt/nagios/distinfo	Tue Jan 17 11:03:46 2006
@@ -1,2 +1,3 @@
-MD5 (nagios-2.0rc1.tar.gz) = 5807fc2f1cf5355a2eadc6f4d51f6711
-SIZE (nagios-2.0rc1.tar.gz) = 1731687
+MD5 (nagios-2.0rc2.tar.gz) = 373124639093919dc8858a243d760f84
+SHA256 (nagios-2.0rc2.tar.gz) = 1f771155606910a13bb84c1e18d22df99579e48ee26e1301fd08ac4645b93b16
+SIZE (nagios-2.0rc2.tar.gz) = 1732073
--- ports/net-mgmt/nagios/files/nagios.sh.in.orig	Mon Jan  9 11:24:01 2006
+++ ports/net-mgmt/nagios/files/nagios.sh.in	Tue Jan 17 11:23:19 2006
@@ -18,12 +18,14 @@
 
 command="%%PREFIX%%/bin/nagios"
 command_args="-d"
+extra_commands="reload"
 pidfile="%%NAGIOSDIR%%/nagios.lock"
 nagios_user="%%NAGIOSUSER%%"
 
 start_precmd="start_precmd"
 stop_postcmd="stop_postcmd"
 restart_precmd="nagios_checkconfig"
+sig_reload=HUP
 
 [ -z "${nagios_enable}" ]       && nagios_enable="NO"
 [ -z "${nagios_flags}" ]        && nagios_flags=""
--- ports/net-mgmt/nagios/pkg-plist.orig	Mon Jan  9 11:24:01 2006
+++ ports/net-mgmt/nagios/pkg-plist	Tue Jan 17 11:01:54 2006
@@ -14,7 +14,6 @@
 etc/nagios/misccommands.cfg-sample
 etc/nagios/nagios.cfg-sample
 etc/nagios/resource.cfg-sample
-etc/rc.d/nagios.sh
 %%NAGIOSWWWDIR%%/cgi-bin/avail.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/config.cgi
--- net-mgmt-nagios-2.0.r2.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->tdb 
Responsible-Changed-By: tdb 
Responsible-Changed-When: Tue Jan 17 09:41:23 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91892 
State-Changed-From-To: open->closed 
State-Changed-By: tdb 
State-Changed-When: Tue Jan 17 10:40:04 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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