Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Kowis (bf5a6db53a5b365df7c1b182916014c7620d78ad)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Kowis (bf5a6db53a5b365df7c1b182916014c7620d78ad)
  • Date: Tue, 13 Feb 2007 08:22:05 -0600

GIT changes to master grimoire by David Kowis <dkowis AT shlrm.org>:

dev/null |binary
net/cacti/DETAILS | 6
net/cacti/HISTORY | 5
net/cacti/PRE_BUILD | 7
net/cacti/cacti-0.8.6h.tar.gz.sig | 0
net/cacti/fix_search_session_clear_issue.patch | 27 ---
net/cacti/fix_sql_syntax_related_to_default_rra_id.patch | 22 ---
net/cacti/mysql_5x_strict.patch | 106
---------------
net/cacti/nth_percentile_empty_return_set_issue.patch | 94 -------------
9 files changed, 8 insertions(+), 259 deletions(-)

New commits:
commit bf5a6db53a5b365df7c1b182916014c7620d78ad
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

cacti
Updating cacti to the latest version

diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index b5c0d99..2344fcc 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,9 +1,9 @@
SPELL=cacti
- VERSION=0.8.6h
+ VERSION=0.8.6j
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.cacti.net/downloads/cacti-0.8.6h.tar.gz
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_URL[0]=http://www.cacti.net/downloads/$SOURCE
+
SOURCE_HASH=sha512:74b280e870818d6be2a6deae7aa55bd945dbe1cab842e051f88ef73e4a222831f0b4268540e1d59652f50427639ba000cd2c8ff660f88a152cb043f2ffebc85d
LICENSE[0]=GPL
WEB_SITE=http://www.cacti.net
ENTERED=20060131
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 662d3df..d8c6342 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,8 @@
+2007-02-13 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: version updated to 0.8.6j
+ * *.patch: removed as they don't apply anymore
+ * PRE_BUILD: no patches to apply anymore, so removed
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/net/cacti/PRE_BUILD b/net/cacti/PRE_BUILD
deleted file mode 100755
index 7b3a7a1..0000000
--- a/net/cacti/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-
-patch -p1 < ${SCRIPT_DIRECTORY}/fix_search_session_clear_issue.patch
&&
-patch -p1 <
${SCRIPT_DIRECTORY}/fix_sql_syntax_related_to_default_rra_id.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/nth_percentile_empty_return_set_issue.patch
&&
-patch -p1 < ${SCRIPT_DIRECTORY}/mysql_5x_strict.patch

