ports/121866: [maintainer-update] net-mgmt/nagios: Update to 2.11

[Jarrod Sayers]

>Number:         121866
>Category:       ports
>Synopsis:       [maintainer-update] net-mgmt/nagios: Update to 2.11
>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:   Wed Mar 19 13:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: