Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b786e1929a18332b57ec0c17a18997917dae4ee1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b786e1929a18332b57ec0c17a18997917dae4ee1)
  • Date: Thu, 13 Oct 2011 08:34:03 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/cacti/DETAILS | 13 -
net/cacti/HISTORY | 5
net/cacti/PRE_BUILD | 2
net/cacti/pa.patch | 31 --
net/cacti/patches/data_source_deactivate.patch | 17 -
net/cacti/patches/graph_list_view.patch | 110 ---------
net/cacti/patches/html_output.patch | 71 ------
net/cacti/patches/ldap_group_authenication.patch | 11
net/cacti/patches/ping.patch | 23 --
net/cacti/patches/poller_interval.patch | 168
---------------
net/cacti/patches/script_server_command_line_parse.patch | 136 ------------
utils/qemu/DETAILS | 2
utils/qemu/HISTORY | 3
13 files changed, 15 insertions(+), 577 deletions(-)

New commits:
commit b786e1929a18332b57ec0c17a18997917dae4ee1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

qemu: => 0.15.1

commit 7e182f4f7b3b85958249d3a17e604fee21b78d9c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cacti: => 0.8.7h (security)

diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index 6d2abbe..4971f4d 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,18 +1,17 @@
SPELL=cacti
- VERSION=0.8.7g
- SECURITY_PATCH=1
- PATCHLEVEL=1
+ VERSION=0.8.7h
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_HASH=sha512:cbd96e8d0fd0fe49249fa4b85174dbdf27d79b42a7934a6466995585f748ddc8b771cd7903199fe4e53d54b1bcfd3c271bbdc93477904cece00520b65c806ebf
if [[ $CACTI_PA == y ]]; then
- VERSION_PA=2.8
+ VERSION_PA=3.0
SOURCE2=$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.tar.gz
- SOURCE2_URL[0]=http://mirror.cactiusers.org/downloads/plugins/$SOURCE2
-
SOURCE2_HASH=sha512:4ac6f3bb459def465ef63f87e9129f11b42e351f14c2ceb53f3b1dd5e824c9ad939c3bdec0e51ea864631e94fd99dc8c72eaf0e9ed4de61bd06ab9db92015b85
+ SOURCE2_URL[0]=http://www.cacti.net/downloads/pia/$SOURCE2
+
SOURCE2_HASH=sha512:2d6d45b2095ec1c09e504516f5c0ebee8734c351a25750565ec09fe5d2a98ccc6e74e0bed12e005d4157f4ec85a3fe3941bf0e538621011c36ba79f0f764c224
SOURCE_DIRECTORY2="$BUILD_DIRECTORY/$SPELL-PA-${VERSION_PA}"
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.cacti.net/downloads/$SOURCE
-
SOURCE_HASH=sha512:b934b7dea515c80ed7b24f3d300e3fed42d39e53917d1f21dfccc24ee09f41255eafa506c8e31ee9735511d65cf66248dcacd99fbb5a0c6c21c7f5fa4505b7a1
LICENSE[0]=GPL
WEB_SITE=http://www.cacti.net/
ENTERED=20060131
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 43cd4c5..92862c4 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,8 @@
+2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.7h; SECURITY_PATCH++; updated plugin
+ arch to 3.0; updated PA source url
+ * patches: removed
+
2010-12-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated plugin arch to 2.8
* DEPENDS: added spine suggest dependency
diff --git a/net/cacti/PRE_BUILD b/net/cacti/PRE_BUILD
index 6fbe833..5d34beb 100755
--- a/net/cacti/PRE_BUILD
+++ b/net/cacti/PRE_BUILD
@@ -12,8 +12,6 @@ if [[ $CACTI_PA == y ]]; then
cd "$SOURCE_DIRECTORY2" &&
unpack_file 2 &&

- patch -p1 < "$SPELL_DIRECTORY/pa.patch" &&
-
cd "$SOURCE_DIRECTORY" &&

cat "$SOURCE_DIRECTORY2/cacti-plugin-arch/pa.sql" >> cacti.sql &&
diff --git a/net/cacti/pa.patch b/net/cacti/pa.patch
deleted file mode 100644
index eb4e7ce..0000000
--- a/net/cacti/pa.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- cacti-PA-2.8/cacti-plugin-arch/cacti-plugin-0.8.7g-PA-v2.8.diff
2010-07-10 02:40:54.000000000 +0400
-+++ cacti-PA-2.8-patched/cacti-plugin-arch/cacti-plugin-0.8.7g-PA-v2.8.diff
2010-12-09 15:17:56.372139350 +0300
-@@ -203,9 +203,9 @@
- 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
-@@ -2395,14 +2395,12 @@
- /* Populate each execution file with appropriate information
*/
- foreach ($polling_hosts as $item) {
- if ($host_count == 1) {
--@@ -446,9 +450,11 @@
-+@@ -446,7 +450,9 @@
-
- /* 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) {
diff --git a/net/cacti/patches/data_source_deactivate.patch
b/net/cacti/patches/data_source_deactivate.patch
deleted file mode 100644
index 1a3f727..0000000
--- a/net/cacti/patches/data_source_deactivate.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- cacti-0.8.7g/lib/api_data_source.php 2010-07-09 18:33:46.000000000
-0400
-+++ cacti-0.8.7g-patched/lib/api_data_source.php 2010-07-27
21:30:31.000000000 -0400
-@@ -131,12 +131,12 @@
-
- $i++;
-
-- if ($i % 1000) {
-+ if (!($i % 1000)) {
- db_execute("DELETE FROM poller_item WHERE
local_data_id IN ($ids_to_disable)");
- db_execute("UPDATE data_template_data SET
active='' WHERE local_data_id IN ($ids_to_disable)");
-
- $i = 0;
-- $ids_to_delete = "";
-+ $ids_to_disable = "";
- }
- }
-
diff --git a/net/cacti/patches/graph_list_view.patch
b/net/cacti/patches/graph_list_view.patch
deleted file mode 100644
index 47a5b72..0000000
--- a/net/cacti/patches/graph_list_view.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- cacti-0.8.7g/graph_view.php 2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g-patched/graph_view.php 2010-07-27 21:30:31.000000000
-0400
-@@ -204,7 +204,7 @@
- $sql_where = "";
- $sql_join = "";
- }
-- /* the user select a bunch of graphs of the 'list' view and wants
them dsplayed here */
-+ /* the user select a bunch of graphs of the 'list' view and wants
them displayed here */
- if (isset($_REQUEST["style"])) {
- if (get_request_var_request("style") == "selective") {
-
-@@ -296,8 +296,9 @@
- $sql_where =
get_graph_permissions_sql($current_user["policy_graphs"],
$current_user["policy_hosts"], $current_user["policy_graph_templates"]);
-
- $hosts =
db_fetch_assoc("SELECT DISTINCT host.id, host.description as name
-- FROM
(graph_templates_graph,graph_local)
-- LEFT
JOIN host ON (host.id=graph_local.host_id)
-+ FROM
host
-+ LEFT
JOIN graph_local ON ( host.id = graph_local.host_id )
-+ LEFT
JOIN graph_templates_graph ON ( graph_templates_graph.local_graph_id =
graph_local.id )
- LEFT
JOIN graph_templates ON (graph_templates.id=graph_local.graph_template_id)
- LEFT
JOIN user_auth_perms ON
((graph_templates_graph.local_graph_id=user_auth_perms.item_id and
user_auth_perms.type=1 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (host.id=user_auth_perms.item_id and
user_auth_perms.type=3 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (graph_templates.id=user_auth_perms.item_id
and user_auth_perms.type=4 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . "))
- WHERE
graph_templates_graph.local_graph_id=graph_local.id
-@@ -327,8 +328,9 @@
- <?php
- if
(read_config_option("auth_method") != 0) {
-
$graph_templates = db_fetch_assoc("SELECT DISTINCT graph_templates.*
-- FROM
(graph_templates_graph,graph_local)
-- LEFT
JOIN host ON (host.id=graph_local.host_id)
-+ FROM
host
-+ LEFT
JOIN graph_local ON ( host.id = graph_local.host_id )
-+ LEFT
JOIN graph_templates_graph ON ( graph_templates_graph.local_graph_id =
graph_local.id )
- LEFT
JOIN graph_templates ON (graph_templates.id=graph_local.graph_template_id)
- LEFT
JOIN user_auth_perms ON
((graph_templates_graph.local_graph_id=user_auth_perms.item_id and
user_auth_perms.type=1 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (host.id=user_auth_perms.item_id and
user_auth_perms.type=3 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (graph_templates.id=user_auth_perms.item_id
and user_auth_perms.type=4 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . "))
- WHERE
graph_templates_graph.local_graph_id=graph_local.id
-@@ -514,10 +516,10 @@
- }else{
- /* if any of the settings changed, reset the page number */
- $changed = false;
-- $changed += check_changed("host_id",
"sess_graphs_view_list_host");
-- $changed += check_changed("rows",
"sess_graphs_view_list_rows");
-- $changed += check_changed("graph_template_id",
"sess_graphs_view_list_graph_template");
-- $changed += check_changed("filter",
"sess_graphs_view_list_filter");
-+ $changed += check_changed("host_id",
"sess_graph_view_list_host");
-+ $changed += check_changed("rows",
"sess_graph_view_list_rows");
-+ $changed += check_changed("graph_template_id",
"sess_graph_view_list_graph_template");
-+ $changed += check_changed("filter",
"sess_graph_view_list_filter");
- if ($changed) $_REQUEST["page"] = 1;
- }
-
-@@ -563,7 +565,7 @@
- ?>
- <tr bgcolor="#<?php print $colors["panel"];?>">
- <td>
-- <form style="margin:0px;padding:0px;" name="form_graph_list"
method="POST" onSubmit='form_graph(document.chk,document.form_graph_list)'
action="graph_view.php">
-+ <form style="margin:0px;padding:0px;" name="form_graph_list"
method="POST" onSubmit='form_graph(document.chk,document.form_graph_list)'>
- <table width="100%" cellpadding="0" cellspacing="0">
- <tr>
- <td nowrap style='white-space:
nowrap;' width="40">
-@@ -578,8 +580,9 @@
- $sql_where =
get_graph_permissions_sql($current_user["policy_graphs"],
$current_user["policy_hosts"], $current_user["policy_graph_templates"]);
-
- $hosts =
db_fetch_assoc("SELECT DISTINCT host.id, host.description as name
-- FROM
(graph_templates_graph,graph_local)
-- LEFT
JOIN host ON (host.id=graph_local.host_id)
-+ FROM
host
-+ LEFT
JOIN graph_local ON ( host.id = graph_local.host_id )
-+ LEFT
JOIN graph_templates_graph ON ( graph_templates_graph.local_graph_id =
graph_local.id )
- LEFT
JOIN graph_templates ON (graph_templates.id=graph_local.graph_template_id)
- LEFT
JOIN user_auth_perms ON
((graph_templates_graph.local_graph_id=user_auth_perms.item_id and
user_auth_perms.type=1 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (host.id=user_auth_perms.item_id and
user_auth_perms.type=3 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (graph_templates.id=user_auth_perms.item_id
and user_auth_perms.type=4 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . "))
- WHERE
graph_templates_graph.local_graph_id=graph_local.id
-@@ -608,8 +611,9 @@
- <?php
- if
(read_config_option("auth_method") != 0) {
-
$graph_templates = db_fetch_assoc("SELECT DISTINCT graph_templates.*
-- FROM
(graph_templates_graph,graph_local)
-- LEFT
JOIN host ON (host.id=graph_local.host_id)
-+ FROM
host
-+ LEFT
JOIN graph_local ON ( host.id = graph_local.host_id )
-+ LEFT
JOIN graph_templates_graph ON ( graph_templates_graph.local_graph_id =
graph_local.id )
- LEFT
JOIN graph_templates ON (graph_templates.id=graph_local.graph_template_id)
- LEFT
JOIN user_auth_perms ON
((graph_templates_graph.local_graph_id=user_auth_perms.item_id and
user_auth_perms.type=1 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (host.id=user_auth_perms.item_id and
user_auth_perms.type=3 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . ") OR (graph_templates.id=user_auth_perms.item_id
and user_auth_perms.type=4 and user_auth_perms.user_id=" .
$_SESSION["sess_user_id"] . "))
- WHERE
graph_templates_graph.local_graph_id=graph_local.id
-@@ -736,13 +740,13 @@
-
- html_start_box("", "100%", $colors["header"], "1", "center", "");
- print $nav;
-- html_header_checkbox(array("Graph Title", "Graph Size"));
-+ html_header_checkbox(array("Graph Title", "Graph Size"), false);
-
- $i = 0;
- if (sizeof($graphs)) {
- foreach ($graphs as $graph) {
- form_alternate_row_color($colors["alternate"],
$colors["light"], $i, 'line' . $graph["local_graph_id"]); $i++;
-- form_selectable_cell("<strong><a href='" .
htmlspecialchars("graph.php?local_graph_id=" . $graph["local_graph_id"] .
"&rra_id=all") . "'>" . htmlspecialchars($graph["title_cache"]) .
"</a><strong>", $graph["local_graph_id"]);
-+ form_selectable_cell("<strong><a href='" .
htmlspecialchars("graph.php?local_graph_id=" . $graph["local_graph_id"] .
"&rra_id=all") . "'>" . htmlspecialchars($graph["title_cache"]) .
"</a></strong>", $graph["local_graph_id"]);
- 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();
-@@ -795,8 +799,8 @@
- strDel = strDel.substring(0,strDel.length - 1);
- strURL = '&graph_add=' + strAdd + '&graph_remove=' + strDel;
- return strNavURL + strURL;
-- alert(strAdd);
-- alert(strDel);
-+ //alert(strAdd);
-+ //alert(strDel);
- }
- function url_go(strURL) {
- document.location = strURL;
diff --git a/net/cacti/patches/html_output.patch
b/net/cacti/patches/html_output.patch
deleted file mode 100644
index 22f0985..0000000
--- a/net/cacti/patches/html_output.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- cacti-0.8.7g/lib/html_form.php 2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g-patched/lib/html_form.php 2010-07-27 21:30:31.000000000
-0400
-@@ -65,7 +65,7 @@
-
form_alternate_row_color($colors["form_alternate1"],
$colors["form_alternate2"], $i, 'row_' . $field_name);
- }
-
-- print "<td width='" .
((isset($config_array["left_column_width"])) ?
$config_array["left_column_width"] : "50%") . "'>\n<font
class='textEditTitle'>" . htmlspecialchars($field_array["friendly_name"]) .
"</font><br>\n";
-+ print "<td width='" .
((isset($config_array["left_column_width"])) ?
$config_array["left_column_width"] : "50%") . "'>\n<font
class='textEditTitle'>" . $field_array["friendly_name"] . "</font><br>\n";
-
- if (isset($field_array["sub_checkbox"])) {
-
form_checkbox($field_array["sub_checkbox"]["name"],
$field_array["sub_checkbox"]["value"],
---- cacti-0.8.7g/lib/data_query.php 2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g-patched/lib/data_query.php 2010-07-27 21:30:31.000000000
-0400
-@@ -620,6 +620,7 @@
- }
-
- /* update the cache */
-+ /* TODO: if both $sort field and $title_format are empty, this yields
funny results */
- db_execute("update host_snmp_query set sort_field = '$sort_field',
title_format = '$title_format' where host_id = '$host_id' and snmp_query_id =
'$data_query_id'");
- }
-
---- cacti-0.8.7g/data_sources.php 2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g-patched/data_sources.php 2010-07-27 21:30:31.000000000
-0400
-@@ -899,7 +899,7 @@
- <td bgcolor='#" . $colors["header"] . "'
class='textHeaderDark'>
- <strong>Data Source Item</strong>
$header_label
- </td>
-- <td class='textHeaderDark' align='right'
bgcolor='" . $colors["header"] . "'>
-+ <td class='textHeaderDark' align='right'
bgcolor='#" . $colors["header"] . "'>
- " . ((!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;
- if (sizeof($data_sources) > 0) {
- foreach ($data_sources as $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"]);
-+ /* 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);
- 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']);
--
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>",
htmlspecialchars($data_input_name)) : htmlspecialchars($data_input_name)),
$data_source["local_data_id"]);
-+
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>", $data_input_name) :
$data_input_name), $data_source["local_data_id"]);
-
form_selectable_cell(get_poller_interval($poller_interval),
$data_source["local_data_id"]);
- form_selectable_cell(($data_source['active'] == "on"
? "Yes" : "No"), $data_source["local_data_id"]);
--
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>",
htmlspecialchars($data_source['data_template_name'])) :
htmlspecialchars($data_source['data_template_name'])),
$data_source["local_data_id"]);
-+
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>", $data_template_name) :
$data_template_name), $data_source["local_data_id"]);
- form_checkbox_cell($data_source["name_cache"],
$data_source["local_data_id"]);
- form_end_row();
- }
---- cacti-0.8.7g/graphs.php 2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g-patched/graphs.php 2010-07-27 21:30:31.000000000 -0400
-@@ -1317,11 +1317,12 @@
- $i = 0;
- if (sizeof($graph_list) > 0) {
- foreach ($graph_list as $graph) {
-- $template_name = ((empty($graph["name"])) ?
"<em>None</em>" : $graph["name"]);
-+ /* we're escaping strings here, so no need to escape
them on form_selectable_cell */
-+ $template_name = ((empty($graph["name"])) ?
"<em>None</em>" : htmlspecialchars($graph["name"]));
- form_alternate_row_color($colors["alternate"],
$colors["light"], $i, 'line' . $graph["local_graph_id"]); $i++;
- form_selectable_cell("<a class='linkEditMain' href='"
. htmlspecialchars("graphs.php?action=graph_edit&id=" .
$graph["local_graph_id"]) . "' title='" .
htmlspecialchars($graph["title_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($graph["title_cache"]),
read_config_option("max_title_graph"))) :
title_trim(htmlspecialchars($graph["title_cache"]),
read_config_option("max_title_graph"))) . "</a>", $graph["local_graph_id"]);
- form_selectable_cell($graph["local_graph_id"],
$graph["local_graph_id"]);
--
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>",
htmlspecialchars($template_name)) : htmlspecialchars($template_name)),
$graph["local_graph_id"]);
-+
form_selectable_cell(((get_request_var_request("filter") != "") ?
eregi_replace("(" . preg_quote(get_request_var_request("filter")) . ")",
"<span style='background-color: #F8D93D;'>\\1</span>", $template_name) :
$template_name), $graph["local_graph_id"]);
- 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();
diff --git a/net/cacti/patches/ldap_group_authenication.patch
b/net/cacti/patches/ldap_group_authenication.patch
deleted file mode 100644
index 00894c0..0000000
--- a/net/cacti/patches/ldap_group_authenication.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cacti-0.8.7g/lib/ldap.php 2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g-patched/lib/ldap.php 2010-07-27 21:30:31.000000000 -0400
-@@ -250,7 +250,7 @@
- if ($ldap_response) {
- if ($this->group_require == 1) {
- /* Process group membership if
required */
-- if ($ldap_group_member_type == 1) {
-+ if ($this->group_member_type == 1) {
- $ldap_group_response =
@ldap_compare($ldap_conn, $this->group_dn, $this->group_attrib, $this->dn);
- } else {
- $ldap_group_response =
@ldap_compare($ldap_conn, $this->group_dn, $this->group_attrib,
$this->username);
diff --git a/net/cacti/patches/ping.patch b/net/cacti/patches/ping.patch
deleted file mode 100644
index a48050b..0000000
--- a/net/cacti/patches/ping.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruBbd cacti-0.8.7g/lib/ping.php cacti-0.8.7g-patched/lib/ping.php
---- cacti-0.8.7g/lib/ping.php 2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g-patched/lib/ping.php 2010-08-31 20:31:22.000000000 -0400
-@@ -577,12 +577,16 @@
- switch(socket_select($r =
array($this->socket), $w = array($this->socket), $f = array($this->socket),
$to_sec, $to_usec)){
- case 2:
- /* connection refused */
-- $this->ping_response = "TCP ping
connection refused";
-- $this->ping_status = "down";
-+ $this->time =
$this->get_time($this->precision);
-+
-+ if (($this->time*1000) <=
$this->timeout) {
-+ $this->ping_response = "TCP
Ping connection refused (" . $this->time*1000 . " ms)";
-+ $this->ping_status =
$this->time*1000;
-+ }
-
- $this->close_socket();
-
-- return false;
-+ return true; /* "connection refused"
says: host is alive (else ping would time out) */
- case 1:
- /* connected, so calculate the total
time and return */
- $this->time =
$this->get_time($this->precision);
diff --git a/net/cacti/patches/poller_interval.patch
b/net/cacti/patches/poller_interval.patch
deleted file mode 100644
index dac3956..0000000
--- a/net/cacti/patches/poller_interval.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff -ruBbd cacti-0.8.7g/lib/database.php
cacti-0.8.7g-patched/lib/database.php
---- cacti-0.8.7g/lib/database.php 2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g-patched/lib/database.php 2010-08-31 20:31:22.000000000
-0400
-@@ -38,14 +38,14 @@
- $cnn = NewADOConnection($db_type);
- $class = get_class($cnn);
-
-- if (!is_a($cnn_id, $class)) {
-- $cnn_id = $cnn;
-- }
--
- $hostport = $host . ":" . $port;
-
- while ($i <= $retries) {
- if ($cnn->PConnect($hostport,$user,$pass,$db_name)) {
-+ if (!is_a($cnn_id, $class)) {
-+ $cnn_id = $cnn;
-+ }
-+
- return($cnn);
- }
-
-@@ -92,7 +92,7 @@
- while (1) {
- $query = $db_conn->Execute($sql);
-
-- if (($query) || ($db_conn->ErrorNo() == 1032)) {
-+ if (($db_conn->ErrorNo() == 0) || ($db_conn->ErrorNo() ==
1032)) {
- return(1);
- }else if (($db_conn->ErrorNo() == 1049) ||
($db_conn->ErrorNo() == 1051)) {
- printf("FATAL: Database or Table does not exist");
-@@ -143,7 +143,7 @@
-
- $query = $db_conn->Execute($sql);
-
-- if (($query) || ($db_conn->ErrorNo() == 1032)) {
-+ if (($db_conn->ErrorNo() == 0) || ($db_conn->ErrorNo() == 1032)) {
- if (!$query->EOF) {
- if ($col_name != '') {
- $column = $query->fields[$col_name];
-@@ -184,7 +184,7 @@
- $db_conn->SetFetchMode(ADODB_FETCH_ASSOC);
- $query = $db_conn->Execute($sql);
-
-- if (($query) || ($db_conn->ErrorNo() == 1032)) {
-+ if (($db_conn->ErrorNo() == 0) || ($db_conn->ErrorNo() == 1032)) {
- if (!$query->EOF) {
- $fields = $query->fields;
-
-@@ -222,7 +222,7 @@
- $db_conn->SetFetchMode(ADODB_FETCH_ASSOC);
- $query = $db_conn->Execute($sql);
-
-- if (($query) || ($db_conn->ErrorNo() == 1032)) {
-+ if (($db_conn->ErrorNo() == 0) || ($db_conn->ErrorNo() == 1032)) {
- while ((!$query->EOF) && ($query)) {
- $data{sizeof($data)} = $query->fields;
- $query->MoveNext();
-diff -ruBbd cacti-0.8.7g/poller.php cacti-0.8.7g-patched/poller.php
---- cacti-0.8.7g/poller.php 2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g-patched/poller.php 2010-08-31 20:31:22.000000000 -0400
-@@ -109,7 +109,7 @@
- }
-
- /* record the start time */
--list($micro,$seconds) = split(" ", microtime());
-+list($micro,$seconds) = explode(" ", microtime());
- $poller_start = $seconds + $micro;
- $overhead_time = 0;
-
-@@ -140,7 +140,7 @@
- WHERE rrd_next_step<=0
- GROUP BY host_id
- ORDER BY host_id"),
"host_id", "data_sources");
-- $poller_runs = $cron_interval / $poller_interval;
-+ $poller_runs = intval($cron_interval / $poller_interval);
-
- define("MAX_POLLER_RUNTIME", $poller_runs * $poller_interval - 2);
- }else{
-@@ -211,10 +211,11 @@
-
- $poller_runs_completed = 0;
- $poller_items_total = 0;
-+$polling_hosts = array_merge(array(0 => array("id" => "0")),
db_fetch_assoc("SELECT id FROM host WHERE disabled='' ORDER BY id"));
-
- while ($poller_runs_completed < $poller_runs) {
- /* record the start time for this loop */
-- list($micro,$seconds) = split(" ", microtime());
-+ list($micro,$seconds) = explode(" ", microtime());
- $loop_start = $seconds + $micro;
-
- /* calculate overhead time */
-@@ -222,8 +223,6 @@
- $overhead_time = $loop_start - $poller_start;
- }
-
-- $polling_hosts = array_merge(array(0 => array("id" => "0")),
db_fetch_assoc("SELECT id FROM host WHERE disabled = '' ORDER BY id"));
--
- /* initialize counters for script file handling */
- $host_count = 1;
-
-@@ -375,7 +374,7 @@
-
- break;
- }else {
-- if (read_config_option("log_verbosity") >=
POLLER_VERBOSITY_MEDIUM) {
-+ if (read_config_option("log_verbosity") >=
POLLER_VERBOSITY_MEDIUM || $debug) {
- print "Waiting on " .
($started_processes - $finished_processes) . " of " . $started_processes . "
pollers.\n";
- }
-
-@@ -390,7 +389,7 @@
-
- break;
- }else{
-- sleep(1);
-+ usleep(500);
- }
- }
- }
-@@ -427,28 +426,27 @@
- $poller_runs_completed++;
-
- /* record the start time for this loop */
-- list($micro,$seconds) = split(" ", microtime());
-+ list($micro,$seconds) = explode(" ", microtime());
- $loop_end = $seconds + $micro;
-+ $loop_time = $loop_end - $loop_start;
-
-- if (($loop_end - $loop_start) < $poller_interval) {
-+ if ($loop_time < $poller_interval) {
- if ($poller_runs_completed == 1) {
-- $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;
- }
-
- /* 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";
- }
-
- /* sleep the appripriate amount of time */
- if ($poller_runs_completed < $poller_runs) {
-- db_close();
- usleep($sleep_time * 1000000);
-- db_connect_real($database_hostname,
$database_username, $database_password, $database_default, $database_type,
$database_port);
- }
- }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) {
-
- /* take time and log performance data */
-- list($micro,$seconds) = split(" ", microtime());
-+ list($micro,$seconds) = explode(" ", microtime());
- $loop_end = $seconds + $micro;
-
- $cacti_stats = sprintf(
-
diff --git a/net/cacti/patches/script_server_command_line_parse.patch
b/net/cacti/patches/script_server_command_line_parse.patch
deleted file mode 100644
index 8cddf18..0000000
--- a/net/cacti/patches/script_server_command_line_parse.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- cacti-0.8.7g/script_server.php 2010-07-09 18:33:46.000000000 -0400
-+++ cacti-0.8.7g-patched/script_server.php 2010-07-27 21:30:31.000000000
-0400
-@@ -72,7 +72,7 @@
- }
-
- /* record the script start time */
--list($micro,$seconds) = split(" ", microtime());
-+list($micro,$seconds) = explode(" ", microtime());
- $start = $seconds + $micro;
-
- /* some debugging */
-@@ -171,7 +171,11 @@
-
- if (isset($command_array[2])) {
- $parameters = trim($command_array[2]);
-- $parameter_array = explode(" ",
trim($command_array[2]));
-+ $parameter_array = array();
-+ if (!parseArgs($parameters,
$parameter_array)) {
-+ cacti_log("WARNING: Script
Server count not parse '$parameters' for $function", false, "PHPSVR");
-+ return "U";
-+ }
- }else{
- $parameters = "";
- $parameters_array = array();
-@@ -236,3 +240,111 @@
- exit (-1);
- }
- }
-+
-+function parseArgs($string, &$str_list, $debug = false) {
-+ $delimiters = array("'",'"');
-+ $delimited = false;
-+ $str_list = array();
-+
-+ if ($debug) echo "String: '" . $string . "'\n";
-+
-+ foreach($delimiters as $delimiter) {
-+ if (strpos($string, $delimiter) !== false) {
-+ $delimited = true;
-+ break;
-+ }
-+ }
-+
-+ /* process the simple case */
-+ if (!$delimited) {
-+ $str_list = explode(" ", $string);
-+
-+ if ($debug) echo "Output: '" . implode(",", $str_list) .
"'\n";
-+
-+ return true;
-+ }
-+
-+ /* Break str down into an array of characters and process */
-+ $char_array = str_split($string);
-+ $escaping = false;
-+ $indelim = false;
-+ $parse_ok = true;
-+ $curstr = '';
-+ foreach($char_array as $char) {
-+ switch ($char) {
-+ case '\'':
-+ case '"':
-+ if (!$indelim) {
-+ if (!$escaping) {
-+ $indelim = true;
-+ }else{
-+ $curstr .= $char;
-+ $escaping = false;
-+ }
-+ }elseif (!$escaping) {
-+ $str_list[] = $curstr;
-+ $curstr = '';
-+ $indelim = false;
-+ }elseif ($escaping) {
-+ $curstr .= $char;
-+ $escaping = false;
-+ }
-+
-+ break;
-+ case '\\':
-+ if ($escaping) {
-+ $curstr .= $char;
-+ $escaping = false;
-+ }else{
-+ $escaping = true;
-+ }
-+
-+ break;
-+ case ' ':
-+ if ($escaping) {
-+ $parse_ok = false;
-+ $msg = 'Parse error attempting to parse
string';
-+ }elseif ($indelim) {
-+ $curstr .= $char;
-+ }elseif (strlen($curstr)) {
-+ $str_list[] = $curstr;
-+ $curstr = '';
-+ }
-+
-+ break;
-+ case '`':
-+ $parse_ok = false;
-+ $msg = 'Backtic (`) characters not allowed';
-+
-+ break;
-+ default:
-+ if ($escaping) {
-+ $parse_ok = false;
-+ $msg = 'Parse error attempting to parse
string';
-+ }else{
-+ $curstr .= $char;
-+ }
-+ break;
-+ }
-+
-+ if (!$parse_ok) {
-+ break;
-+ }
-+ }
-+
-+ /* Add the last str to the string array */
-+ if ($indelim || $escaping) {
-+ $parse_ok = false;
-+ $msg = 'Parse error attempting to parse string';
-+ }
-+
-+ if (!$parse_ok) {
-+ echo "ERROR: " . $msg . " '" . $string . "'\n";
-+ }else{
-+ $str_list[] = $curstr;
-+ }
-+
-+ if ($debug) echo "Output: '" . implode(",", $str_list) . "'\n";
-+
-+ return $parse_ok;
-+}
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 76eebc8..8316359 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -15,7 +15,7 @@ case ${QEMU_VER:0:4} in
VERSION=0.14.1
;;
0.15)
- VERSION=0.15.0
+ VERSION=0.15.1
;;
esac

diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 1d5af69..f172d4e 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,6 @@
+2011-10-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.15.1
+
2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: added sysconfdir path



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b786e1929a18332b57ec0c17a18997917dae4ee1), Vlad Glagolev, 10/13/2011

Archive powered by MHonArc 2.6.24.

Top of Page