From cba651ff9145eaebfbf24e451edd569e22aa6136 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 2 May 2017 10:46:37 +0000 Subject: Update to 4.3.1. Sponsored by: Absolight --- net-mgmt/nagios4/Makefile | 6 ++++-- net-mgmt/nagios4/distinfo | 6 +++--- net-mgmt/nagios4/files/patch-configure | 6 +++--- net-mgmt/nagios4/files/patch-html_index.php | 11 ----------- net-mgmt/nagios4/files/patch-html_index.php.in | 11 +++++++++++ net-mgmt/nagios4/files/patch-html_main.php | 6 +++--- net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in | 4 ++-- net-mgmt/nagios4/pkg-plist | 2 ++ 8 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 net-mgmt/nagios4/files/patch-html_index.php create mode 100644 net-mgmt/nagios4/files/patch-html_index.php.in (limited to 'net-mgmt/nagios4') 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 deleted file mode 100644 index 2be0be1b3471..000000000000 --- a/net-mgmt/nagios4/files/patch-html_index.php +++ /dev/null @@ -1,11 +0,0 @@ ---- html/index.php.orig 2016-12-07 16:31:10 UTC -+++ html/index.php -@@ -1,6 +1,7 @@ - Nagios® Core™
Version
-
December 07, 2016
+
February 23, 2017
-
Check for updates
- - 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 -- cgit