From jarrod@wallace.netleader.com.au  Wed Mar 19 13:41:34 2008
Return-Path: <jarrod@wallace.netleader.com.au>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E2146106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Mar 2008 13:41:34 +0000 (UTC)
	(envelope-from jarrod@wallace.netleader.com.au)
Received: from wallace.netleader.com.au (wallace.netleader.com.au [203.122.246.247])
	by mx1.freebsd.org (Postfix) with ESMTP id 43E788FC28
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Mar 2008 13:41:33 +0000 (UTC)
	(envelope-from jarrod@wallace.netleader.com.au)
Received: from wallace.netleader.com.au (localhost [127.0.0.1])
	by wallace.netleader.com.au (8.14.2/8.14.2) with ESMTP id m2JDfNrR093011
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 20 Mar 2008 00:11:24 +1030 (CST)
	(envelope-from jarrod@wallace.netleader.com.au)
Received: (from jarrod@localhost)
	by wallace.netleader.com.au (8.14.2/8.14.2/Submit) id m2JDfNIE093010;
	Thu, 20 Mar 2008 00:11:23 +1030 (CST)
	(envelope-from jarrod)
Message-Id: <200803191341.m2JDfNIE093010@wallace.netleader.com.au>
Date: Thu, 20 Mar 2008 00:11:23 +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.11
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         121866
>Category:       ports
>Synopsis:       [maintainer-update] net-mgmt/nagios: Update to 2.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 19 13:50:00 UTC 2008
>Closed-Date:    Sat Mar 22 12:08:06 UTC 2008
>Last-Modified:  Sat Mar 22 12:10:04 UTC 2008
>Originator:     Jarrod Sayers
>Release:        FreeBSD 6.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD wallace.netleader.com.au 6.3-RELEASE FreeBSD 6.3-RELEASE #108: Sun Jan 20 11:31:48 CST 2008 root@wallace.netleader.com.au:/usr/obj/usr/src/sys/WALLACE i386
>Description:
Update to 2.11:

* Better error logging when failing to rename/move files
* Possible fix for Unicode html encoding errors in CGIs
* Fix for encoding HTML characters in CGIs
* Fix for a potential cross site scripting vulnerability in the CGIs
* Fix for a bug with processing service dependency templates with null master
  host(group) names
* Fix for a possible memory leak in situations where overflow occurs in check
  result buffer
* Fix for segfault in event broker module code
* Fix for flap detection information not be retained across restarts
* Patch to allow non-ASCII characters in notifications, etc.

Included in this diff is a patch to resolve ports/120320.
>How-To-Repeat:
>Fix:
Downloadable diff from:
http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-2.11.diff

--- net-mgmt-nagios-2.11.diff begins here ---
diff -ruN ports/net-mgmt/nagios.orig/Makefile ports/net-mgmt/nagios/Makefile
--- ports/net-mgmt/nagios.orig/Makefile	2008-02-05 06:27:24.000000000 +1030
+++ ports/net-mgmt/nagios/Makefile	2008-03-19 23:24:32.000000000 +1030
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	2.10
-PORTREVISION=	1
+PORTVERSION=	2.11
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
diff -ruN ports/net-mgmt/nagios.orig/distinfo ports/net-mgmt/nagios/distinfo
--- ports/net-mgmt/nagios.orig/distinfo	2007-12-13 00:27:52.000000000 +1030
+++ ports/net-mgmt/nagios/distinfo	2008-03-19 23:24:36.000000000 +1030
@@ -1,3 +1,3 @@
-MD5 (nagios-2.10.tar.gz) = 8c3a29e138f2ff8c8abbd3dd8a40c4b6
-SHA256 (nagios-2.10.tar.gz) = d3e916bd11619259246e12a45aac8761e7318b54ed701472e8e49a03d939e5c8
-SIZE (nagios-2.10.tar.gz) = 1740558
+MD5 (nagios-2.11.tar.gz) = 058c1f4829de748b42da1b584cccc941
+SHA256 (nagios-2.11.tar.gz) = 0c4425401e0b9a8ba1d2e689fc8dd9a5016ee35ac5c66285d02eca393dd6cda5
+SIZE (nagios-2.11.tar.gz) = 1741962
diff -ruN ports/net-mgmt/nagios.orig/files/patch-configure.in ports/net-mgmt/nagios/files/patch-configure.in
--- ports/net-mgmt/nagios.orig/files/patch-configure.in	2008-02-05 06:27:24.000000000 +1030
+++ ports/net-mgmt/nagios/files/patch-configure.in	2008-03-19 23:59:20.000000000 +1030
@@ -1,5 +1,5 @@
---- configure.in.orig	2007-10-22 00:09:51.000000000 +0930
-+++ configure.in	2008-01-30 23:25:03.000000000 +1030
+--- configure.in.orig	2008-03-13 00:31:04.000000000 +1030
++++ configure.in	2008-03-19 23:58:49.000000000 +1030
 @@ -6,7 +6,6 @@
  
  AC_INIT(base/nagios.c)
@@ -7,7 +7,7 @@
 -AC_PREFIX_DEFAULT(/usr/local/nagios)
  
  PKG_NAME=nagios
- PKG_VERSION="2.10"
+ PKG_VERSION="2.11"
 @@ -60,7 +59,15 @@
  dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
  THREADLIBS=""
@@ -41,6 +41,15 @@
  AC_SUBST(INSTALL_OPTS)
  
  AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
+@@ -170,7 +178,7 @@
+ 	AC_PATH_PROG(MAIL_PROG,mail) 
+ fi 
+ dnl Fix for systems that don't (yet) have mail/mailx installed...
+-if test x$MAIL_PROG=x; then
++if test x$MAIL_PROG = x; then
+ 	MAIL_PROG="/bin/mail"
+ fi
+ AC_SUBST(MAIL_PROG)
 @@ -599,6 +607,9 @@
  
  	AC_DEFINE_UNQUOTED(EMBEDDEDPERL)
--- net-mgmt-nagios-2.11.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Sat Mar 22 05:05:04 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121866 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Sat Mar 22 12:08:04 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/121866: commit references a PR
Date: Sat, 22 Mar 2008 12:03:32 +0000 (UTC)

 rafan       2008-03-22 12:03:26 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/nagios      Makefile distinfo 
     net-mgmt/nagios/files patch-configure.in 
   Log:
   - Update to 2.11 [1]
   - Fix wrong mail program path in sample config file [2]
   
   PR:             ports/121866 [1], ports/120320 [2]
   Submitted by:   Jarrod Sayers <jarrod at netleader.com.au> (maintainer) [1]
   
   Revision  Changes    Path
   1.68      +1 -2      ports/net-mgmt/nagios/Makefile
   1.38      +3 -3      ports/net-mgmt/nagios/distinfo
   1.3       +12 -3     ports/net-mgmt/nagios/files/patch-configure.in
 _______________________________________________
 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:
