Update to 3.1.0 (approved by tonnerre@)

Note that this now requires php for the web interface.

Changes since 3.0.3:
- lots of bug fixes, including security fixes for CVE-2008-5027,
  CVE-2008-5028, and CVE-2008-6373 (secunia.com SA32909)
- Sample audio files for CGIs removed from distribution
- Added documentation on CGI security issues
- Better out-of-disk-space error handling when writing retention and
  status files
- Disabled adaptive check and eventhandler commands for security reasons
- Added wildcard host matching in CGIs
- Added support for x509 cert authentication in the CGIs
- Updates to nagiostats utility for faster execution if using external
  stats file
- Added a bit more verbosity to config verification

4 files changed, 32 insertions, 25 deletions

diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 959287d7380..9df47a156f2 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2008/10/19 19:18:31 he Exp $
+# $NetBSD: Makefile,v 1.23 2009/03/24 19:28:26 bouyer Exp $
 #
 
-DISTNAME=		nagios-3.0.3
+DISTNAME=		nagios-3.1.0
 PKGNAME=		${DISTNAME:S/-/-base-/}
-PKGREVISION=		1
 CATEGORIES=		net sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nagios/}
 
@@ -84,5 +83,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/nagios.conf.dist ${EGDIR}/nagios.conf
 
 .include "../../graphics/gd/buildlink3.mk"
+.include "../../lang/php/phpversion.mk"
+.include "${PHPPKGSRCDIR}/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/nagios-base/PLIST b/net/nagios-base/PLIST
index d62e51b4493..eacdfd48aa6 100644
--- a/net/nagios-base/PLIST
+++ b/net/nagios-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/07/21 00:35:42 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/03/24 19:28:26 bouyer Exp $
 bin/nagios
 bin/nagiostats
 bin/p1.pl
@@ -31,6 +31,7 @@ share/examples/nagios/objects/timeperiods.cfg-sample
 share/examples/nagios/objects/windows.cfg-sample
 share/examples/nagios/resource.cfg-sample
 share/examples/rc.d/nagios
+share/nagios/config.inc.php
 share/nagios/contexthelp/A1.html
 share/nagios/contexthelp/A2.html
 share/nagios/contexthelp/A3.html
@@ -103,6 +104,7 @@ 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
@@ -315,7 +317,7 @@ share/nagios/images/redudancy.png
 share/nagios/images/redundancy.png
 share/nagios/images/restart.gif
 share/nagios/images/right.gif
-share/nagios/images/sblogo.jpg
+share/nagios/images/sblogo.png
 share/nagios/images/serviceevent.gif
 share/nagios/images/splunk1.gif
 share/nagios/images/splunk2.gif
@@ -341,13 +343,11 @@ share/nagios/images/warning.png
 share/nagios/images/weblogo1.png
 share/nagios/images/zoom1.gif
 share/nagios/images/zoom2.gif
-share/nagios/index.html
-share/nagios/main.html
-share/nagios/media/critical.wav
-share/nagios/media/hostdown.wav
-share/nagios/media/warning.wav
+share/nagios/includes/utils.inc.php
+share/nagios/index.php
+share/nagios/main.php
 share/nagios/robots.txt
-share/nagios/side.html
+share/nagios/side.php
 share/nagios/stylesheets/avail.css
 share/nagios/stylesheets/checksanity.css
 share/nagios/stylesheets/cmd.css
@@ -368,6 +368,7 @@ share/nagios/stylesheets/trends.css
 @dirrm share/nagios/stylesheets
 @exec ${MKDIR} %D/share/nagios/ssi 2>/dev/null || ${TRUE}
 @dirrm share/nagios/ssi
+@dirrm share/nagios/includes
 @dirrm share/nagios/media
 @dirrm share/nagios/images/logos
 @dirrm share/nagios/images
