cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net-mgmt/cacti: Update to 1.1.36

Browse Source 
This is a bugfix release.

PR:		226334
Submitted by:	Daniel Austin <freebsd-ports@dan.me.uk> (maintainer)
Approved by:	tcberner (mentor, implicit)
This commit is contained in:
Yuri Victorovich 2018-03-04 04:11:49 +00:00
parent 450a8bea7f
commit 6d7a3eb2b1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=463550
5 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net-mgmt/cacti/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cacti
PORTVERSION= 1.1.35
PORTVERSION= 1.1.36
CATEGORIES= net-mgmt www
MASTER_SITES= http://www.cacti.net/downloads/ \
ftp://ftpmirror.uk/freebsd-ports/cacti/

6
net-mgmt/cacti/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1519043380
SHA256 (cacti-1.1.35.tar.gz) = eea42008adb699d900bd4555b0c34691389015e0c9dac43fc07e9ddb9a537ffd
SIZE (cacti-1.1.35.tar.gz) = 8999651
TIMESTAMP = 1520108099
SHA256 (cacti-1.1.36.tar.gz) = 9a9cbe54b51a4161ddc84234a7e4210dae279375fd2b1715511d426672327a11
SIZE (cacti-1.1.36.tar.gz) = 9018560

6
net-mgmt/cacti/files/patch-include__global_settings.php
View File

@ -1,10 +1,10 @@
--- include/global_settings.php.orig 2017-08-13 04:06:37 UTC
--- include/global_settings.php.orig 2018-02-26 01:12:03 UTC
+++ include/global_settings.php
@@ -144,9 +144,9 @@ $settings = array(
@@ -143,9 +143,9 @@ $settings = array(
),
'path_cactilog' => array(
'friendly_name' => __('Cacti Log Path'),
- 'description' => __('The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)'),
- 'description' => __('The path to your Cacti log file (if blank, defaults to &lt;path_cacti&gt;/log/cacti.log)'),
+ 'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'),
'method' => 'filepath',
- 'default' => $config['base_path'] . '/log/cacti.log',

16
net-mgmt/cacti/files/patch-poller_maintenance.php
View File

@ -1,19 +1,11 @@
--- poller_maintenance.php.orig 2017-08-13 04:06:37 UTC
--- poller_maintenance.php.orig 2018-02-26 01:12:04 UTC
+++ poller_maintenance.php
@@ -197,14 +197,14 @@ function logrotate_rotatenow () {
@@ -223,7 +223,7 @@ function logrotate_rotatenow () {
$log = read_config_option('path_cactilog');
if ($log == '') {
- $log = $config['base_path'] . '/log/cacti.log';
+ $log = '/var/log/cacti/log';
+ $log = /var/log/cacti/log';
}
set_config_option('logrotate_lastrun', time());
clearstatcache();
- if (is_writable(dirname($log) . '/') && is_writable($log)) {
+ if (is_writable('/var/log/cacti') && is_writable($log)) {
$perms = octdec(substr(decoct( fileperms($log) ), 2));
$owner = fileowner($log);
$group = filegroup($log);
$run_time = time();

2
net-mgmt/cacti/pkg-plist
View File

@ -436,7 +436,6 @@
%%CACTIDIR%%/include/js/pace.js
%%CACTIDIR%%/include/js/screenfull.js
%%CACTIDIR%%/include/layout.js
%%CACTIDIR%%/include/main.css
%%CACTIDIR%%/include/phpgettext/gettext.php
%%CACTIDIR%%/include/phpgettext/streams.php
%%CACTIDIR%%/include/phpmailer/LICENSE
@ -1148,6 +1147,7 @@
%%CACTIDIR%%/install/upgrades/1_1_31.php
%%CACTIDIR%%/install/upgrades/1_1_34.php
%%CACTIDIR%%/install/upgrades/1_1_35.php
%%CACTIDIR%%/install/upgrades/1_1_36.php
%%CACTIDIR%%/install/upgrades/index.php
%%CACTIDIR%%/lib/aggregate.php
%%CACTIDIR%%/lib/api_aggregate.php