packages: cacti/cacti.spec, cacti/html_output.patch, cacti/poller_interval....

skibi skibi at pld-linux.org
Sun Oct 10 01:53:20 CEST 2010 

Author: skibi                        Date: Sat Oct  9 23:53:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Add patch from date 2010/07/27 more info http://www.cacti.net/download_patches.php

---- Files affected:
packages/cacti:
   cacti.spec (1.127 -> 1.128) , html_output.patch (1.1 -> 1.2) , poller_interval.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/cacti/cacti.spec
diff -u packages/cacti/cacti.spec:1.127 packages/cacti/cacti.spec:1.128
--- packages/cacti/cacti.spec:1.127	Wed Jul 14 12:07:51 2010
+++ packages/cacti/cacti.spec	Sun Oct 10 01:53:15 2010
@@ -31,6 +31,15 @@
 Patch7:		%{name}-ss_disk-array-indices.patch
 Patch8:		host_name-url.patch
 Patch9:		cli-relpath.patch
+# http://www.cacti.net/download_patches.php
+Patch10: 	data_source_deactivate.patch
+Patch11: 	graph_list_view.patch
+Patch12: 	html_output.patch
+Patch13: 	ldap_group_authenication.patch
+Patch14: 	script_server_command_line_parse.patch
+Patch15: 	ping.patch
+Patch16: 	poller_interval.patch
+
 URL:		http://www.cacti.net/
 BuildRequires:	rpm-perlprov
 BuildRequires:	sed >= 4.0
@@ -118,6 +127,14 @@
 %prep
 %setup -q
 %{?with_pa:%patch0 -p1}
+%patch10 -p1 
+%patch11 -p1 
+%patch12 -p1 
+%patch13 -p1 
+%patch14 -p1 
+%patch15 -p1 
+%patch16 -p1 
+
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -265,6 +282,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2010/10/09 23:53:15  skibi
+- Add patch from date 2010/07/27 more info http://www.cacti.net/download_patches.php
+
 Revision 1.127  2010/07/14 10:07:51  glen
 - release 2
 

================================================================
Index: packages/cacti/html_output.patch
diff -u packages/cacti/html_output.patch:1.1 packages/cacti/html_output.patch:1.2
--- packages/cacti/html_output.patch:1.1	Sun Oct 10 01:16:59 2010
+++ packages/cacti/html_output.patch	Sun Oct 10 01:53:15 2010
@@ -30,16 +30,17 @@
  					" . ((!empty($_GET["id"]) && (empty($data_template["id"]))) ? "<strong><a class='linkOverDark' href='" . htmlspecialchars("data_sources.php?action=rrd_add&id=" . $_GET["id"]) . "'>New</a>&nbsp;</strong>" : "") . "
  				</td>
  			</tr>\n";
