- adjust PA patch for current patchset

Changed files:
    cacti-PA.patch -> 1.5
    cacti.spec -> 1.133

diff --git a/cacti-PA.patch b/cacti-PA.patch
index 8686fda640e71f7b010ace2eada16755779624ff..5871044f8c6671fd162c790459866d871460d136 100644 (file)
--- a/cacti-PA.patch
+++ b/cacti-PA.patch
@@ -144,9 +144,8 @@ diff -Naur cacti-0.8.7g-old/auth_login.php cacti-0.8.7g/auth_login.php
        </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 @@ diff -Naur cacti-0.8.7g-old/data_sources.php cacti-0.8.7g/data_sources.php
  }
  
  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 @@ diff -Naur cacti-0.8.7g-old/host.php cacti-0.8.7g/host.php
  }
  
  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 @@ diff -Naur cacti-0.8.7g-old/poller.php cacti-0.8.7g/poller.php
                /* 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";
  }

diff --git a/cacti.spec b/cacti.spec
index e99bb204c30aa7cfcbd3cec72ea59554eee5e221..0481598fc41323bd72bc831c7daae99bb7fc75cc 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -19,7 +19,7 @@ Source4:      %{name}-lighttpd.conf
 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
@@ -152,11 +152,9 @@ mv *.sql sql
 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