Update nagios-base to 3.3.1, fixig CVE-2011-1523 and CVE-2011-2179.

Changes since 3.2.3:
ENHANCEMENTS

    * Added support for same host service dependencies with servicegroups (Mathieu Gagné)
    * Empty hostgroups referenced from services now optionally generate a warning instead of an error.
    * Documentation links now point to online resources
    * Matt Wall's Exfoliation theme is now installed by default. You can reinstall the classic theme with "make install-classicui"
    * Downtime delete commands made "distributable" by deleting by host group name, host name or start time/comment (Opsview team)
    * Allow status.cgi to order by "host urgency" (Jochen Bern)
    * Added news items and quick links to main splash page
    * Added ability to authenticate to CGIs using contactgroup name (Stephen Gran)


FIXES

    * Fixes status.cgi when called with no parameters, where host should be set to all if none specified (Michael Friedrich)
    * Fixes possible validation error with empty hostgroups/servicegroups (Sven-Göran Bergh)
    * Performance-data handling and checking is now thread-safe so long as embedded perl is not used.
    * Children should no longer hang on mutex locks held in parent for localtime() (and similar) calls.
    * Debug logging is now properly serialized, using soft-locking with a timeout of 150 milliseconds to avoid multiple threads competing for the privilege to write debug info.
    * Fixed extraneous alerts for services when host is down
    * Fixed incorrect parsing of multi-line host check results (Jochen Bern)
    * Fixed bug with passive host checks being incorrectly sent to event brokers as active checks
    * Fixed bug where passive host check status updates were not being propagated to event brokers
    * Reverted 'Fix for retaining host display name and alias, as well as service display name' as configuration information stored incorrectly over a reload
    * Fixed compile warnings for size_t (Michael Friedrich)
    * Fixed problem where acknowledgements were getting reset when a hard state change occurred
    * Removed duplicated unlinks for check result files with multiple results
    * Fixed race condition on flexible downtime commands when duration not set or zero (Michael Friedrich)
    * Fixed flexible downtime on service hard state change doesn't get triggered/activated (Michael Friedrich)
    * Fixed XSS vulnerability in config.cgi and statusmap.cgi (Stefan Schurtz)
    * Fixed segfault when sending host notifications (Michael Friedrich)
    * Fixed bug where unauthorized contacts could issue hostgroup and servicegroup commands (Sven Nierlein)

8 files changed, 293 insertions, 247 deletions

diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 25426ed4c70..7dfbf74a9bb 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2011/04/08 22:37:24 morr Exp $
+# $NetBSD: Makefile,v 1.32 2011/08/02 14:03:18 bouyer Exp $
 #
 
-DISTNAME=		nagios-3.2.3
+DISTNAME=		nagios-3.3.1
 PKGNAME=		${DISTNAME:S/-/-base-/}
 CATEGORIES=		net sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nagios/}
@@ -75,6 +75,9 @@ SUBST_FILES.files=	nagios.conf.dist
 SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.files=	Fixing configuration files.
 