-@@ -1310,16 +1310,17 @@
- 	$i = 0;
+@@ -1324,16 +1324,17 @@
  	if (sizeof($data_sources) > 0) {
  		foreach ($data_sources as $data_source) {
+ 			$data_source = api_plugin_hook_function('data_sources_table', $data_source);
 -			$data_template_name = ((empty($data_source["data_template_name"])) ? "<em>None</em>" : $data_source["data_template_name"]);
 -			$data_input_name    = ((empty($data_source["data_input_name"])) ? "<em>External</em>" : $data_source["data_input_name"]);
+-			$poller_interval    = ((isset($poller_intervals[$data_source["local_data_id"]])) ? $poller_intervals[$data_source["local_data_id"]] : 0);
 +			/* we're escaping strings here, so no need to escape them on form_selectable_cell */
-+			$data_template_name = ((empty($data_source["data_template_name"])) ? "<em>None</em>" : htmlspecialchars($data_source["data_template_name"]));
-+			$data_input_name    = ((empty($data_source["data_input_name"])) ? "<em>External</em>" : htmlspecialchars($data_source["data_input_name"]));
- 			$poller_interval    = ((isset($poller_intervals[$data_source["local_data_id"]])) ? $poller_intervals[$data_source["local_data_id"]] : 0);
++			$data_template_name = ((empty($data_source["data_template_name"])) ? "<em>None</em>": htmlspecialchars($data_source["data_template_name"]));
++			$data_input_name    = ((empty($data_source["data_input_name"])) ? "<em>External</em>": htmlspecialchars($data_source["data_input_name"]));
++ 			$poller_interval    = ((isset($poller_intervals[$data_source["local_data_id"]])) ? $poller_intervals[$data_source["local_data_id"]] : 0);
  			form_alternate_row_color($colors["alternate"], $colors["light"], $i, 'line' . $data_source["local_data_id"]); $i++;
  			form_selectable_cell("<a class='linkEditMain' href='" . htmlspecialchars("data_sources.php?action=ds_edit&id=" . $data_source["local_data_id"]) . "' title='" . $data_source["name_cache"] . "'>" . ((get_request_var_request("filter") != "") ? eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")", "<span style='background-color: #F8D93D;'>\\1</span>", title_trim(htmlspecialchars($data_source["name_cache"]), read_config_option("max_title_data_source"))) : title_trim(htmlspecialchars($data_source["name_cache"]), read_config_option("max_title_data_source"))) . "</a>", $data_source["local_data_id"]);
  			form_selectable_cell($data_source['local_data_id'], $data_source['local_data_id']);
@@ -69,3 +70,4 @@
  			form_selectable_cell($graph["height"] . "x" . $graph["width"], $graph["local_graph_id"]);
  			form_checkbox_cell($graph["title_cache"], $graph["local_graph_id"]);
  			form_end_row();
+

================================================================
Index: packages/cacti/poller_interval.patch
diff -u packages/cacti/poller_interval.patch:1.1 packages/cacti/poller_interval.patch:1.2
--- packages/cacti/poller_interval.patch:1.1	Sun Oct 10 01:16:59 2010
+++ packages/cacti/poller_interval.patch	Sun Oct 10 01:53:15 2010
@@ -117,7 +117,8 @@
  				}
  			}
  		}
-@@ -427,28 +426,27 @@
+
+@@ -430,29 +430,28 @@
  	$poller_runs_completed++;
  
  	/* record the start time for this loop */
@@ -132,30 +133,34 @@
 -			$sleep_time = ($poller_interval - ($loop_end - $loop_start) - $overhead_time);
 -		}else{
 -			$sleep_time = ($poller_interval -  ($loop_end - $loop_start));
-+			$sleep_time = $poller_interval - $loop_time - $overhead_time;
-+		} else {
-+			$sleep_time = $poller_interval - $loop_time;
- 		}
- 
+-		}
+-
++                       $sleep_time = $poller_interval - $loop_time - $overhead_time;
++                } else {
++                       $sleep_time = $poller_interval - $loop_time;
++                }
++		
  		/* log some nice debug information */
 -		if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_DEBUG) {
 -			echo "Loop  Time is: " . ($loop_end - $loop_start) . "\n";
 -			echo "Sleep Time is: " . $sleep_time . "\n";
 -			echo "Total Time is: " . ($loop_end - $poller_start) . "\n";
-+		if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_DEBUG || $debug) {
-+			echo "Loop  Time is: " . round($loop_time, 2) . "\n";
-+			echo "Sleep Time is: " . round($sleep_time, 2) . "\n";
-+			echo "Total Time is: " . round($loop_end - $poller_start, 2) . "\n";
++                if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_DEBUG || $debug) {
++                        echo "Loop  Time is: " . round($loop_time, 2) . "\n";
++                        echo "Sleep Time is: " . round($sleep_time, 2) . "\n";
++                        echo "Total Time is: " . round($loop_end - $poller_start, 2) . "\n";
   		}
  
  		/* sleep the appripriate amount of time */
  		if ($poller_runs_completed < $poller_runs) {
+ 			api_plugin_hook('poller_bottom');
 -			db_close();
  			usleep($sleep_time * 1000000);
 -			db_connect_real($database_hostname, $database_username, $database_password, $database_default, $database_type, $database_port);
+ 			api_plugin_hook('poller_top');
  		}
  	}else if (read_config_option('log_verbosity') >= POLLER_VERBOSITY_MEDIUM || $debug) {
- 		cacti_log("WARNING: Cacti Polling Cycle Exceeded Poller Interval by " . $loop_end-$loop_start-$poller_interval . " seconds", TRUE, "POLLER");
+
 @@ -459,7 +457,7 @@
  	$hosts_per_process, $num_polling_items, $rrds_processed) {
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/cacti.spec?r1=1.127&r2=1.128&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/html_output.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/poller_interval.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list