diff --git a/net/cacti/cacti-0.8.6h.tar.gz.sig
b/net/cacti/cacti-0.8.6h.tar.gz.sig
deleted file mode 100644
index a73a5ae..0000000
Binary files a/net/cacti/cacti-0.8.6h.tar.gz.sig and /dev/null differ
diff --git a/net/cacti/fix_search_session_clear_issue.patch
b/net/cacti/fix_search_session_clear_issue.patch
deleted file mode 100644
index d18759d..0000000
--- a/net/cacti/fix_search_session_clear_issue.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- cacti-0.8.6h/host.php 2006-01-03 21:08:30.000000000 -0600
-+++ cacti-fixed/host.php 2006-01-06 22:45:51.630701318 -0600
-@@ -726,18 +726,18 @@
- unset($_REQUEST["host_status"]);
- }
-
-- if (!empty($_SESSION["sess_host_status"])) {
-- if ($_SESSION["sess_host_status"] !=
$_REQUEST["host_status"]) {
-- $_REQUEST["page"] = 1;
-- }
-- }
--
- /* remember these search fields in session vars so we don't have to
keep passing them around */
- load_current_session_value("page", "sess_device_current_page", "1");
- load_current_session_value("filter", "sess_device_filter", "");
- load_current_session_value("host_template_id",
"sess_device_host_template_id", "-1");
- load_current_session_value("host_status", "sess_host_status", "-1");
-
-+ if (!empty($_SESSION["sess_host_status"])) {
-+ if ($_SESSION["sess_host_status"] !=
$_REQUEST["host_status"]) {
-+ $_REQUEST["page"] = 1;
-+ }
-+ }
-+
- html_start_box("<strong>Devices</strong>", "98%", $colors["header"],
"3", "center", "host.php?action=edit&host_template_id=" .
$_REQUEST["host_template_id"] . "&host_status=" . $_REQUEST["host_status"]);
-
- include("./include/html/inc_device_filter_table.php");
diff --git a/net/cacti/fix_sql_syntax_related_to_default_rra_id.patch
b/net/cacti/fix_sql_syntax_related_to_default_rra_id.patch
deleted file mode 100644
index e7ea792..0000000
--- a/net/cacti/fix_sql_syntax_related_to_default_rra_id.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cacti-0.8.6h/graph.php 2006-01-03 21:08:30.000000000 -0600
-+++ cacti-fixed/graph.php 2006-01-06 22:40:29.643671752 -0600
-@@ -130,13 +130,13 @@
- $timespan = -($rra["timespan"]);
-
- /* find the step and how often this graph is updated with new data */
-- $ds_step = db_fetch_cell("select
-+ $ds_step = db_fetch_cell("SELECT
- data_template_data.rrd_step
-- from
(data_template_data,data_template_rrd,graph_templates_item)
-- where graph_templates_item.task_item_id=data_template_rrd.id
-- and
data_template_rrd.local_data_id=data_template_data.local_data_id
-- and graph_templates_item.local_graph_id=" .
$_GET["local_graph_id"] .
-- "limit 0,1");
-+ FROM
(data_template_data,data_template_rrd,graph_templates_item)
-+ WHERE graph_templates_item.task_item_id=data_template_rrd.id
-+ AND
data_template_rrd.local_data_id=data_template_data.local_data_id
-+ AND graph_templates_item.local_graph_id=" .
$_GET["local_graph_id"] .
-+ " LIMIT 0,1");
- $ds_step = empty($ds_step) ? 300 : $ds_step;
- $seconds_between_graph_updates = ($ds_step * $rra["steps"]);
-
diff --git a/net/cacti/mysql_5x_strict.patch b/net/cacti/mysql_5x_strict.patch
deleted file mode 100644
index 444f1ba..0000000
--- a/net/cacti/mysql_5x_strict.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -ruBbd cacti-0.8.6h/cacti.sql cacti-0.8.6h-patched/cacti.sql
---- cacti-0.8.6h/cacti.sql 2006-01-03 22:08:30.000000000 -0500
-+++ cacti-0.8.6h-patched/cacti.sql 2006-01-25 00:16:43.000000000 -0500
-@@ -1846,7 +1846,7 @@
- avg_time decimal(10,5) default '0.00000',
- total_polls int(12) unsigned default '0',
- failed_polls int(12) unsigned default '0',
-- availability decimal(7,5) NOT NULL default '100.00000',
-+ availability decimal(8,5) NOT NULL default '100.00000',
- PRIMARY KEY (id)
- ) TYPE=MyISAM;
-
-diff -ruBbd cacti-0.8.6h/lib/auth.php cacti-0.8.6h-patched/lib/auth.php
---- cacti-0.8.6h/lib/auth.php 2006-01-03 22:08:30.000000000 -0500
-+++ cacti-0.8.6h-patched/lib/auth.php 2006-01-25 00:20:48.000000000 -0500
-@@ -40,25 +40,25 @@
- $user_auth_perms = db_fetch_assoc("select * from user_auth_perms
where user_id = '$old_id'");
- foreach ($user_auth_perms as $row) {
- $row['user_id'] = $new_id;
-- sql_save($row, 'user_auth_perms', array('user_id', 'item_id',
'type'));
-+ sql_save($row, 'user_auth_perms', array('user_id', 'item_id',
'type'), false);
- }
-
- $user_auth_realm = db_fetch_assoc("select * from user_auth_realm
where user_id = '$old_id'");
- foreach ($user_auth_realm as $row) {
- $row['user_id'] = $new_id;
-- sql_save($row, 'user_auth_realm', array('realm_id',
'user_id'));
-+ sql_save($row, 'user_auth_realm', array('realm_id',
'user_id'), false);
- }
-
- $settings_graphs = db_fetch_assoc("select * from settings_graphs
where user_id = '$old_id'");
- foreach ($settings_graphs as $row) {
- $row['user_id'] = $new_id;
-- sql_save($row, 'settings_graphs', array('user_id', 'name'));
-+ sql_save($row, 'settings_graphs', array('user_id', 'name'),
false);
- }
-
- $settings_tree = db_fetch_assoc("select * from settings_tree where
user_id = '$old_id'");
- foreach ($settings_tree as $row) {
- $row['user_id'] = $new_id;
-- sql_save($row, 'settings_tree', array('user_id',
'graph_tree_item_id'));
-+ sql_save($row, 'settings_tree', array('user_id',
'graph_tree_item_id'), false);
- }
- }
-
-diff -ruBbd cacti-0.8.6h/lib/database.php
cacti-0.8.6h-patched/lib/database.php
---- cacti-0.8.6h/lib/database.php 2006-01-03 22:08:30.000000000 -0500
-+++ cacti-0.8.6h-patched/lib/database.php 2006-01-25 00:16:43.000000000
-0500
-@@ -214,14 +214,14 @@
- @arg $table_name - the name of the table to make the replacement in
- @arg $key_cols - the primary key(s)
- @returns - the auto incriment id column (if applicable) */
--function sql_save($array_items, $table_name, $key_cols = "id") {
-+function sql_save($array_items, $table_name, $key_cols = "id", $autoinc =
TRUE) {
- global $cnn_id;
-
- while (list ($key, $value) = each ($array_items)) {
- $array_items[$key] = "\"" . sql_sanitize($value) . "\"";
- }
-
-- if (!$cnn_id->Replace($table_name, $array_items, $key_cols, false)) {
return 0; }
-+ if (!$cnn_id->Replace($table_name, $array_items, $key_cols, FALSE,
$autoinc)) { return 0; }
-
- /* get the last AUTO_ID and return it */
- if ($cnn_id->Insert_ID() == "0") {
-diff -ruBbd cacti-0.8.6h/lib/import.php cacti-0.8.6h-patched/lib/import.php
---- cacti-0.8.6h/lib/import.php 2006-01-03 22:08:30.000000000 -0500
-+++ cacti-0.8.6h-patched/lib/import.php 2006-01-25 00:21:16.000000000
-0500
-@@ -341,7 +341,7 @@
- $save["t_value"] = $item_array["t_value"];
- $save["value"] =
addslashes(xml_character_decode($item_array["value"]));
-
-- sql_save($save, "data_input_data",
array("data_template_data_id", "data_input_field_id"));
-+ sql_save($save, "data_input_data",
array("data_template_data_id", "data_input_field_id"), false);
- }
- }
-
-@@ -419,7 +419,7 @@
- $save["data_template_rrd_id"] =
resolve_hash_to_id($sub_item_array["data_template_rrd_id"], $hash_cache);
- $save["snmp_field_name"] =
$sub_item_array["snmp_field_name"];
-
-- sql_save($save,
"snmp_query_graph_rrd", array("snmp_query_graph_id", "data_template_id",
"data_template_rrd_id"));
-+ sql_save($save,
"snmp_query_graph_rrd", array("snmp_query_graph_id", "data_template_id",
"data_template_rrd_id"), false);
- }
- }
-
-diff -ruBbd cacti-0.8.6h/lib/template.php
cacti-0.8.6h-patched/lib/template.php
---- cacti-0.8.6h/lib/template.php 2006-01-03 22:08:30.000000000 -0500
-+++ cacti-0.8.6h-patched/lib/template.php 2006-01-25 00:16:43.000000000
-0500
-@@ -643,10 +643,16 @@
-
- /* if there are no '|' characters,
all of the substitutions were successful */
- if (!strstr($subs_string, "|query")) {
-+ if (sizeof(db_fetch_row("show
columns from data_template_data like '" . $suggested_value["field_name"] .
"'"))) {
- db_execute("update
data_template_data set " . $suggested_value["field_name"] . "='" .
addslashes($suggested_value["text"]) . "' where local_data_id=" .
$cache_array["local_data_id"]{$data_template["id"]});
-+ }
-
- /* once we find a working
value, stop */
-
$suggested_values_ds{$data_template["id"]}{$suggested_value["field_name"]} =
true;
-+
-+ if (sizeof(db_fetch_row("show
columns from data_template_rrd like '" . $suggested_value["field_name"] .
"'"))) {
-+ db_execute("update
data_template_rrd set " . $suggested_value["field_name"] . "='" .
$subs_string . "' where local_data_id=" .
$cache_array["local_data_id"]{$data_template["id"]});
-+ }
- }
- }
- }
diff --git a/net/cacti/nth_percentile_empty_return_set_issue.patch
b/net/cacti/nth_percentile_empty_return_set_issue.patch
deleted file mode 100644
index dbce46e..0000000
--- a/net/cacti/nth_percentile_empty_return_set_issue.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- cacti-0.8.6h/lib/graph_variables.php 2006-01-03 21:08:30.000000000
-0600
-+++ cacti-fixed/lib/graph_variables.php 2006-01-06 22:40:31.032460462
-0600
-@@ -302,27 +302,34 @@
-
- /* format the output according to args passed to the variable */
- if ($regexp_match_array[4] == "current") {
-+ if (!
empty($nth_cache{$graph_item["local_data_id"]}{$graph_item["data_source_name"]}))
{
- $nth =
$nth_cache{$graph_item["local_data_id"]}{$graph_item["data_source_name"]};
- $nth = ($regexp_match_array[2] == "bits") ? $nth * 8 : $nth;
- $nth /= pow(10,intval($regexp_match_array[3]));
-+ }
- }elseif ($regexp_match_array[4] == "total") {
- for ($t=0;($t<count($graph_items));$t++) {
- if ((ereg("(AREA|STACK|LINE[123])",
$graph_item_types{$graph_items[$t]["graph_type_id"]})) &&
(!empty($graph_items[$t]["data_template_rrd_id"]))) {
-+ if (!
empty($nth_cache{$graph_items[$t]["local_data_id"]}{$graph_items[$t]["data_source_name"]}))
{
- $local_nth =
$nth_cache{$graph_items[$t]["local_data_id"]}{$graph_items[$t]["data_source_name"]};
- $local_nth = ($regexp_match_array[2] ==
"bits") ? $local_nth * 8 : $local_nth;
- $local_nth /=
pow(10,intval($regexp_match_array[3]));
-
- $nth += $local_nth;
-+ }
-
- }
- }
- }elseif ($regexp_match_array[4] == "max") {
-+ if (!
empty($nth_cache{$graph_item["local_data_id"]}["nth_percentile_maximum"])) {
- $nth =
$nth_cache{$graph_item["local_data_id"]}["nth_percentile_maximum"];
- $nth = ($regexp_match_array[2] == "bits") ? $nth * 8 : $nth;
- $nth /= pow(10,intval($regexp_match_array[3]));
-+ }
- }elseif ($regexp_match_array[4] == "total_peak") {
- for ($t=0;($t<count($graph_items));$t++) {
- if ((ereg("(AREA|STACK|LINE[123])",
$graph_item_types{$graph_items[$t]["graph_type_id"]})) &&
(!empty($graph_items[$t]["data_template_rrd_id"]))) {
-+ if (!
empty($nth_cache{$graph_items[$t]["local_data_id"]}["nth_percentile_maximum"]))
{
- $local_nth =
$nth_cache{$graph_items[$t]["local_data_id"]}["nth_percentile_maximum"];
- $local_nth = ($regexp_match_array[2] ==
"bits") ? $local_nth * 8 : $local_nth;
- $local_nth /=
pow(10,intval($regexp_match_array[3]));
-@@ -330,9 +337,11 @@
- $nth += $local_nth;
- }
- }
-+ }
- }elseif ($regexp_match_array[4] == "all_max_current") {
- for ($t=0;($t<count($graph_items));$t++) {
- if ((ereg("(AREA|STACK|LINE[123])",
$graph_item_types{$graph_items[$t]["graph_type_id"]})) &&
(!empty($graph_items[$t]["data_template_rrd_id"]))) {
-+ if (!
empty($ninety_fifth_cache{$graph_items[$t]["local_data_id"]}{$graph_items[$t]["data_source_name"]}))
{
- $local_nth =
$ninety_fifth_cache{$graph_items[$t]["local_data_id"]}{$graph_items[$t]["data_source_name"]};
- $local_nth = ($regexp_match_array[2] ==
"bits") ? $local_nth * 8 : $local_nth;
- $local_nth /=
pow(10,intval($regexp_match_array[3]));
-@@ -342,9 +351,11 @@
- }
- }
- }
-+ }
- }elseif ($regexp_match_array[4] == "all_max_peak") {
- for ($t=0;($t<count($graph_items));$t++) {
- if ((ereg("(AREA|STACK|LINE[123])",
$graph_item_types{$graph_items[$t]["graph_type_id"]})) &&
(!empty($graph_items[$t]["data_template_rrd_id"]))) {
-+ if (!
empty($nth_cache{$graph_items[$t]["local_data_id"]}["nth_percentile_maximum"]))
{
- $local_nth =
$nth_cache{$graph_items[$t]["local_data_id"]}["nth_percentile_maximum"];
- $local_nth = ($regexp_match_array[2] ==
"bits") ? $local_nth * 8 : $local_nth;
- $local_nth /=
pow(10,intval($regexp_match_array[3]));
-@@ -354,28 +365,23 @@
- }
- }
- }
-+ }
- }elseif ($regexp_match_array[4] == "aggregate") {
-- if (empty($nth_cache{0}["nth_percentile_aggregate_total"])) {
-- $nth = 0;
-- }else{
-+ if (! empty($nth_cache{0}["nth_percentile_aggregate_total"]))
{
- $local_nth =
$nth_cache{0}["nth_percentile_aggregate_total"];
- $local_nth = ($regexp_match_array[2] == "bits") ?
$local_nth * 8 : $local_nth;
- $local_nth /= pow(10,intval($regexp_match_array[3]));
- $nth = $local_nth;
- }
- }elseif ($regexp_match_array[4] == "aggregate_max") {
-- if (empty($nth_cache{0}["nth_percentile_aggregate_max"])) {
-- $nth = 0;
-- }else{
-+ if (! empty($nth_cache{0}["nth_percentile_aggregate_max"])) {
- $local_nth =
$nth_cache{0}["nth_percentile_aggregate_max"];
- $local_nth = ($regexp_match_array[2] == "bits") ?
$local_nth * 8 : $local_nth;
- $local_nth /= pow(10,intval($regexp_match_array[3]));
- $nth = $local_nth;
- }
- }elseif ($regexp_match_array[4] == "aggregate_sum") {
-- if (empty($nth_cache{0}["nth_percentile_aggregate_sum"])) {
-- $nth = 0;
-- }else{
-+ if (! empty($nth_cache{0}["nth_percentile_aggregate_sum"])) {
- $local_nth =
$nth_cache{0}["nth_percentile_aggregate_sum"];
- $local_nth = ($regexp_match_array[2] == "bits") ?
$local_nth * 8 : $local_nth;
- $local_nth /= pow(10,intval($regexp_match_array[3]));



  • [SM-Commit] GIT changes to master grimoire by David Kowis (bf5a6db53a5b365df7c1b182916014c7620d78ad), David Kowis, 02/13/2007

Archive powered by MHonArc 2.6.24.

Top of Page