Date: Wed, 27 Jun 2018 10:26:31 +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: r473428 - in head/net-mgmt/nagios4: . files Message-ID: <201806271026.w5RAQVeO070778@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Jun 27 10:26:31 2018 New Revision: 473428 URL: https://svnweb.freebsd.org/changeset/ports/473428 Log: Update to 4.4.1. Sponsored by: Absolight 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_template-object_localhost.cfg.in (contents, props changed) head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.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 Wed Jun 27 09:37:15 2018 (r473427) +++ head/net-mgmt/nagios4/Makefile Wed Jun 27 10:26:31 2018 (r473428) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= nagios -PORTVERSION= 4.3.4 -PORTREVISION= 1 +PORTVERSION= 4.4.1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://assets.nagios.com/downloads/nagioscore/releases/ \ Modified: head/net-mgmt/nagios4/distinfo ============================================================================== --- head/net-mgmt/nagios4/distinfo Wed Jun 27 09:37:15 2018 (r473427) +++ head/net-mgmt/nagios4/distinfo Wed Jun 27 10:26:31 2018 (r473428) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505214102 -SHA256 (nagios-4.3.4.tar.gz) = c90b7812d9e343db12be19a572e15c415c5d6353a91c5e226e432c2d4aaa44f1 -SIZE (nagios-4.3.4.tar.gz) = 11101966 +TIMESTAMP = 1530092766 +SHA256 (nagios-4.4.1.tar.gz) = d8225d9276c65095a9d2259901a833af36410f9eb52ccfdfb1e5ae2cb9920948 +SIZE (nagios-4.4.1.tar.gz) = 11296403 Modified: head/net-mgmt/nagios4/files/patch-configure ============================================================================== --- head/net-mgmt/nagios4/files/patch-configure Wed Jun 27 09:37:15 2018 (r473427) +++ head/net-mgmt/nagios4/files/patch-configure Wed Jun 27 10:26:31 2018 (r473428) @@ -1,6 +1,6 @@ ---- configure.orig 2017-08-24 21:43:48 UTC +--- configure.orig 2018-06-25 21:25:22 UTC +++ configure -@@ -4777,7 +4777,6 @@ cat >>confdefs.h <<_ACEOF +@@ -6240,7 +6240,6 @@ cat >>confdefs.h <<_ACEOF #define DEFAULT_NAGIOS_GROUP "$nagios_grp" _ACEOF @@ -8,7 +8,7 @@ -@@ -4798,7 +4797,6 @@ fi +@@ -6267,7 +6266,6 @@ fi Modified: head/net-mgmt/nagios4/files/patch-html_main.php ============================================================================== --- head/net-mgmt/nagios4/files/patch-html_main.php Wed Jun 27 09:37:15 2018 (r473427) +++ head/net-mgmt/nagios4/files/patch-html_main.php Wed Jun 27 10:26:31 2018 (r473428) @@ -1,9 +1,9 @@ ---- html/main.php.orig 2017-08-24 21:43:48 UTC +--- html/main.php.orig 2018-06-25 21:25:22 UTC +++ html/main.php -@@ -141,31 +141,6 @@ $this_year = '2017'; +@@ -146,31 +146,6 @@ $this_year = '2018'; <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">August 24, 2017</div> + <div class="releasedate">June 25, 2018</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_template-object_localhost.cfg.in ============================================================================== --- head/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in Wed Jun 27 09:37:15 2018 (r473427) +++ head/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in Wed Jun 27 10:26:31 2018 (r473428) @@ -1,40 +1,39 @@ ---- sample-config/template-object/localhost.cfg.in.orig 2014-08-12 15:00:01 UTC +--- sample-config/template-object/localhost.cfg.in.orig 2018-06-25 21:25:22 UTC +++ sample-config/template-object/localhost.cfg.in @@ -4,7 +4,7 @@ # - # NOTE: This config file is intended to serve as an *extremely* simple + # NOTE: This config file is intended to serve as an *extremely* simple # example of how you can create configuration entries to monitor -# the local (Linux) machine. +# the local (FreeBSD) machine. # ############################################################################### -@@ -22,9 +22,9 @@ - # Define a host for the local machine +@@ -20,9 +20,9 @@ - define host{ -- use linux-server ; Name of host template to use -+ use freebsd-server ; Name of host template to use - ; This host definition will inherit all variables that are defined -- ; in (or inherited by) the linux-server host template definition. -+ ; in (or inherited by) the freebsd-server host template definition. - host_name localhost - alias localhost - address 127.0.0.1 -@@ -40,12 +40,12 @@ define host{ + define host { + +- use linux-server ; Name of host template to use ++ use freebsd-server ; Name of host template to use + ; This host definition will inherit all variables that are defined +- ; in (or inherited by) the linux-server host template definition. ++ ; in (or inherited by) the freebsd-server host template definition. + host_name localhost + alias localhost + address 127.0.0.1 +@@ -36,12 +36,12 @@ define host { + # ############################################################################### - ############################################################################### -# Define an optional hostgroup for Linux machines +# Define an optional hostgroup for FreeBSD machines - define hostgroup{ -- hostgroup_name linux-servers ; The name of the hostgroup -- alias Linux Servers ; Long name of the group -- members localhost ; Comma separated list of hosts that belong to this group -+ hostgroup_name freebsd-servers ; The name of the hostgroup -+ alias FreeBSD Servers ; Long name of the group -+ members localhost ; Comma separated list of hosts that belong to this group - } + define hostgroup { +- hostgroup_name linux-servers ; The name of the hostgroup +- alias Linux Servers ; Long name of the group ++ hostgroup_name freebsd-servers ; The name of the hostgroup ++ alias FreeBSD Servers ; Long name of the group + members localhost ; Comma separated list of hosts that belong to this group + } Modified: head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in ============================================================================== --- head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in Wed Jun 27 09:37:15 2018 (r473427) +++ head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in Wed Jun 27 10:26:31 2018 (r473428) @@ -1,26 +1,28 @@ ---- sample-config/template-object/templates.cfg.in.orig 2014-08-12 15:00:01 UTC +--- sample-config/template-object/templates.cfg.in.orig 2018-06-25 21:25:22 UTC +++ sample-config/template-object/templates.cfg.in -@@ -61,17 +61,17 @@ define host{ - } +@@ -61,19 +61,19 @@ define host { --# Linux host definition template - This is NOT a real host, just a template! -+# FreeBSD host definition template - This is NOT a real host, just a template! - define host{ -- name linux-server ; The name of this host template -+ name freebsd-server ; The name of this host template - use generic-host ; This template inherits other values from the generic-host template -- check_period 24x7 ; By default, Linux hosts are checked round the clock -+ check_period 24x7 ; By default, FreeBSD hosts are checked round the clock - check_interval 5 ; Actively check the host every 5 minutes - retry_interval 1 ; Schedule host check retries at 1 minute intervals -- max_check_attempts 10 ; Check each Linux host 10 times (max) -- check_command check-host-alive ; Default command to check Linux hosts -- notification_period workhours ; Linux admins hate to be woken up, so we only notify during the day -+ max_check_attempts 10 ; Check each FreeBSD host 10 times (max) -+ check_command check-host-alive ; Default command to check FreeBSD hosts -+ notification_period workhours ; FreeBSD admins hate to be woken up, so we only notify during the day - ; Note that the notification_period variable is being overridden from - ; the value that is inherited from the generic-host template! - notification_interval 120 ; Resend notifications every 2 hours +-# Linux host definition template ++# FreeBSD host definition template + # This is NOT a real host, just a template! + + define host { + +- name linux-server ; The name of this host template ++ name freebsd-server ; The name of this host template + use generic-host ; This template inherits other values from the generic-host template +- check_period 24x7 ; By default, Linux hosts are checked round the clock ++ check_period 24x7 ; By default, FreeBSD hosts are checked round the clock + check_interval 5 ; Actively check the host every 5 minutes + retry_interval 1 ; Schedule host check retries at 1 minute intervals +- max_check_attempts 10 ; Check each Linux host 10 times (max) +- check_command check-host-alive ; Default command to check Linux hosts +- notification_period workhours ; Linux admins hate to be woken up, so we only notify during the day ++ max_check_attempts 10 ; Check each FreeBSD host 10 times (max) ++ check_command check-host-alive ; Default command to check FreeBSD hosts ++ notification_period workhours ; FreeBSD admins hate to be woken up, so we only notify during the day + ; Note that the notification_period variable is being overridden from + ; the value that is inherited from the generic-host template! + notification_interval 120 ; Resend notifications every 2 hours Modified: head/net-mgmt/nagios4/pkg-plist ============================================================================== --- head/net-mgmt/nagios4/pkg-plist Wed Jun 27 09:37:15 2018 (r473427) +++ head/net-mgmt/nagios4/pkg-plist Wed Jun 27 10:26:31 2018 (r473428) @@ -13,10 +13,10 @@ @(,%%NAGIOSGROUP%%,) %%ETCDIR%%/resource.cfg-sample %%WWWDIR%%/angularjs/angular-1.3.9/angular.min.js %%WWWDIR%%/angularjs/angular-1.3.9/angular.min.js.map -%%WWWDIR%%/angularjs/ui-bootstrap-tpls-0.12.0.min.js -%%WWWDIR%%/angularjs/ui-utils-0.2.1/ui-utils.js -%%WWWDIR%%/bootstrap-3.3.0/css/bootstrap-theme.min.css -%%WWWDIR%%/bootstrap-3.3.0/css/bootstrap.min.css +%%WWWDIR%%/angularjs/ui-bootstrap-tpls-0.14.3.min.js +%%WWWDIR%%/angularjs/ui-utils-0.2.3/ui-utils.js +%%WWWDIR%%/bootstrap-3.3.7/css/bootstrap-theme.min.css +%%WWWDIR%%/bootstrap-3.3.7/css/bootstrap.min.css %%WWWDIR%%/cgi-bin/archivejson.cgi %%WWWDIR%%/cgi-bin/avail.cgi %%WWWDIR%%/cgi-bin/cmd.cgi @@ -371,7 +371,7 @@ %%WWWDIR%%/js/histogram-form.js %%WWWDIR%%/js/histogram-graph.js %%WWWDIR%%/js/histogram.js -%%WWWDIR%%/js/jquery-1.7.1.min.js +%%WWWDIR%%/js/jquery-1.12.4.min.js %%WWWDIR%%/js/jsonquery.js %%WWWDIR%%/js/map-directive.js %%WWWDIR%%/js/map-form.js
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806271026.w5RAQVeO070778>