7 files changed, 71 insertions, 30 deletions

diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile
index 645ff7ddef26..9998166ebaa5 100644
--- a/net-mgmt/nagios-devel/Makefile
+++ b/net-mgmt/nagios-devel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	nagios
-DISTVERSION=	3.0.3
+DISTVERSION=	3.1.0
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	nagios
+MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	jarrod@netleader.com.au
@@ -22,13 +21,16 @@ LATEST_LINK=	nagios-devel
 
 USE_ICONV=	yes
 USE_PERL5_BUILD=	yes
+USE_PHP=	yes
 USE_AUTOTOOLS=	autoconf:262 libltdl:15
 USE_RC_SUBR=	nagios.sh
 
-CONFLICTS=	nagios-[12].*
+CONFLICTS=	nagios-[123].*
 
-OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" off \
-		NANOSLEEP "Use nanosleep in event timing" off
+OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8.0+]" off \
+		NANOSLEEP "Use nanosleep in event timing" off \
+		EVENT_BROKER "Enable event broker functionality" off \
+		UNHANDLED_HACK "Display passive checks in unhandled queries" off
 
 GNU_CONFIGURE=	yes
 
@@ -60,7 +62,8 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=${NAGIOSDIR} \
 		--with-httpd-conf=${PREFIX}/etc \
-		--with-checkresult-dir=${NAGIOSDIR}/checkresults
+		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
+		--disable-statuswrl
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS}" \
@@ -84,17 +87,14 @@ SUB_FILES=	pkg-install \
 		pkg-deinstall \
 		pkg-message
 
+# XXX: Don't remove PREFIX from SUB_LIST here.
 SUB_LIST=	PREFIX=${PREFIX} \
 		${PLIST_SUB}
 
 .if defined(WITH_EMBEDDED_PERL)
-.if ${PERL_LEVEL} >= 500800
-USE_PERL5=	yes
+USE_PERL5=	5.8.0+
 CONFIGURE_ARGS+=	--enable-embedded-perl \
 		--with-perlcache
-.else
-IGNORE=		embedded Perl requires Perl 5.8 or higher (see lang/perl5.8)
-.endif
 PLIST_SUB+=	EMBEDDED_PERL=""
 .else
 PLIST_SUB+=	EMBEDDED_PERL="@comment "
@@ -104,6 +104,18 @@ PLIST_SUB+=	EMBEDDED_PERL="@comment "
 CONFIGURE_ARGS+=	--enable-nanosleep
 .endif
 
+.if defined(WITH_EVENT_BROKER)
+CONFIGURE_ARGS+=	--enable-event-broker
+.else
+CONFIGURE_ARGS+=	--disable-event-broker
+.endif
+
+post-patch:
+.if defined(WITH_UNHANDLED_HACK)
+	@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
+		-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
+.endif
+
 pre-install:
 	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
 
diff --git a/net-mgmt/nagios-devel/distinfo b/net-mgmt/nagios-devel/distinfo
index 70df4276b334..8f71ecfb7f44 100644
--- a/net-mgmt/nagios-devel/distinfo
+++ b/net-mgmt/nagios-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-3.0.3.tar.gz) = 151df7bf19b696f7498410fb76fb7caf
-SHA256 (nagios-3.0.3.tar.gz) = 65e96d7da182b40d4f9a8c63da1ef861fdfb9502be36a983f8a2e803f711d53c
-SIZE (nagios-3.0.3.tar.gz) = 2759396
+MD5 (nagios-3.1.0.tar.gz) = 02d3b0e13f772481d0ac9e00bdc3e979
+SHA256 (nagios-3.1.0.tar.gz) = 30b81eb7943805b129d1db18bb67386feb998f9e6464cb2efbea0756499b2651
+SIZE (nagios-3.1.0.tar.gz) = 2724545
diff --git a/net-mgmt/nagios-devel/files/patch-html__Makefile.in b/net-mgmt/nagios-devel/files/patch-html__Makefile.in
index 0a5dc643d707..f6b60db75a2b 100644
--- a/net-mgmt/nagios-devel/files/patch-html__Makefile.in
+++ b/net-mgmt/nagios-devel/files/patch-html__Makefile.in
@@ -1,6 +1,6 @@
---- html/Makefile.in.orig	2008-01-10 04:21:25.000000000 +1030
-+++ html/Makefile.in	2008-01-30 23:02:38.000000000 +1030
-@@ -33,39 +33,39 @@
+--- html/Makefile.in.orig	2008-12-15 04:30:46.000000000 +1030
++++ html/Makefile.in	2009-02-25 10:02:59.000000000 +1030
+@@ -33,42 +33,42 @@
  devclean: distclean
  
  install:
@@ -12,6 +12,7 @@
 -	$(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
@@ -23,15 +24,16 @@
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
++	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
 +	$(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
 +	$(INSTALL) -m 644 $(INSTALL_OPTS) 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 $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
- 	for file in media/*.wav; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
-+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+ #	for file in media/*.wav; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
++#	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
  	for file in stylesheets/*.css; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
 +	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
@@ -59,6 +61,9 @@
  	for file in images/logos/*.*; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
 +	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ 	for file in includes/*.*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
++	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
  
  install-unstripped:
  	$(MAKE) install
diff --git a/net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html b/net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html
new file mode 100644
index 000000000000..26ae4d890eaf
--- /dev/null
+++ b/net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html
@@ -0,0 +1,11 @@
+--- html/docs/configcgi.html.orig	2008-11-04 17:28:39.000000000 -0500
++++ html/docs/configcgi.html	2009-02-25 11:51:11.993677834 -0500
+@@ -616,7 +616,7 @@
+ </tr>

+ <tr>

+ <td valign=top>Example:</td>

+-<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td>

++<td><font color="red"><strong>ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$</strong></font></td>

+ </tr>

+ </table>

+ 

diff --git a/net-mgmt/nagios-devel/files/patch-sample-config__cgi.cfg.in b/net-mgmt/nagios-devel/files/patch-sample-config__cgi.cfg.in
new file mode 100644
index 000000000000..771b6ddbb663
--- /dev/null
+++ b/net-mgmt/nagios-devel/files/patch-sample-config__cgi.cfg.in
@@ -0,0 +1,11 @@
+--- sample-config/cgi.cfg.in.orig	2007-10-08 05:12:52.000000000 +0930
++++ sample-config/cgi.cfg.in	2008-10-23 10:31:31.000000000 +1030
+@@ -229,7 +229,7 @@
+ # OS and distribution, so you may have to tweak this to
+ # work on your system.
+ 
+-ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$
++ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$
+ 
+ 
+ 
diff --git a/net-mgmt/nagios-devel/files/pkg-message.in b/net-mgmt/nagios-devel/files/pkg-message.in
index a6cd7784dae3..8bf96edca81d 100644
--- a/net-mgmt/nagios-devel/files/pkg-message.in
+++ b/net-mgmt/nagios-devel/files/pkg-message.in
@@ -18,6 +18,8 @@
      Order deny,allow
      Deny from all
      Allow from 127.0.0.1
+     php_flag engine on
+     php_admin_value open_basedir %%PREFIX%%/%%NAGIOSWWWDIR%%/ %%NAGIOSDIR%%/
    </Directory>
 
    <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>
diff --git a/net-mgmt/nagios-devel/pkg-plist b/net-mgmt/nagios-devel/pkg-plist
index 22affb3077d9..5078b28117a4 100644
--- a/net-mgmt/nagios-devel/pkg-plist
+++ b/net-mgmt/nagios-devel/pkg-plist
@@ -30,10 +30,10 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/cgi-bin/status.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/statusmap.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/statuswml.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/statuswrl.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/summary.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/tac.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/trends.cgi
+%%NAGIOSWWWDIR%%/config.inc.php
 %%NAGIOSWWWDIR%%/contexthelp/A1.html
 %%NAGIOSWWWDIR%%/contexthelp/A2.html
 %%NAGIOSWWWDIR%%/contexthelp/A3.html
@@ -106,6 +106,7 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/docs/cgiauth.html
 %%NAGIOSWWWDIR%%/docs/cgiincludes.html
 %%NAGIOSWWWDIR%%/docs/cgis.html
+%%NAGIOSWWWDIR%%/docs/cgisecurity.html
 %%NAGIOSWWWDIR%%/docs/checkscheduling.html
 %%NAGIOSWWWDIR%%/docs/clusters.html
 %%NAGIOSWWWDIR%%/docs/config.html
@@ -318,7 +319,7 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/images/redundancy.png
 %%NAGIOSWWWDIR%%/images/restart.gif
 %%NAGIOSWWWDIR%%/images/right.gif
-%%NAGIOSWWWDIR%%/images/sblogo.jpg
+%%NAGIOSWWWDIR%%/images/sblogo.png
 %%NAGIOSWWWDIR%%/images/serviceevent.gif
 %%NAGIOSWWWDIR%%/images/splunk1.gif
 %%NAGIOSWWWDIR%%/images/splunk2.gif
@@ -344,13 +345,11 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/images/weblogo1.png
 %%NAGIOSWWWDIR%%/images/zoom1.gif
 %%NAGIOSWWWDIR%%/images/zoom2.gif
-%%NAGIOSWWWDIR%%/index.html
-%%NAGIOSWWWDIR%%/main.html
-%%NAGIOSWWWDIR%%/media/critical.wav
-%%NAGIOSWWWDIR%%/media/hostdown.wav
-%%NAGIOSWWWDIR%%/media/warning.wav
+%%NAGIOSWWWDIR%%/includes/utils.inc.php
+%%NAGIOSWWWDIR%%/index.php
+%%NAGIOSWWWDIR%%/main.php
 %%NAGIOSWWWDIR%%/robots.txt
-%%NAGIOSWWWDIR%%/side.html
+%%NAGIOSWWWDIR%%/side.php
 %%NAGIOSWWWDIR%%/stylesheets/avail.css
 %%NAGIOSWWWDIR%%/stylesheets/checksanity.css
 %%NAGIOSWWWDIR%%/stylesheets/cmd.css
@@ -376,6 +375,7 @@ etc/nagios/resource.cfg-sample
 @dirrm %%NAGIOSWWWDIR%%/docs
 @dirrm %%NAGIOSWWWDIR%%/images/logos
 @dirrm %%NAGIOSWWWDIR%%/images
+@dirrm %%NAGIOSWWWDIR%%/includes
 @dirrm %%NAGIOSWWWDIR%%/media
 @dirrm %%NAGIOSWWWDIR%%/ssi
 @dirrm %%NAGIOSWWWDIR%%/stylesheets