+post-extract:
+	${MV} ${WRKDIR}/nagios ${WRKSRC}
+
 pre-build:
 	${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist
 
diff --git a/net/nagios-base/Makefile.common b/net/nagios-base/Makefile.common
index 2585565887d..ce1e8057ded 100644
--- a/net/nagios-base/Makefile.common
+++ b/net/nagios-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2011/04/08 22:37:24 morr Exp $
+# $NetBSD: Makefile.common,v 1.12 2011/08/02 14:03:18 bouyer Exp $
 #
 # used by net/nagios-base/Makefile
 # used by net/nagios-nsca/Makefile
@@ -19,9 +19,10 @@ PERL5_REQD=		5.6
 
 CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/nagios
 .if ${PKGPATH} != "net/nagios-nsca"
-CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/nagios
-.endif
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/nagios
+.else
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
+.endif
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${NAGIOSDIR}
 
diff --git a/net/nagios-base/PLIST b/net/nagios-base/PLIST
index bea76bc5ece..70491bc8f18 100644
--- a/net/nagios-base/PLIST
+++ b/net/nagios-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/04/08 22:37:24 morr Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/08/02 14:03:18 bouyer Exp $
 bin/nagios
 bin/nagiostats
 bin/p1.pl
@@ -95,190 +95,12 @@ share/nagios/contexthelp/N4.html
 share/nagios/contexthelp/N5.html
 share/nagios/contexthelp/N6.html
 share/nagios/contexthelp/N7.html
-share/nagios/docs/about.html
-share/nagios/docs/activechecks.html
-share/nagios/docs/adaptive.html
-share/nagios/docs/addons.html
-share/nagios/docs/beginners.html
-share/nagios/docs/cachedchecks.html
-share/nagios/docs/cgiauth.html
-share/nagios/docs/cgiincludes.html
-share/nagios/docs/cgis.html
-share/nagios/docs/cgisecurity.html
-share/nagios/docs/checkscheduling.html
-share/nagios/docs/clusters.html
-share/nagios/docs/config.html
-share/nagios/docs/configcgi.html
-share/nagios/docs/configmain.html
-share/nagios/docs/configobject.html
-share/nagios/docs/customobjectvars.html
-share/nagios/docs/dependencies.html
-share/nagios/docs/dependencychecks.html
-share/nagios/docs/distributed.html
-share/nagios/docs/downtime.html
-share/nagios/docs/embeddedperl.html
-share/nagios/docs/epnplugins.html
-share/nagios/docs/escalations.html
-share/nagios/docs/eventhandlers.html
-share/nagios/docs/extcommands.html
-share/nagios/docs/faststartup.html
-share/nagios/docs/flapping.html
-share/nagios/docs/freshness.html
-share/nagios/docs/funstuff.html
-share/nagios/docs/hostchecks.html
-share/nagios/docs/images/activechecks.png
-share/nagios/docs/images/cachedcheckgraphs.png
-share/nagios/docs/images/cachedchecks.png
-share/nagios/docs/images/cachedchecks1.png
-share/nagios/docs/images/cgi-avail-a.png
-share/nagios/docs/images/cgi-avail-b.png
-share/nagios/docs/images/cgi-cmd.png
-share/nagios/docs/images/cgi-config.png
-share/nagios/docs/images/cgi-extinfo-a.png
-share/nagios/docs/images/cgi-extinfo-b.png
-share/nagios/docs/images/cgi-extinfo-c.png
-share/nagios/docs/images/cgi-extinfo-d.png
-share/nagios/docs/images/cgi-histogram.png
-share/nagios/docs/images/cgi-history.png
-share/nagios/docs/images/cgi-notifications.png
-share/nagios/docs/images/cgi-outages.png
-share/nagios/docs/images/cgi-showlog.png
-share/nagios/docs/images/cgi-status-a.png
-share/nagios/docs/images/cgi-status-b.png
-share/nagios/docs/images/cgi-status-c.png
-share/nagios/docs/images/cgi-status-d.png
-share/nagios/docs/images/cgi-statusmap.png
-share/nagios/docs/images/cgi-statuswml.png
-share/nagios/docs/images/cgi-statuswrl.png
-share/nagios/docs/images/cgi-summary.png
-share/nagios/docs/images/cgi-tac.png
-share/nagios/docs/images/cgi-trends.png
-share/nagios/docs/images/checkmark.png
-share/nagios/docs/images/checktiming.png
-share/nagios/docs/images/configoverview.png
-share/nagios/docs/images/distributed.png
-share/nagios/docs/images/downtime.png
-share/nagios/docs/images/epn.png
-share/nagios/docs/images/eventhandlers.png
-share/nagios/docs/images/externalcommands.png
-share/nagios/docs/images/fast-startup.png
-share/nagios/docs/images/fast-startup1.png
-share/nagios/docs/images/fast-startup2.png
-share/nagios/docs/images/freshness.png
-share/nagios/docs/images/host-dependencies.png
-share/nagios/docs/images/important.gif
-share/nagios/docs/images/integrationoverview.png
-share/nagios/docs/images/interleaved1.png
-share/nagios/docs/images/interleaved2.png
-share/nagios/docs/images/interleaved3.png
-share/nagios/docs/images/logofullsize.png
-share/nagios/docs/images/monitoring-printers.png
-share/nagios/docs/images/monitoring-routers.png
-share/nagios/docs/images/monitoring-windows.png
-share/nagios/docs/images/mrtg-activehostchecks.png
-share/nagios/docs/images/mrtg-activelychecked.png
-share/nagios/docs/images/mrtg-activeservicechecks.png
-share/nagios/docs/images/mrtg-cachedchecks.png
-share/nagios/docs/images/mrtg-commandbuffers.png
-share/nagios/docs/images/mrtg-externalcommands.png
-share/nagios/docs/images/mrtg-hostperfstats.png
-share/nagios/docs/images/mrtg-hoststatechange.png
-share/nagios/docs/images/mrtg-passivechecks.png
-share/nagios/docs/images/mrtg-passivelychecked.png
-share/nagios/docs/images/mrtg-serviceperfstats.png
-share/nagios/docs/images/mrtg-servicestatechange.png
-share/nagios/docs/images/multiple-templates1.png
-share/nagios/docs/images/multiple-templates2.png
-share/nagios/docs/images/nagios.jpg
-share/nagios/docs/images/nagiosexchange.png
-share/nagios/docs/images/nagiossupport.png
-share/nagios/docs/images/ndoutils.png
-share/nagios/docs/images/network-outage1.png
-share/nagios/docs/images/network-outage2.png
-share/nagios/docs/images/noninterleaved1.png
-share/nagios/docs/images/noninterleaved2.png
-share/nagios/docs/images/note.gif
-share/nagios/docs/images/nrpe.png
-share/nagios/docs/images/nsca.png
-share/nagios/docs/images/nscpp.png
-share/nagios/docs/images/objects-commands.png
-share/nagios/docs/images/objects-contacts.png
-share/nagios/docs/images/objects-hosts.png
-share/nagios/docs/images/objects-services.png
-share/nagios/docs/images/objects-timeperiods.png
-share/nagios/docs/images/passivechecks.png
-share/nagios/docs/images/passivehosttranslation.png
-share/nagios/docs/images/plugins.png
-share/nagios/docs/images/predictive-dependency-checks.png
-share/nagios/docs/images/printer.png
-share/nagios/docs/images/reachability1.png
-share/nagios/docs/images/reachability2.png
-share/nagios/docs/images/reachability3.png
-share/nagios/docs/images/reachability4.png
-share/nagios/docs/images/redudancy.png
-share/nagios/docs/images/redundancy.png
-share/nagios/docs/images/security.png
-share/nagios/docs/images/security1.png
-share/nagios/docs/images/security2.png
-share/nagios/docs/images/security3.png
-share/nagios/docs/images/seealso.gif
-share/nagios/docs/images/service-dependencies.png
-share/nagios/docs/images/statetransitions.png
-share/nagios/docs/images/statetransitions2.png
-share/nagios/docs/images/stoprestart.png
-share/nagios/docs/images/switch.png
-share/nagios/docs/images/tcpwrappers.png
-share/nagios/docs/images/tip.gif
-share/nagios/docs/images/tuning.png
-share/nagios/docs/images/upto.gif
-share/nagios/docs/index.html
-share/nagios/docs/int-snmptrap.html
-share/nagios/docs/int-tcpwrappers.html
-share/nagios/docs/integration.html
-share/nagios/docs/knownissues.html
-share/nagios/docs/largeinstalltweaks.html
-share/nagios/docs/macrolist.html
-share/nagios/docs/macros.html
-share/nagios/docs/monitoring-linux.html
-share/nagios/docs/monitoring-netware.html
-share/nagios/docs/monitoring-printers.html
-share/nagios/docs/monitoring-publicservices.html
-share/nagios/docs/monitoring-routers.html
-share/nagios/docs/monitoring-windows.html
-share/nagios/docs/mrtggraphs.html
-share/nagios/docs/nagiostats.html
-share/nagios/docs/networkreachability.html
-share/nagios/docs/notifications.html
-share/nagios/docs/objectdefinitions.html
-share/nagios/docs/objectinheritance.html
-share/nagios/docs/objecttricks.html
-share/nagios/docs/oncallrotation.html
-share/nagios/docs/passivechecks.html
-share/nagios/docs/passivestatetranslation.html
-share/nagios/docs/perfdata.html
-share/nagios/docs/pluginapi.html
-share/nagios/docs/plugins.html
-share/nagios/docs/quickstart-fedora.html
-share/nagios/docs/quickstart-opensuse.html
-share/nagios/docs/quickstart-ubuntu.html
-share/nagios/docs/quickstart.html
-share/nagios/docs/redundancy.html
-share/nagios/docs/robots.txt
-share/nagios/docs/security.html
-share/nagios/docs/servicechecks.html
-share/nagios/docs/stalking.html
-share/nagios/docs/startstop.html
-share/nagios/docs/statetypes.html
-share/nagios/docs/timeperiods.html
-share/nagios/docs/toc.html
-share/nagios/docs/tuning.html
-share/nagios/docs/upgrading.html
-share/nagios/docs/verifyconfig.html
-share/nagios/docs/volatileservices.html
-share/nagios/docs/whatsnew.html
 share/nagios/images/NagiosEnterprises-whitebg-112x46.png
 share/nagios/images/ack.gif
 share/nagios/images/action.gif
+share/nagios/images/action-graph.gif
+share/nagios/images/action-nagios.gif
+share/nagios/images/action-orig.gif
 share/nagios/images/command.png
 share/nagios/images/comment.gif
 share/nagios/images/contexthelp1.gif
@@ -296,6 +118,7 @@ share/nagios/images/extinfo.gif
 share/nagios/images/favicon.ico
 share/nagios/images/flapping.gif
 share/nagios/images/globe-support-150x150.png
+share/nagios/images/graph.gif
 share/nagios/images/greendot.gif
 share/nagios/images/histogram.png
 share/nagios/images/history.gif
@@ -303,11 +126,183 @@ share/nagios/images/hostevent.gif
 share/nagios/images/info.png
 share/nagios/images/left.gif
 share/nagios/images/logofullsize.png
+share/nagios/images/logos/aix.gd2
+share/nagios/images/logos/aix.gif
+share/nagios/images/logos/aix.jpg
+share/nagios/images/logos/aix.png
+share/nagios/images/logos/amiga.gd2
+share/nagios/images/logos/amiga.gif
+share/nagios/images/logos/amiga.jpg
+share/nagios/images/logos/amiga.png
+share/nagios/images/logos/apple.gd2
+share/nagios/images/logos/apple.gif
+share/nagios/images/logos/apple.jpg
+share/nagios/images/logos/apple.png
+share/nagios/images/logos/beos.gd2
+share/nagios/images/logos/beos.gif
+share/nagios/images/logos/beos.jpg
+share/nagios/images/logos/beos.png
+share/nagios/images/logos/bluetooth.png
+share/nagios/images/logos/caldera.gd2
+share/nagios/images/logos/caldera.gif
+share/nagios/images/logos/caldera.jpg
+share/nagios/images/logos/caldera.png
+share/nagios/images/logos/cat1900.gd2
+share/nagios/images/logos/cat2900.gd2
+share/nagios/images/logos/cat5000.gd2
+share/nagios/images/logos/database.gd2
+share/nagios/images/logos/database.gif
+share/nagios/images/logos/debian.gd2
+share/nagios/images/logos/debian.gif
+share/nagios/images/logos/debian.jpg
+share/nagios/images/logos/debian.png
+share/nagios/images/logos/desktop-server.gd2
+share/nagios/images/logos/desktop-server.gif
+share/nagios/images/logos/ethernet_card.png
+share/nagios/images/logos/fax.gd2
+share/nagios/images/logos/fax.gif
+share/nagios/images/logos/firewall.gd2
+share/nagios/images/logos/firewall.gif
+share/nagios/images/logos/freebsd40.gd2
+share/nagios/images/logos/freebsd40.gif
+share/nagios/images/logos/freebsd40.jpg
+share/nagios/images/logos/freebsd40.png
+share/nagios/images/logos/globe.png
+share/nagios/images/logos/graph.gif
+share/nagios/images/logos/hp-printer40.gd2
+share/nagios/images/logos/hp-printer40.gif
+share/nagios/images/logos/hp-printer40.jpg
+share/nagios/images/logos/hp-printer40.png
+share/nagios/images/logos/hpux.gd2
+share/nagios/images/logos/hpux.gif
+share/nagios/images/logos/hpux.jpg
+share/nagios/images/logos/hpux.png
+share/nagios/images/logos/hub.gd2
+share/nagios/images/logos/hub.gif
+share/nagios/images/logos/internet.gd2
+share/nagios/images/logos/internet.gif
+share/nagios/images/logos/internet_device.png
+share/nagios/images/logos/ip-pbx.gd2
+share/nagios/images/logos/ip-pbx.gif
+share/nagios/images/logos/irix.gd2
+share/nagios/images/logos/irix.gif
+share/nagios/images/logos/irix.jpg
+share/nagios/images/logos/irix.png
+share/nagios/images/logos/linux40.gd2
+share/nagios/images/logos/linux40.gif
+share/nagios/images/logos/linux40.jpg
+share/nagios/images/logos/linux40.png
+share/nagios/images/logos/logo.gd2
+share/nagios/images/logos/mac40.gd2
+share/nagios/images/logos/mac40.gif
+share/nagios/images/logos/mac40.jpg
+share/nagios/images/logos/mac40.png
+share/nagios/images/logos/mainframe.gd2
+share/nagios/images/logos/mainframe.gif
+share/nagios/images/logos/mandrake.gd2
+share/nagios/images/logos/mandrake.gif
+share/nagios/images/logos/mandrake.jpg
+share/nagios/images/logos/mandrake.png
+share/nagios/images/logos/monitor.png
 share/nagios/images/logos/nagios.gd2
 share/nagios/images/logos/nagios.gif
 share/nagios/images/logos/nagiosvrml.png
+share/nagios/images/logos/next.gd2
+share/nagios/images/logos/next.gif
+share/nagios/images/logos/next.jpg
+share/nagios/images/logos/next.png
+share/nagios/images/logos/ng-switch40.gd2
+share/nagios/images/logos/ng-switch40.gif
+share/nagios/images/logos/ng-switch40.jpg
+share/nagios/images/logos/ng-switch40.png
+share/nagios/images/logos/notebook.gd2
+share/nagios/images/logos/notebook.gif
+share/nagios/images/logos/novell40.gd2
+share/nagios/images/logos/novell40.gif
+share/nagios/images/logos/novell40.jpg
+share/nagios/images/logos/novell40.png
+share/nagios/images/logos/openbsd.gd2
+share/nagios/images/logos/openbsd.gif
+share/nagios/images/logos/openbsd.jpg
+share/nagios/images/logos/openbsd.png
+share/nagios/images/logos/printer.gd2
+share/nagios/images/logos/printer.gif
+share/nagios/images/logos/rack-server.gd2
+share/nagios/images/logos/rack-server.gif
+share/nagios/images/logos/redhat.gd2
+share/nagios/images/logos/redhat.gif
+share/nagios/images/logos/redhat.jpg
+share/nagios/images/logos/redhat.png
+share/nagios/images/logos/router.gd2
+share/nagios/images/logos/router.gif
+share/nagios/images/logos/router40.gd2
+share/nagios/images/logos/router40.gif
+share/nagios/images/logos/router40.jpg
+share/nagios/images/logos/router40.png
+share/nagios/images/logos/san.gd2
+share/nagios/images/logos/san.gif
+share/nagios/images/logos/satellite.png
+share/nagios/images/logos/server.png
+share/nagios/images/logos/signal.png
+share/nagios/images/logos/slackware.gd2
+share/nagios/images/logos/slackware.gif
+share/nagios/images/logos/slackware.jpg
+share/nagios/images/logos/slackware.png
+share/nagios/images/logos/stampede.gd2
+share/nagios/images/logos/stampede.gif
+share/nagios/images/logos/stampede.jpg
+share/nagios/images/logos/stampede.png
+share/nagios/images/logos/station.gd2
+share/nagios/images/logos/storm.gd2
+share/nagios/images/logos/storm.gif
+share/nagios/images/logos/storm.jpg
+share/nagios/images/logos/storm.png
+share/nagios/images/logos/sun40.gd2
+share/nagios/images/logos/sun40.gif
+share/nagios/images/logos/sun40.jpg
+share/nagios/images/logos/sun40.png
+share/nagios/images/logos/sunlogo.gd2
+share/nagios/images/logos/sunlogo.gif
+share/nagios/images/logos/sunlogo.jpg
+share/nagios/images/logos/sunlogo.png
+share/nagios/images/logos/switch.gd2
+share/nagios/images/logos/switch.gif
+share/nagios/images/logos/switch40.gd2
+share/nagios/images/logos/switch40.gif
+share/nagios/images/logos/switch40.jpg
+share/nagios/images/logos/switch40.png
+share/nagios/images/logos/thin-client.gd2
+share/nagios/images/logos/thin-client.gif
+share/nagios/images/logos/turbolinux.gd2
+share/nagios/images/logos/turbolinux.gif
+share/nagios/images/logos/turbolinux.jpg
+share/nagios/images/logos/turbolinux.png
+share/nagios/images/logos/ultrapenguin.gd2
+share/nagios/images/logos/ultrapenguin.gif
+share/nagios/images/logos/ultrapenguin.jpg
+share/nagios/images/logos/ultrapenguin.png
+share/nagios/images/logos/unicos.gd2
+share/nagios/images/logos/unicos.gif
+share/nagios/images/logos/unicos.jpg
+share/nagios/images/logos/unicos.png
 share/nagios/images/logos/unknown.gd2
 share/nagios/images/logos/unknown.gif
+share/nagios/images/logos/webcamera.png
+share/nagios/images/logos/wifi.gd2
+share/nagios/images/logos/wifi.gif
+share/nagios/images/logos/wifi_modem.png
+share/nagios/images/logos/win40.gd2
+share/nagios/images/logos/win40.gif
+share/nagios/images/logos/win40.jpg
+share/nagios/images/logos/win40.png
+share/nagios/images/logos/workstation.gd2
+share/nagios/images/logos/workstation.gif
+share/nagios/images/logos/workstation.png
+share/nagios/images/logos/workstation_locked.png
+share/nagios/images/logos/yellowdog.gd2
+share/nagios/images/logos/yellowdog.gif
+share/nagios/images/logos/yellowdog.jpg
+share/nagios/images/logos/yellowdog.png
 share/nagios/images/logrotate.png
 share/nagios/images/ndisabled.gif
 share/nagios/images/noack.gif
@@ -347,6 +342,19 @@ share/nagios/images/warning.png
 share/nagios/images/weblogo1.png
 share/nagios/images/zoom1.gif
 share/nagios/images/zoom2.gif
+share/nagios/includes/rss/AUTHORS
+share/nagios/includes/rss/CHANGES
+share/nagios/includes/rss/ChangeLog
+share/nagios/includes/rss/INSTALL
+share/nagios/includes/rss/NEWS
+share/nagios/includes/rss/README
+share/nagios/includes/rss/TROUBLESHOOTING
+share/nagios/includes/rss/cookbook
+share/nagios/includes/rss/extlib/Snoopy.class.inc
+share/nagios/includes/rss/rss_cache.inc
+share/nagios/includes/rss/rss_fetch.inc
+share/nagios/includes/rss/rss_parse.inc
+share/nagios/includes/rss/rss_utils.inc
 share/nagios/includes/utils.inc.php
 share/nagios/index.php
 share/nagios/main.php
diff --git a/net/nagios-base/distinfo b/net/nagios-base/distinfo
index 5e4a8bba5b8..1f71e4eb1e6 100644
--- a/net/nagios-base/distinfo
+++ b/net/nagios-base/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.12 2011/04/08 22:37:24 morr Exp $
+$NetBSD: distinfo,v 1.13 2011/08/02 14:03:18 bouyer Exp $
 
-SHA1 (nagios-3.2.3.tar.gz) = fcb2c016c1b803bac71442d0ee8375b737906421
-RMD160 (nagios-3.2.3.tar.gz) = 3c09034069416c5f4dd5071e34516b1154c276b2
-Size (nagios-3.2.3.tar.gz) = 3249447 bytes
-SHA1 (patch-aa) = d56ae45ad54b43fe28e1d83fe916f04e8f8741a7
+SHA1 (nagios-3.3.1.tar.gz) = 7b2523de0dacb51b5162dd53fc4c909397800125
+RMD160 (nagios-3.3.1.tar.gz) = 38d427f9d137ba75b84f3bfe2a98b72a768f6158
+Size (nagios-3.3.1.tar.gz) = 1714630 bytes
+SHA1 (patch-aa) = 387aa5be2cd2ab7990fb918cba9a73e88b99c1ff
 SHA1 (patch-ab) = 37beee7195879806a2cd44cde2f376e07fc13470
 SHA1 (patch-ac) = cb2c6a28fc4d46eb41c942998251171ddd946bf2
-SHA1 (patch-ad) = 22d2a083f485e0da323403a2e27d6ee83e8cea27
+SHA1 (patch-ad) = 45ba0e08e5dd68b354a0e925e36b1a6944a57f2d
 SHA1 (patch-ae) = 35418dbe26f2e7c14d6a98951e62247344ae80b0
 SHA1 (patch-af) = a91ab37f16e8adda3146a2dde7273ebf841ef9af
-SHA1 (patch-ag) = ae2811e97fc91e937ef240fc671c069181c97861
-SHA1 (patch-ah) = 3e73f1256f2364855598a94092744968b88c78e6
+SHA1 (patch-ag) = ae13cf98b7e2f68304406ebab80292c5c4c8ea30
+SHA1 (patch-ah) = 18b395833303543469b510bf50d73568d3a40cd9
 SHA1 (patch-ai) = 9212106c141be6faaf65e4e4909fcf92907c0e58
diff --git a/net/nagios-base/patches/patch-aa b/net/nagios-base/patches/patch-aa
index 669f1e5013d..a9fa8883b91 100644
--- a/net/nagios-base/patches/patch-aa
+++ b/net/nagios-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2011/04/08 22:37:25 morr Exp $
+$NetBSD: patch-aa,v 1.9 2011/08/02 14:03:18 bouyer Exp $
 
---- Makefile.in.orig	2009-12-31 10:12:08.000000000 +0000
-+++ Makefile.in
-@@ -24,17 +24,16 @@ prefix=@prefix@
+--- Makefile.in.orig	2011-07-26 04:02:18.000000000 +0200
++++ Makefile.in	2011-08-01 20:14:30.000000000 +0200
+@@ -24,17 +24,16 @@
  exec_prefix=@exec_prefix@
  LOGDIR=@localstatedir@
  CHECKRESULTDIR=@CHECKRESULTDIR@
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.8 2011/04/08 22:37:25 morr Exp $
 -CGIDIR=@sbindir@
 +CGIDIR=@libexecdir@
  LIBEXECDIR=@libexecdir@
- HTMLDIR=@datarootdir@
+ HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.8 2011/04/08 22:37:25 morr Exp $
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -64,66 +63,6 @@ all:
+@@ -69,74 +68,6 @@
  	cd $(SRC_BASE) && $(MAKE)
  	cd $(SRC_CGI) && $(MAKE)
  	cd $(SRC_HTM) && $(MAKE)
@@ -60,6 +60,14 @@ $NetBSD: patch-aa,v 1.8 2011/04/08 22:37:25 morr Exp $
 -	@echo "     - This installs the Apache config file for the Nagios"
 -	@echo "       web interface"
 -	@echo ""
+-	@echo "  make install-exfoliation"
+-	@echo "     - This installs the Exfoliation theme for the Nagios"
+-	@echo "       web interface"
+-	@echo ""
+-	@echo "  make install-classicui"
+-	@echo "     - This installs the classic theme for the Nagios"
+-	@echo "       web interface"
+-	@echo ""
 -	@echo ""
 -	@echo "*** Support Notes *******************************************"
 -	@echo ""
@@ -67,8 +75,8 @@ $NetBSD: patch-aa,v 1.8 2011/04/08 22:37:25 morr Exp $
 -	@echo "please make sure that you:"
 -	@echo ""
 -	@echo "     - Look at the sample config files"
--	@echo "     - Read the HTML documentation"
--	@echo "     - Read the FAQs online at http://www.nagios.org/faqs"
+-	@echo "     - Read the documentation on the Nagios Library at:"
+-	@echo "           http://library.nagios.com"
 -	@echo ""
 -	@echo "before you post a question to one of the mailing lists."
 -	@echo "Also make sure to include pertinent information that could"
@@ -81,7 +89,7 @@ $NetBSD: patch-aa,v 1.8 2011/04/08 22:37:25 morr Exp $
 -	@echo ""
 -	@echo "For more information on obtaining support for Nagios, visit:"
 -	@echo ""
--	@echo "       http://www.nagios.org/support/"
+-	@echo "       http://support.nagios.com"
 -	@echo ""
 -	@echo "*************************************************************"
 -	@echo ""
@@ -90,7 +98,7 @@ $NetBSD: patch-aa,v 1.8 2011/04/08 22:37:25 morr Exp $
  
  nagios:
  	cd $(SRC_BASE) && $(MAKE)
-@@ -214,14 +153,10 @@ install-unstripped:
+@@ -230,14 +161,10 @@
  	$(MAKE) install-basic
  
  install-basic:
@@ -107,7 +115,7 @@ $NetBSD: patch-aa,v 1.8 2011/04/08 22:37:25 morr Exp $
  	@echo ""
  	@echo "*** Main program, CGIs and HTML files installed ***"
  	@echo ""
-@@ -241,20 +176,20 @@ install-basic:
+@@ -257,20 +184,20 @@
  
  
  install-config:
@@ -142,7 +150,25 @@ $NetBSD: patch-aa,v 1.8 2011/04/08 22:37:25 morr Exp $
  	@echo ""
  	@echo "*** Config files installed ***"
  	@echo ""
-@@ -282,7 +217,10 @@ install-daemoninit:
+@@ -287,8 +214,15 @@
+ 	@echo ""
+ 	
+ install-exfoliation:
+-	cp -rf contrib/exfoliation/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets
+-	cp -rf contrib/exfoliation/images/* $(DESTDIR)$(HTMLDIR)/images
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
++	for file in contrib/exfoliation/stylesheets/* ; \
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
++	for file in contrib/exfoliation/images/*.* ; \
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
++	for file in contrib/exfoliation/images/logos/* ; \
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ 
+ 	@echo ""
+ 	@echo "*** Exfoliation theme installed ***"
+@@ -316,7 +250,10 @@
  
  
  install-commandmode:
diff --git a/net/nagios-base/patches/patch-ad b/net/nagios-base/patches/patch-ad
index 717a81dfc4d..169ebb5eb5b 100644
--- a/net/nagios-base/patches/patch-ad
+++ b/net/nagios-base/patches/patch-ad
@@ -1,19 +1,17 @@
-$NetBSD: patch-ad,v 1.7 2011/04/08 22:37:25 morr Exp $
+$NetBSD: patch-ad,v 1.8 2011/08/02 14:03:18 bouyer Exp $
 
---- html/Makefile.in.orig	2009-07-07 22:34:51.000000000 +0000
-+++ html/Makefile.in
-@@ -7,8 +7,8 @@ exec_prefix=@exec_prefix@
+--- html/Makefile.in.orig	2011-07-24 19:53:52.000000000 +0200
++++ html/Makefile.in	2011-08-01 18:50:04.000000000 +0200
+@@ -7,7 +7,7 @@
  LOGDIR=@localstatedir@
  CFGDIR=@sysconfdir@
  BINDIR=@bindir@
 -CGIDIR=@sbindir@
--HTMLDIR=@datadir@
 +CGIDIR=@libexecdir@
-+HTMLDIR=@datarootdir@
+ HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
- COMMAND_OPTS=@COMMAND_OPTS@
-@@ -33,46 +33,45 @@ distclean: clean
+@@ -33,52 +33,52 @@
  devclean: distclean
  
  install:
@@ -26,20 +24,25 @@ $NetBSD: patch-ad,v 1.7 2011/04/08 22:37:25 morr Exp $
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
 -	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
-+	[ -d $(DESTDIR)$(HTMLDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)
-+	[ -d $(DESTDIR)$(HTMLDIR)/stylesheets ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
-+	[ -d $(DESTDIR)$(HTMLDIR)/contexthelp ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/contexthelp
-+	[ -d $(DESTDIR)$(HTMLDIR)/docs ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs
-+	[ -d $(DESTDIR)$(HTMLDIR)/docs/images ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images
-+	[ -d $(DESTDIR)$(HTMLDIR)/images ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
-+	[ -d $(DESTDIR)$(HTMLDIR)/images/logos ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
-+	[ -d $(DESTDIR)$(HTMLDIR)/includes ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/includes
-+	[ -d $(DESTDIR)$(HTMLDIR)/ssi ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/ssi
+-#	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/media
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/contexthelp
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/includes
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/includes/rss
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/ssi
 +	${BSD_INSTALL_DATA} robots.txt $(DESTDIR)$(HTMLDIR)
-+	${BSD_INSTALL_DATA} docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
++	#${BSD_INSTALL_DATA} docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
  # Remove old HTML files (PHP files are used now)
  	rm -f $(DESTDIR)$(HTMLDIR)/index.html
  	rm -f $(DESTDIR)$(HTMLDIR)/main.html
@@ -55,12 +58,10 @@ $NetBSD: patch-ad,v 1.7 2011/04/08 22:37:25 morr Exp $
  	for file in contexthelp/*.html; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
 +	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
- 	for file in docs/*.html; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs; done
- 	for file in docs/images/*.*; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+ #	for file in docs/*.html; \
+ #	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ #	for file in docs/images/*.*; \
+ #	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
  	for file in images/*.gif; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
 +	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
@@ -79,6 +80,13 @@ $NetBSD: patch-ad,v 1.7 2011/04/08 22:37:25 morr Exp $
  	for file in includes/*.*; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
 +	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/includes; done
+-	for file in includes/rss/*; \
++	for file in AUTHORS NEWS rss_parse.inc CHANGES README rss_utils.inc ChangeLog TROUBLESHOOTING rss_cache.inc INSTALL cookbook rss_fetch.inc ; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
++	do ${BSD_INSTALL_DATA} includes/rss/$$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
+ 	for file in includes/rss/extlib/*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
  
  install-unstripped:
  	$(MAKE) install
diff --git a/net/nagios-base/patches/patch-ag b/net/nagios-base/patches/patch-ag
index 3ac9aaffd02..7b48168c284 100644
--- a/net/nagios-base/patches/patch-ag
+++ b/net/nagios-base/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.7 2011/04/08 22:37:25 morr Exp $
+$NetBSD: patch-ag,v 1.8 2011/08/02 14:03:18 bouyer Exp $
 
---- configure.orig	2010-10-04 03:56:55.000000000 +0000
-+++ configure
-@@ -6239,7 +6239,7 @@ else
- fi
- 
+--- configure.orig	2011-07-26 05:16:26.000000000 +0200
++++ configure	2011-08-01 18:36:37.000000000 +0200
+@@ -5775,7 +5775,7 @@
+   CHECKRESULTDIR=no
+ fi;
  if test x$CHECKRESULTDIR = xno; then
 -	CHECKRESULTDIR="$localstatedir/spool/checkresults"
 +	CHECKRESULTDIR="$localstatedir/checkresults"
diff --git a/net/nagios-base/patches/patch-ah b/net/nagios-base/patches/patch-ah
index 27febf2ff96..7c5f30f7377 100644
--- a/net/nagios-base/patches/patch-ah
+++ b/net/nagios-base/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.2 2011/04/08 22:37:25 morr Exp $
+$NetBSD: patch-ah,v 1.3 2011/08/02 14:03:18 bouyer Exp $
 
---- cgi/getcgi.c.orig	2006-05-15 16:59:24.000000000 +0000
-+++ cgi/getcgi.c
+--- cgi/getcgi.c.orig	2011-07-26 02:16:13.000000000 +0200
++++ cgi/getcgi.c	2011-08-01 18:37:39.000000000 +0200
 @@ -10,6 +10,7 @@
- #include "../include/getcgi.h"
- #include <stdio.h>
- #include <stdlib.h>
+ #include "../include/getcgi.h"

+ #include <stdio.h>

+ #include <stdlib.h>

 +#include <limits.h>
- 
- 
- #undef PARANOID_CGI_INPUT
+ 

+ 

+ #undef PARANOID_CGI_INPUT