packages: cacti/cacti-PA.patch, cacti/cacti.spec - adjust PA patch for curr...

[glen]

Author: glen                         Date: Mon Dec 13 10:06:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjust PA patch for current patchset

---- Files affected:
packages/cacti:
   cacti-PA.patch (1.4 -> 1.5) , cacti.spec (1.132 -> 1.133) 

---- Diffs:

================================================================
Index: packages/cacti/cacti-PA.patch
diff -u packages/cacti/cacti-PA.patch:1.4 packages/cacti/cacti-PA.patch:1.5
--- packages/cacti/cacti-PA.patch:1.4	Tue Jul 13 18:25:36 2010
+++ packages/cacti/cacti-PA.patch	Mon Dec 13 11:06:01 2010
@@ -144,9 +144,8 @@
  	</form>
  </body>
  </html>
-diff -Naur cacti-0.8.7g-old/data_sources.php cacti-0.8.7g/data_sources.php
---- cacti-0.8.7g-old/data_sources.php	2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g/data_sources.php	2010-07-09 18:34:11.000000000 -0400
+--- cacti-0.8.7g/data_sources.php~	2010-12-13 11:59:32.000000000 +0200
++++ cacti-0.8.7g/data_sources.php	2010-12-13 12:00:13.152496733 +0200
 @@ -44,6 +44,8 @@
  	7 => "Disable"
  	);
@@ -198,14 +197,14 @@
  }
  
  function get_poller_interval($seconds) {
-@@ -1310,6 +1323,7 @@
+@@ -1323,6 +1323,7 @@
  	$i = 0;
  	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"]));
 diff -Naur cacti-0.8.7g-old/graph_image.php cacti-0.8.7g/graph_image.php
 --- cacti-0.8.7g-old/graph_image.php	2010-07-09 18:33:46.000000000 -0400
 +++ cacti-0.8.7g/graph_image.php	2010-07-09 18:34:11.000000000 -0400
@@ -374,7 +373,6 @@
  }
  
  function host() {
-\ No newline at end of file
 diff -Naur cacti-0.8.7g-old/include/auth.php cacti-0.8.7g/include/auth.php
 --- cacti-0.8.7g-old/include/auth.php	2010-07-09 18:33:46.000000000 -0400
 +++ cacti-0.8.7g/include/auth.php	2010-07-09 18:34:11.000000000 -0400
@@ -2331,18 +2329,6 @@
  		/* Populate each execution file with appropriate information */
  		foreach ($polling_hosts as $item) {
  			if ($host_count == 1) {
-@@ -446,9 +450,11 @@
- 
- 		/* 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");
 @@ -495,4 +501,6 @@
  	echo "    --debug|-d     Output debug information.  Similar to cacti's DEBUG logging level.\n\n";
  }

================================================================
Index: packages/cacti/cacti.spec
diff -u packages/cacti/cacti.spec:1.132 packages/cacti/cacti.spec:1.133
--- packages/cacti/cacti.spec:1.132	Mon Dec 13 10:51:27 2010
+++ packages/cacti/cacti.spec	Mon Dec 13 11:06:01 2010
@@ -20,7 +20,7 @@
 Source5:	%{name}-rrdpath.sql
 Source6:	%{name}-pa.sql
 Source7:	%{name}.logrotate
-# http://cactiusers.org/wiki/PluginArchitectureInstall
+# http://docs.cacti.net/manual:087:1_installation.9_pia
 # http://mirror.cactiusers.org/downloads/plugins/cacti-plugin-0.8.7g-PA-v2.8.tar.gz
 Patch0:		%{name}-PA.patch
 Patch1:		%{name}-config.patch
@@ -153,11 +153,9 @@
 cp %{SOURCE5} sql
 cp %{SOURCE6} sql
 
-%{__rm} -r cacti-plugin-arch
 %{__rm} -r lib/adodb
 %{__rm} log/.htaccess
 %{__rm} cli/.htaccess
-%{__rm} rra/.placeholder
 %{__rm} rra/.htaccess
 
 # must require libs to get fatals on missing files, not include
@@ -286,6 +284,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2010/12/13 10:06:01  glen
+- adjust PA patch for current patchset
+
 Revision 1.132  2010/12/13 09:51:27  glen
 - original patches came first, pa patch needs update
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/cacti-PA.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/cacti.spec?r1=1.132&r2=1.133&f=u