diff --git a/net/nagios-base/distinfo b/net/nagios-base/distinfo
index 13e8307f455..adf7854d447 100644
--- a/net/nagios-base/distinfo
+++ b/net/nagios-base/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2008/07/21 00:35:42 tonnerre Exp $
+$NetBSD: distinfo,v 1.10 2009/03/24 19:28:26 bouyer Exp $
 
-SHA1 (nagios-3.0.3.tar.gz) = 2ab68996ef653f856b609d100a1ee41a4f49aead
-RMD160 (nagios-3.0.3.tar.gz) = 2f0ee991c4baf67b95fcf5d46fd7b34d8ba1118e
-Size (nagios-3.0.3.tar.gz) = 2759396 bytes
+SHA1 (nagios-3.1.0.tar.gz) = 0bf1cc2fbca92dfa82b11592d3d5adc6ac3983db
+RMD160 (nagios-3.1.0.tar.gz) = adae68a67f74e87fb1e6d0d49743704d55eee648
+Size (nagios-3.1.0.tar.gz) = 2724545 bytes
 SHA1 (patch-aa) = 0945f27a7f18553644682f1d9ad0f37b962d2a36
 SHA1 (patch-ab) = e633139ab3e3ee0b9b4d34b8fb5c7d8cb1ecac76
 SHA1 (patch-ac) = 779a29237981e1a664192d8a653552c1b7606184
-SHA1 (patch-ad) = ecb505ae21afde224b9186cb031ee5667bce4b1f
+SHA1 (patch-ad) = 4eda7b7488aa3627e2da35bc260593a30e82df06
 SHA1 (patch-ae) = 088bddbbd8d6a9f6b7aff89f238d510959a7220b
 SHA1 (patch-af) = a1b2c3a51b0ed72ff0f507bacc44a0d0c5924d60
 SHA1 (patch-ag) = da6af670c5d8788c1c46653b73f044cbfead64b1
diff --git a/net/nagios-base/patches/patch-ad b/net/nagios-base/patches/patch-ad
index e5093e720b1..eadbe52bc85 100644
--- a/net/nagios-base/patches/patch-ad
+++ b/net/nagios-base/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2008/07/21 00:35:42 tonnerre Exp $
+$NetBSD: patch-ad,v 1.5 2009/03/24 19:28:26 bouyer Exp $
 
---- html/Makefile.in.orig	2008-01-09 18:51:25.000000000 +0100
-+++ html/Makefile.in
-@@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@
+--- html/Makefile.in.orig	2008-12-14 19:00:46.000000000 +0100
++++ html/Makefile.in	2009-03-23 11:56:48.000000000 +0100
+@@ -7,7 +7,7 @@
  LOGDIR=@localstatedir@
  CFGDIR=@sysconfdir@
  BINDIR=@bindir@
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2008/07/21 00:35:42 tonnerre Exp $
  HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
-@@ -33,39 +33,39 @@ distclean: clean
+@@ -33,42 +33,42 @@
  devclean: distclean
  
  install:
@@ -23,6 +23,7 @@ $NetBSD: patch-ad,v 1.4 2008/07/21 00:35:42 tonnerre Exp $
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
 -	$(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)/ssi
 -	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
 -	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
@@ -34,15 +35,16 @@ $NetBSD: patch-ad,v 1.4 2008/07/21 00:35:42 tonnerre Exp $
 +	[ -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
 +	${BSD_INSTALL_DATA} robots.txt $(DESTDIR)$(HTMLDIR)
 +	${BSD_INSTALL_DATA} docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
- 	for file in *.html; \
+ 	for file in *.php; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
 +	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR); done
- 	for file in media/*.wav; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/media; done
+ #	for file in media/*.wav; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
++#	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/media; done
  	for file in stylesheets/*.css; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
 +	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
@@ -70,6 +72,9 @@ $NetBSD: patch-ad,v 1.4 2008/07/21 00:35:42 tonnerre Exp $
  	for file in images/logos/*.*; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
 +	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ 	for file in includes/*.*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/includes; done
  
  install-unstripped:
  	$(MAKE) install