Upgrade nagios to 2.12. Changes are mostly bugfixes since this is the legacy

branch.

Changes since old version 2.5:
 * Fix for unscheduled triggered downtime entries.
 * Fix for embedded audio in tac and status CGIs.
 * Fixed bug in nagiostats utility when reporting host/service check latency.
 * Misc code cleanups for compiler warnings.
 * Fixed error when reading empty (zero byte) config files.
 * Default is now to check for orphaned service checks.
 * Fixed bug with non-standard CGI config file location in status data.
 * Fixed bugs and simplified examples in sample config files.
 * Fix for leading whitespace before comments in object config files.
 * Fix for scheduling immediate service check through WAP interface.
 * Fix for segfault during expiration or deletion of scheduled downtime.
 * Minor documentation updates.
 * Minor patches to availability and status CGIs.
 * Updated nagiostats with new MRTG vars for tracking buffer usage.
 * p1.pl now sets environment var (NAGIOS_PLUGIN) to indicate patch of
   plugin being executed.
 * Added error messages for passive service checks that don't correspond to
   a defined service.
 * Fix for handling signals under NPTL.
 * Fix for missing check timeout in event broker calls.
 * Possible segfault fix during restarts when daemon was performing host
   checks.
 * Bug fix for bad date format submission in command CGI.
 * Bug fix for using servicegroups in service dependency definitions.
 * Bug fix for calculating notification interval with service escalations.
 * Program version is now displayed in CGIs.
 * Fix for keeping service checks in the event queue when active service
   checks are disabled globally.
 * Bug fix with attempting to access an uninitalized mutex if external
   commands are disabled.
 * Fix for incorrect latency calculation for passive service checks.
 * Fix for a segfault when processing passive host check results with empty
   output/perfdata.
 * Minor bug fixes in CGIs.
 * Fix for not logging passive host check results.
 * Minor fix for notification timeout log messages.
 * Fix for SIGTERMs being seen as SIGEXITs, non-logging of SIGTERMs/shutdowns.
 * Patch to allow non-ASCII characters in notifications, etc.
 * Fix for flap detection information not be retained across restarts.
 * Fix for cfg_dir directive not working on Solaris.
 * Fix for segfault in event broker module code.
 * Fix for a possible memory leak in situations where overflow occurs in
   check result buffer.
 * Fix for a bug with processing service dependency templates with null
   master host(group) names.
 * Better error logging when failing to rename/move files.
 * Minor bug fixes in CGIs to ensure extra host/servicegroup url strings
   are terminated properly.
 * Patches for possible XSS vulnerability in CGIs (CVE-2007-5803).

Please note that this now needs PTHREAD_DIAGASSERT=A to run properly under
NetBSD-4.0 without the fixsa patch.

1 files changed, 4 insertions, 5 deletions

diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 6319f6a3449..b4fba8b560e 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/06/20 15:28:11 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2008/06/21 14:35:49 tonnerre Exp $
 #
 
-DISTNAME=		nagios-2.5
+DISTNAME=		nagios-2.12
 PKGNAME=		${DISTNAME:S/-/-base-/}
-PKGREVISION=		7
 CATEGORIES=		net sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nagios/}
 
@@ -53,8 +52,8 @@ MESSAGE_SUBST+=		NAGIOS_USER=${NAGIOS_USER}
 MESSAGE_SUBST+=		NAGIOSCMD_GROUP=${NAGIOSCMD_GROUP}
 
 EGDIR=			${PREFIX}/share/examples/nagios
-EGFILES=		cgi.cfg checkcommands.cfg minimal.cfg
-EGFILES+=		misccommands.cfg nagios.cfg resource.cfg
+EGFILES=		cgi.cfg commands.cfg localhost.cfg
+EGFILES+=		nagios.cfg resource.cfg
 
 .for files in ${EGFILES}
 CONF_FILES+=		${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files}