Up to 1.2.26

diff --git a/cacti-config.patch b/cacti-config.patch
index 791d897b39bd01f39e6f1c1552f563b52b45120e..3f35eac0c11cdeba6947d03c032a6015fc264df2 100644 (file)
--- a/cacti-config.patch
+++ b/cacti-config.patch
@@ -1,7 +1,7 @@
---- cacti-0.8.7b/include/global.php    2008-10-05 04:38:29.740276226 +0300
-+++ cacti-0.8.7g/include/global.php    2010-12-13 12:10:44.312310245 +0200
-@@ -83,13 +83,7 @@ $disable_log_rotation = false;
- ini_set('max_input_vars', '5000');
+--- cacti-1.2.26/include/global.php~   2023-12-24 03:17:14.000000000 +0100
++++ cacti-1.2.26/include/global.php    2024-02-28 13:34:23.293235210 +0100
+@@ -81,13 +81,7 @@ $disable_log_rotation = false;
+ 
  $config = array();
  
 -/* Include configuration, or use the defaults */
@@ -15,19 +15,18 @@
  
  if (isset($config['cacti_version'])) {
        die('Invalid include/config.php file detected.' . PHP_EOL);
-@@ -139,7 +139,8 @@ if ($config['cacti_server_os'] == 'win32
-       $config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
+@@ -238,7 +232,7 @@ if ($config['cacti_server_os'] == 'win32
  }
+ 
  $config['include_path'] = dirname(__FILE__);
 -$config['rra_path'] = $config['base_path'] . '/rra';
 +$config["rra_path"] = '/var/lib/cacti/rra';
-+$config["path_cactilog"] = '/var/log/cacti/cacti.log';
  
  /* for multiple pollers, we need to know this location */
  if (!isset($scripts_path)) {
---- cacti-0.8.7g/include/config.php~   2010-12-13 12:15:08.000000000 +0200
-+++ cacti-0.8.7g/include/config.php    2010-12-13 12:16:09.275611204 +0200
-@@ -27,8 +27,8 @@
+--- cacti-1.2.26/include/config.php~   2023-12-24 03:17:14.000000000 +0100
++++ cacti-1.2.26/include/config.php    2024-02-28 13:35:19.813235204 +0100
+@@ -29,8 +29,8 @@
  $database_type     = 'mysql';
  $database_default  = 'cacti';
  $database_hostname = 'localhost';
@@ -36,20 +35,19 @@
 +$database_username = 'mysql';
 +$database_password = '';
  $database_port     = '3306';
+ $database_retries  = 5;
  $database_ssl      = false;
+--- cacti-1.2.26/poller.php~   2023-12-24 03:17:14.000000000 +0100
++++ cacti-1.2.26/poller.php    2024-02-28 13:36:02.066568538 +0100
+@@ -31,7 +31,7 @@ if (function_exists('pcntl_async_signals
  
---- cacti/poller.php~  2017-08-28 05:48:36.000000000 +0200
-+++ cacti/poller.php   2017-08-31 08:39:19.780902180 +0200
-@@ -26,7 +26,7 @@
- /* tick use required as of PHP 4.3.0 to accomodate signal handling */
- declare(ticks = 1);
+ ini_set('output_buffering', 'Off');
  
 -require(__DIR__ . '/include/cli_check.php');
 +require('/usr/share/cacti/include/cli_check.php');
  require_once($config['base_path'] . '/lib/poller.php');
  require_once($config['base_path'] . '/lib/data_query.php');
  require_once($config['base_path'] . '/lib/rrd.php');
-
 diff -ur cacti-1.2.6.org/install/functions.php cacti-1.2.6/install/functions.php
 --- cacti-1.2.6.org/install/functions.php      2019-09-02 10:23:43.000000000 +0200
 +++ cacti-1.2.6/install/functions.php  2019-09-26 11:19:59.780907049 +0200
@@ -64,23 +62,23 @@ diff -ur cacti-1.2.6.org/install/functions.php cacti-1.2.6/install/functions.php
        }
  }
  
-diff -ur cacti-1.2.6.org/lib/installer.php cacti-1.2.6/lib/installer.php
---- cacti-1.2.6.org/lib/installer.php  2019-09-02 10:23:43.000000000 +0200
-+++ cacti-1.2.6/lib/installer.php      2019-09-26 11:20:54.749208954 +0200
-@@ -465,7 +465,6 @@
+--- cacti-1.2.26/lib/installer.php~    2023-12-24 03:17:14.000000000 +0100
++++ cacti-1.2.26/lib/installer.php     2024-02-28 13:37:29.589901867 +0100
+@@ -528,7 +528,6 @@ class Installer implements JsonSerializa
  
                $always_paths = array(
-                       sys_get_temp_dir(),
--                      $config['base_path'] . '/log',
-                       $config['base_path'] . '/cache/boost',
-                       $config['base_path'] . '/cache/mibcache',
-                       $config['base_path'] . '/cache/realtime',
-@@ -3216,7 +3215,7 @@
-               global $config;
+                       'sys_temp'  => sys_get_temp_dir(),
+-                      'log'       => $config['base_path'] . '/log',
+                       'boost'     => $config['base_path'] . '/cache/boost',
+                       'mibcache'  => $config['base_path'] . '/cache/mibcache',
+                       'realtime'  => $config['base_path'] . '/cache/realtime',
+@@ -3539,7 +3538,7 @@ class Installer implements JsonSerializa
  
                $page_nr = 1;
+               $total_rows = 500;
 -              $logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , $page_nr, $total_rows);
-+              $logcontents = tail_file('/var/log/cacti/cacti.log', 100, -1, ' INSTALL:' , $page_nr, $total_rows);
++                $logcontents = tail_file('/var/log/cacti/cacti.log', 100, -1, ' INSTALL:' , $page_nr, $total_rows);
  
                $output_log = '';
                foreach ($logcontents as $logline) {
+

diff --git a/cacti-log-verbosity.patch b/cacti-log-verbosity.patch
index b3478ff53e3993a8acf7f36ef63d93fc543ec576..12604abfd3fb49cabcc21b746c68330057208fa0 100644 (file)
--- a/cacti-log-verbosity.patch
+++ b/cacti-log-verbosity.patch
@@ -1,13 +1,14 @@
---- cacti-0.8.7b/poller.php~   2008-10-05 16:58:33.000000000 +0300
-+++ cacti-0.8.7b/poller.php    2008-10-05 17:45:53.825952709 +0300
-@@ -665,7 +665,8 @@ function log_cacti_stats($loop_start, $m
+--- cacti-1.2.26/poller.php~   2024-02-28 13:37:51.000000000 +0100
++++ cacti-1.2.26/poller.php    2024-02-28 13:38:33.309901864 +0100
+@@ -1093,8 +1093,9 @@ function log_cacti_stats($loop_start, $m
+               $rrds_processed
        );
  
-       $cacti_stats = vsprintf('Time:%01.4f Method:%s Processes:%s Threads:%s Hosts:%s HostsPerProcess:%s DataSources:%s RRDsProcessed:%s', $perf_data);
+-      $cacti_stats = vsprintf('Time:%01.4f Method:%s Processes:%s Threads:%s Hosts:%s HostsPerProcess:%s DataSources:%s RRDsProcessed:%s', $perf_data);
 -      cacti_log('STATS: ' . $cacti_stats , true, 'SYSTEM');
-+      if (read_config_option('log_verbosity') > POLLER_VERBOSITY_NONE)
-+              cacti_log('STATS: ' . $cacti_stats , true, 'SYSTEM');
++        $cacti_stats = vsprintf('Time:%01.4f Method:%s Processes:%s Threads:%s Hosts:%s HostsPerProcess:%s DataSources:%s RRDsProcessed:%s', $perf_data);
++        if (read_config_option('log_verbosity') > POLLER_VERBOSITY_NONE)
++          cacti_log('STATS: ' . $cacti_stats , true, 'SYSTEM');
  
-       /* insert poller stats into the settings table */
-       db_execute_prepared('REPLACE INTO settings (name, value) VALUES ("stats_poller",?)', array($cacti_stats));
-
+       // insert poller stats into the settings table
+       if ($poller_id > 1) {

diff --git a/cacti.spec b/cacti.spec
index 58e9df348525ebd5ecf6024525078f0e9c8871ae..620548dc96a40389f2b9a15899d5fc6fe54bc25a 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -3,12 +3,12 @@
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
-Version:       1.2.16
+Version:       1.2.26
 Release:       1
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 1fd84fdf4b3ef87c859678611d487145
+# Source0-md5: 53043d8279640a074cc054c7b156375d
 Source2:       %{name}.crontab
 Source3:       %{name}-apache.conf
 Source4:       %{name}-lighttpd.conf