Date: Tue, 2 May 2017 10:46:38 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439938 - in head/net-mgmt/nagios4: . files Message-ID: <201705021046.v42AkcD5007666@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue May 2 10:46:37 2017 New Revision: 439938 URL: https://svnweb.freebsd.org/changeset/ports/439938 Log: Update to 4.3.1. Sponsored by: Absolight Added: head/net-mgmt/nagios4/files/patch-html_index.php.in (contents, props changed) - copied, changed from r439937, head/net-mgmt/nagios4/files/patch-html_index.php Deleted: head/net-mgmt/nagios4/files/patch-html_index.php Modified: head/net-mgmt/nagios4/Makefile (contents, props changed) head/net-mgmt/nagios4/distinfo (contents, props changed) head/net-mgmt/nagios4/files/patch-configure (contents, props changed) head/net-mgmt/nagios4/files/patch-html_main.php (contents, props changed) head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in (contents, props changed) head/net-mgmt/nagios4/pkg-plist (contents, props changed) Modified: head/net-mgmt/nagios4/Makefile ============================================================================== --- head/net-mgmt/nagios4/Makefile Tue May 2 10:46:27 2017 (r439937) +++ head/net-mgmt/nagios4/Makefile Tue May 2 10:46:37 2017 (r439938) @@ -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= Modified: head/net-mgmt/nagios4/distinfo ============================================================================== --- head/net-mgmt/nagios4/distinfo Tue May 2 10:46:27 2017 (r439937) +++ head/net-mgmt/nagios4/distinfo Tue May 2 10:46:37 2017 (r439938) @@ -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 Modified: head/net-mgmt/nagios4/files/patch-configure ============================================================================== --- head/net-mgmt/nagios4/files/patch-configure Tue May 2 10:46:27 2017 (r439937) +++ head/net-mgmt/nagios4/files/patch-configure Tue May 2 10:46:37 2017 (r439938) @@ -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 Copied and modified: head/net-mgmt/nagios4/files/patch-html_index.php.in (from r439937, head/net-mgmt/nagios4/files/patch-html_index.php) ============================================================================== --- head/net-mgmt/nagios4/files/patch-html_index.php Tue May 2 10:46:27 2017 (r439937, copy source) +++ head/net-mgmt/nagios4/files/patch-html_index.php.in Tue May 2 10:46:37 2017 (r439938) @@ -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'])) { Modified: head/net-mgmt/nagios4/files/patch-html_main.php ============================================================================== --- head/net-mgmt/nagios4/files/patch-html_main.php Tue May 2 10:46:27 2017 (r439937) +++ head/net-mgmt/nagios4/files/patch-html_main.php Tue May 2 10:46:37 2017 (r439938) @@ -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;">®</span></sup> Core<sup><span style="font-size: small;">™</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; ?>&product=nagioscore" target="_blank">Check for updates</a></div> -</div> - Modified: head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in ============================================================================== --- head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in Tue May 2 10:46:27 2017 (r439937) +++ head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in Tue May 2 10:46:37 2017 (r439938) @@ -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. Modified: head/net-mgmt/nagios4/pkg-plist ============================================================================== --- head/net-mgmt/nagios4/pkg-plist Tue May 2 10:46:27 2017 (r439937) +++ head/net-mgmt/nagios4/pkg-plist Tue May 2 10:46:37 2017 (r439938) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705021046.v42AkcD5007666>