Update to 4.3.1.

Sponsored by:	Absolight

7 files changed, 20 insertions, 16 deletions

diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile
index 7fe64ea27a3c..48fbb73765c9 100644
--- a/net-mgmt/nagios4/Makefile
+++ b/net-mgmt/nagios4/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nagios
-PORTVERSION=	4.2.4
+PORTVERSION=	4.3.1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://assets.nagios.com/downloads/nagioscore/releases/ \
@@ -74,15 +74,17 @@ NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
 USERS=		${NAGIOSUSER}
 GROUPS=		${NAGIOSGROUP}
 
-OPTIONS_DEFINE=	NANOSLEEP UNHANDLED_HACK
+OPTIONS_DEFINE=	NANOSLEEP UNHANDLED_HACK COREWINDOW
 OPTIONS_RADIO=		PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 OPTIONS_DEFAULT=	NAGPLUGINS
 NANOSLEEP_DESC=		Use nanosleep in event timing
 UNHANDLED_HACK_DESC=	Display passive checks in unhandled queries
+COREWINDOW_DESC=	Enable the corewindow parameter
 
 MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
+COREWINDOW_CONFIGURE_ENABLE=	corewindow
 
 OPTIONS_SUB=
 
diff --git a/net-mgmt/nagios4/distinfo b/net-mgmt/nagios4/distinfo
index 9833328b9325..cedd53d8c055 100644
--- a/net-mgmt/nagios4/distinfo
+++ b/net-mgmt/nagios4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482317499
-SHA256 (nagios-4.2.4.tar.gz) = b0055c475683ce50d77b1536ff0cec9abf89139adecf771601fa021ef9a20b70
-SIZE (nagios-4.2.4.tar.gz) = 11088206
+TIMESTAMP = 1493719703
+SHA256 (nagios-4.3.1.tar.gz) = dfc2f5f146eb508b2a28d28af7c338ef9eb604327efdc50142642026f7e79f82
+SIZE (nagios-4.3.1.tar.gz) = 11095797
diff --git a/net-mgmt/nagios4/files/patch-configure b/net-mgmt/nagios4/files/patch-configure
index a5fc27d8932f..3e27f9365d8e 100644
--- a/net-mgmt/nagios4/files/patch-configure
+++ b/net-mgmt/nagios4/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-12-07 16:31:10 UTC
+--- configure.orig	2017-02-23 20:00:40 UTC
 +++ configure
-@@ -4769,7 +4769,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -4775,7 +4775,6 @@ cat >>confdefs.h <<_ACEOF
  #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
  _ACEOF
  
@@ -8,7 +8,7 @@
  
  
  
-@@ -4790,7 +4789,6 @@ fi
+@@ -4796,7 +4795,6 @@ fi
  
  
  
diff --git a/net-mgmt/nagios4/files/patch-html_index.php b/net-mgmt/nagios4/files/patch-html_index.php.in
index 2be0be1b3471..b6589b525c46 100644
--- a/net-mgmt/nagios4/files/patch-html_index.php
+++ b/net-mgmt/nagios4/files/patch-html_index.php.in
@@ -1,5 +1,5 @@
---- html/index.php.orig	2016-12-07 16:31:10 UTC
-+++ html/index.php
+--- html/index.php.in.orig	2017-02-23 20:00:40 UTC
++++ html/index.php.in
 @@ -1,6 +1,7 @@
  <?php
 +include_once(dirname(__FILE__).'/includes/utils.inc.php');
@@ -7,5 +7,5 @@
 -$url = 'main.php';
 +$url = $cfg['cgi_base_url'].'/tac.cgi';
  
- if (isset($_GET['corewindow'])) {
+ if ("@COREWINDOW@" == "yes" && isset($_GET['corewindow'])) {
  
diff --git a/net-mgmt/nagios4/files/patch-html_main.php b/net-mgmt/nagios4/files/patch-html_main.php
index a1230b481f9b..902ac6698bac 100644
--- a/net-mgmt/nagios4/files/patch-html_main.php
+++ b/net-mgmt/nagios4/files/patch-html_main.php
@@ -1,9 +1,9 @@
---- html/main.php.orig	2016-12-07 16:31:10 UTC
+--- html/main.php.orig	2017-02-23 20:00:40 UTC
 +++ html/main.php
-@@ -130,31 +130,6 @@ $this_year = '2016';
+@@ -141,31 +141,6 @@ $this_year = '2017';
  	<div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
  	<div class="version">Version <?php echo $this_version; ?></div>
- 	<div class="releasedate">December 07, 2016</div>
+ 	<div class="releasedate">February 23, 2017</div>
 -	<div class="checkforupdates"><a href="https://www.nagios.org/checkforupdates/?version=<?php echo $this_version; ?>&amp;product=nagioscore" target="_blank">Check for updates</a></div>
 -</div>
 -
diff --git a/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in b/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in
index bb2e0837e224..8a7a2128e484 100644
--- a/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in
+++ b/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in
@@ -1,6 +1,6 @@
---- sample-config/cgi.cfg.in.orig	2016-12-07 16:31:10 UTC
+--- sample-config/cgi.cfg.in.orig	2017-02-23 20:00:40 UTC
 +++ sample-config/cgi.cfg.in
-@@ -277,7 +277,7 @@ default_statuswrl_layout=4
+@@ -270,7 +270,7 @@ default_statuswrl_layout=4
  # OS and distribution, so you may have to tweak this to
  # work on your system.
  
diff --git a/net-mgmt/nagios4/pkg-plist b/net-mgmt/nagios4/pkg-plist
index 1bf88a4f4faa..7a54645e2930 100644
--- a/net-mgmt/nagios4/pkg-plist
+++ b/net-mgmt/nagios4/pkg-plist
@@ -376,6 +376,7 @@
 %%WWWDIR%%/js/map-directive.js
 %%WWWDIR%%/js/map-form.js
 %%WWWDIR%%/js/map.js
+%%WWWDIR%%/js/nag_funcs.js
 %%WWWDIR%%/js/nagios-decorations.js
 %%WWWDIR%%/js/nagios-time.js
 %%WWWDIR%%/js/trends-form.js
@@ -404,6 +405,7 @@
 %%WWWDIR%%/stylesheets/map-directive.css
 %%WWWDIR%%/stylesheets/map.css
 %%WWWDIR%%/stylesheets/ministatus.css
+%%WWWDIR%%/stylesheets/nag_funcs.css
 %%WWWDIR%%/stylesheets/notifications.css
 %%WWWDIR%%/stylesheets/outages.css
 %%WWWDIR%%/stylesheets/showlog.css