From owner-svn-ports-all@freebsd.org Wed Apr 10 21:10:02 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9706156D204; Wed, 10 Apr 2019 21:10:02 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 455AC8B2EF; Wed, 10 Apr 2019 21:10:02 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E6591E9; Wed, 10 Apr 2019 21:10:02 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3ALA2Q4067923; Wed, 10 Apr 2019 21:10:02 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3ALA14V067918; Wed, 10 Apr 2019 21:10:01 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201904102110.x3ALA14V067918@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 10 Apr 2019 21:10:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498602 - in head/net-mgmt/cacti: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/net-mgmt/cacti: . files X-SVN-Commit-Revision: 498602 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 455AC8B2EF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 21:10:03 -0000 Author: swills Date: Wed Apr 10 21:10:00 2019 New Revision: 498602 URL: https://svnweb.freebsd.org/changeset/ports/498602 Log: net-mgmt/cacti: Update to 1.2.3 PR: 236927 Submitted by: Daniel Austin (maintainer) Modified: head/net-mgmt/cacti/Makefile (contents, props changed) head/net-mgmt/cacti/distinfo (contents, props changed) head/net-mgmt/cacti/files/patch-include__global.php (contents, props changed) head/net-mgmt/cacti/files/patch-install__functions.php (contents, props changed) head/net-mgmt/cacti/pkg-plist (contents, props changed) Modified: head/net-mgmt/cacti/Makefile ============================================================================== --- head/net-mgmt/cacti/Makefile Wed Apr 10 21:03:34 2019 (r498601) +++ head/net-mgmt/cacti/Makefile Wed Apr 10 21:10:00 2019 (r498602) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cacti -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.3 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ Modified: head/net-mgmt/cacti/distinfo ============================================================================== --- head/net-mgmt/cacti/distinfo Wed Apr 10 21:03:34 2019 (r498601) +++ head/net-mgmt/cacti/distinfo Wed Apr 10 21:10:00 2019 (r498602) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548269224 -SHA256 (cacti-1.2.1.tar.gz) = c1cd7c2417253c72e499c97a01123b1561de67aa6406dd2b687f05b7ce05309a -SIZE (cacti-1.2.1.tar.gz) = 23775742 +TIMESTAMP = 1554040180 +SHA256 (cacti-1.2.3.tar.gz) = 3bd711cb425d51defbcc6d7f5761f886822fd3d004977bb74eca202431cdf51c +SIZE (cacti-1.2.3.tar.gz) = 23977004 Modified: head/net-mgmt/cacti/files/patch-include__global.php ============================================================================== --- head/net-mgmt/cacti/files/patch-include__global.php Wed Apr 10 21:03:34 2019 (r498601) +++ head/net-mgmt/cacti/files/patch-include__global.php Wed Apr 10 21:10:00 2019 (r498602) @@ -1,6 +1,6 @@ ---- include/global.php.orig 2019-01-03 02:14:26 UTC +--- include/global.php.orig 2019-03-30 23:40:22 UTC +++ include/global.php -@@ -173,7 +173,7 @@ if ($config['cacti_server_os'] == 'win32') { +@@ -216,7 +216,7 @@ if ($config['cacti_server_os'] == 'win32') { $config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__)); } $config['include_path'] = dirname(__FILE__); Modified: head/net-mgmt/cacti/files/patch-install__functions.php ============================================================================== --- head/net-mgmt/cacti/files/patch-install__functions.php Wed Apr 10 21:03:34 2019 (r498601) +++ head/net-mgmt/cacti/files/patch-install__functions.php Wed Apr 10 21:10:00 2019 (r498602) @@ -1,11 +1,11 @@ ---- install/functions.php.orig 2019-01-03 02:14:26 UTC +--- install/functions.php.orig 2019-03-30 23:40:23 UTC +++ install/functions.php -@@ -528,7 +528,7 @@ function install_file_paths() { - /* log file path */ - $input['path_cactilog'] = $settings['path']['path_cactilog']; - if (empty($input['path_cactilog']['default'])) { -- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log'; -+ $input['path_cactilog']['default'] = '/var/log/cacti/log'; - } - - /* stderr log file path */ +@@ -533,7 +533,7 @@ function install_file_paths() { + if (!config_value_exists('path_cactilog')) { + $input['path_cactilog'] = $settings['path']['path_cactilog']; + if (empty($input['path_cactilog']['default'])) { +- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log'; ++ $input['path_cactilog']['default'] = '/var/log/cacti/log'; + } + } else { + $input['path_cactilog'] = $settings['path']['path_cactilog']; Modified: head/net-mgmt/cacti/pkg-plist ============================================================================== --- head/net-mgmt/cacti/pkg-plist Wed Apr 10 21:03:34 2019 (r498601) +++ head/net-mgmt/cacti/pkg-plist Wed Apr 10 21:10:00 2019 (r498602) @@ -1635,10 +1635,13 @@ %%CACTIDIR%%/include/vendor/index.php %%CACTIDIR%%/include/vendor/phpgettext/gettext.php %%CACTIDIR%%/include/vendor/phpgettext/streams.php +%%CACTIDIR%%/include/vendor/phpmailer/COMMITMENT %%CACTIDIR%%/include/vendor/phpmailer/LICENSE %%CACTIDIR%%/include/vendor/phpmailer/README.md %%CACTIDIR%%/include/vendor/phpmailer/SECURITY.md %%CACTIDIR%%/include/vendor/phpmailer/VERSION +%%CACTIDIR%%/include/vendor/phpmailer/composer.json +%%CACTIDIR%%/include/vendor/phpmailer/get_oauth_token.php %%CACTIDIR%%/include/vendor/phpmailer/index.php %%CACTIDIR%%/include/vendor/phpmailer/language/index.php %%CACTIDIR%%/include/vendor/phpmailer/language/phpmailer.lang-am.php @@ -1738,6 +1741,7 @@ %%CACTIDIR%%/install/install.js %%CACTIDIR%%/install/install.php %%CACTIDIR%%/install/step_json.php +%%CACTIDIR%%/install/templates/Cacti_Stats.xml.gz %%CACTIDIR%%/install/templates/Generic_SNMP_Device.xml.gz %%CACTIDIR%%/install/templates/Local_Linux_Machine.xml.gz %%CACTIDIR%%/install/templates/NetSNMP_Device.xml.gz @@ -1782,6 +1786,8 @@ %%CACTIDIR%%/install/upgrades/1_1_37.php %%CACTIDIR%%/install/upgrades/1_2_0.php %%CACTIDIR%%/install/upgrades/1_2_1.php +%%CACTIDIR%%/install/upgrades/1_2_2.php +%%CACTIDIR%%/install/upgrades/1_2_3.php %%CACTIDIR%%/install/upgrades/index.php %%CACTIDIR%%/lib/aggregate.php %%CACTIDIR%%/lib/api_aggregate.php @@ -1803,6 +1809,7 @@ %%CACTIDIR%%/lib/export.php %%CACTIDIR%%/lib/functions.php %%CACTIDIR%%/lib/graph_variables.php +%%CACTIDIR%%/lib/graphs.php %%CACTIDIR%%/lib/html.php %%CACTIDIR%%/lib/html_filter.php %%CACTIDIR%%/lib/html_form.php @@ -1882,6 +1889,7 @@ %%CACTIDIR%%/locales/po/vi-VN.po %%CACTIDIR%%/locales/po/zh-CN.po %%CACTIDIR%%/locales/po/zh-TW.po +%%CACTIDIR%%/locales/update-pot.sh %%CACTIDIR%%/logout.php %%CACTIDIR%%/managers.php %%CACTIDIR%%/mibs/CACTI-BOOST-MIB @@ -1936,6 +1944,7 @@ %%CACTIDIR%%/scripts/ss_fping.php %%CACTIDIR%%/scripts/ss_host_cpu.php %%CACTIDIR%%/scripts/ss_host_disk.php +%%CACTIDIR%%/scripts/ss_hstats.php %%CACTIDIR%%/scripts/ss_net_snmp_disk_bytes.php %%CACTIDIR%%/scripts/ss_net_snmp_disk_io.php %%CACTIDIR%%/scripts/ss_sql.php