diff options
| author | Treeve Jelbert | 2009-09-26 20:20:56 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2009-09-26 20:20:56 +0200 |
| commit | 0357ae8d2fdf33564753791bdb7ae99b5e5f3643 (patch) | |
| tree | 2ffb4b0a258f713210531ec5a2e3eff028246e85 | |
| parent | f23dda32e145787660e1da64ac381d6398aa60c8 (diff) | |
| parent | 2a7c5ba0f2281c30f979c365d76cc72b96855f52 (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
36 files changed, 506 insertions, 28 deletions
@@ -1,7 +1,10 @@ +2009-09-26 Vlad Glagolev <stealth@sourcemage.org> + * net/spine: new spell, poller for Cacti + 2009-09-25 David Kowis <dkowis@shlrm.org> * libs/tbb: Intel thread building blocks! * archive/par2cmdline-tbb: par2cmdline, but using intel's Thread Building - Blocks for multi-core par2 + Blocks for multi-core par2 2009-09-25 Bor Kraljič <pyrobor@ver.si> * gurus.gpg: added my signing key diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD index 9f9d55984d..4aa02aed3d 100755 --- a/crypto/nss/BUILD +++ b/crypto/nss/BUILD @@ -12,7 +12,9 @@ cd $SOURCE_DIRECTORY/mozilla/security/coreconf && echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' >> headers.mk && -sed -e 's:$(DIST)/lib:/usr/lib/nspr:' -i location.mk && +if [[ $NSS_BRANCH != 3.12 ]]; then + sedit 's:$(DIST)/lib:/usr/lib/nspr:' location.mk +fi && make_single && diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS index 938a8dba44..eaa70d8903 100755 --- a/crypto/nss/DETAILS +++ b/crypto/nss/DETAILS @@ -10,12 +10,13 @@ case $NSS_BRANCH in SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_9_RTM/src/$SOURCE SOURCE_HASH=sha512:2fe9eafe99c64c57503739cabcd58f8aac29c1f353379c4072c183c0bf0dee3fc7147120ad0fc8fef4dc6fdae542e5068ffca0a7e7d0bcf99d23500d49e9dc35 + PATCHLEVEL=1 ;; 3.12) - VERSION=3.12.3.1 + VERSION=3.12.4 SOURCE=$SPELL-$VERSION.tar.gz - SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_3_1_RTM/src/$SOURCE - SOURCE_HASH=sha512:6a103fdfe2b3f243ece02de68e2075a034acb80e242e96b6c6f07ef4d88a4b0c69aecaf6d5ce6b84c59ca610c96c70a10af144042723402ca1e19d122ec93e4b + SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/$SOURCE + SOURCE_HASH=sha512:f9914a326124a1372674b1070a7e4b4da5b85e56897797121372a9995a75753f1cfbdee712a95dcca004a41285ced0fac8ad297e60a46d9443d94db409bd90cd ;; esac @@ -25,7 +26,6 @@ esac LICENSE[0]=MPL LICENSE[1]=GPL LICENSE[2]=LGPL - PATCHLEVEL=1 GATHER_DOCS=off KEYWORDS="security crypto" SHORT='Network Security Services (NSS)' diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY index 12b0b191f4..4c62a71f0e 100644 --- a/crypto/nss/HISTORY +++ b/crypto/nss/HISTORY @@ -1,3 +1,9 @@ +2009-09-26 Bor Kraljič <pyrobor@ver.si> + * BUILD: removed sed edit that breaks the build for new version + * DETAILS: Fixed SOURCE_URL[0] + updated NSS_BRANCH=3.12 to 3.12.4 + moved PATCHLEVEL=1 to NSS_BRANCH=3.11 + 2009-07-30 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 3.12.3.1, bz2 -> gz diff --git a/devel/xdg-utils/DETAILS b/devel/xdg-utils/DETAILS index 7fc8f7cf96..2485e9d09b 100755 --- a/devel/xdg-utils/DETAILS +++ b/devel/xdg-utils/DETAILS @@ -23,4 +23,4 @@ application is running. Even if the desktop components of your application are limited to an installer, configuration or management tool, Xdg-utils provides you with an easy way to enhance the usage experience of your customers by improving the integration of these components in the user's environment. - EOF +EOF diff --git a/devel/xdg-utils/HISTORY b/devel/xdg-utils/HISTORY index deb7bd18ac..f43f81d351 100644 --- a/devel/xdg-utils/HISTORY +++ b/devel/xdg-utils/HISTORY @@ -1,3 +1,6 @@ +2009-09-26 Finn Haedicke <finn_haedicke@gmx.net> + * DETAILS: removed whitespace before EOF + 2007-06-25 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.0.2 diff --git a/gnome2-apps/gedit-plugins/DETAILS b/gnome2-apps/gedit-plugins/DETAILS index 4499ee6f4e..8babe17e44 100755 --- a/gnome2-apps/gedit-plugins/DETAILS +++ b/gnome2-apps/gedit-plugins/DETAILS @@ -1,5 +1,5 @@ SPELL=gedit-plugins - VERSION=2.26.2 + VERSION=2.28.0 BRANCH=`echo ${VERSION}|cut -d . -f 1,2` SOURCE=${SPELL}-${VERSION}.tar.bz2 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} diff --git a/gnome2-apps/gedit-plugins/HISTORY b/gnome2-apps/gedit-plugins/HISTORY index 68dfd08227..186836a7f7 100644 --- a/gnome2-apps/gedit-plugins/HISTORY +++ b/gnome2-apps/gedit-plugins/HISTORY @@ -1,3 +1,6 @@ +2009-09-26 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 2.28.0 + 2009-05-20 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.26.2 diff --git a/gnome2-apps/gedit-plugins/gedit-plugins-2.26.2.tar.bz2.sig b/gnome2-apps/gedit-plugins/gedit-plugins-2.26.2.tar.bz2.sig Binary files differdeleted file mode 100644 index 891509ff40..0000000000 --- a/gnome2-apps/gedit-plugins/gedit-plugins-2.26.2.tar.bz2.sig +++ /dev/null diff --git a/gnome2-apps/gedit-plugins/gedit-plugins-2.28.0.tar.bz2.sig b/gnome2-apps/gedit-plugins/gedit-plugins-2.28.0.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..81e7c7c2c9 --- /dev/null +++ b/gnome2-apps/gedit-plugins/gedit-plugins-2.28.0.tar.bz2.sig diff --git a/gnome2-libs/vte/DETAILS b/gnome2-libs/vte/DETAILS index 7079786b72..b9144463bf 100755 --- a/gnome2-libs/vte/DETAILS +++ b/gnome2-libs/vte/DETAILS @@ -1,5 +1,5 @@ SPELL=vte - VERSION=0.22.0 + VERSION=0.22.1 BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/gnome2-libs/vte/HISTORY b/gnome2-libs/vte/HISTORY index f1fda45c48..7722ebd60a 100644 --- a/gnome2-libs/vte/HISTORY +++ b/gnome2-libs/vte/HISTORY @@ -1,3 +1,6 @@ +2009-09-26 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 0.22.1 + 2009-09-22 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.22.0 diff --git a/gnome2-libs/vte/vte-0.22.0.tar.bz2.sig b/gnome2-libs/vte/vte-0.22.0.tar.bz2.sig Binary files differdeleted file mode 100644 index 20dafda22f..0000000000 --- a/gnome2-libs/vte/vte-0.22.0.tar.bz2.sig +++ /dev/null diff --git a/gnome2-libs/vte/vte-0.22.1.tar.bz2.sig b/gnome2-libs/vte/vte-0.22.1.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..a5ef2ad1b7 --- /dev/null +++ b/gnome2-libs/vte/vte-0.22.1.tar.bz2.sig diff --git a/lxde/lxpanel/DETAILS b/lxde/lxpanel/DETAILS index b8ccc68d75..a41c6d81ad 100755 --- a/lxde/lxpanel/DETAILS +++ b/lxde/lxpanel/DETAILS @@ -1,8 +1,8 @@ SPELL=lxpanel - VERSION=0.4.1 + VERSION=0.5.3 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/${SOURCE} - SOURCE_HASH=sha512:7eac5634d7f1faf9706167183c5e06c5d9381600d1f737b0bccb75b6accb636f345f300c92d3e6750c93323cb5f04e8d8c517d437d40e77e940b1bf8580c2ac1 + SOURCE_HASH=sha512:05c54a4992dd54aaf788d748b1b11d0fc3b66c2841f55fec7852b3e348f9db681026078710c74f2e8d53f31e50139a0670130f6ba0f6a1afa7490c17e7de1aaa SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE=http://lxde.sourceforge.net/ LICENSE[0]=GPL diff --git a/lxde/lxpanel/HISTORY b/lxde/lxpanel/HISTORY index 226849465a..7e6cbdbad3 100644 --- a/lxde/lxpanel/HISTORY +++ b/lxde/lxpanel/HISTORY @@ -1,3 +1,6 @@ +2009-09-26 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated to version 0.5.3 + 2009-06-05 George Sherwood <gsherwood@sourcemage.org> * DETAILS: Updated to version 0.4.1 diff --git a/net/cacti/BUILD b/net/cacti/BUILD index 290c6feb91..27ba77ddaf 100755 --- a/net/cacti/BUILD +++ b/net/cacti/BUILD @@ -1,3 +1 @@ -#apply the official patches -patch -p1 < $SOURCE_CACHE/$SOURCE1 && -patch -p1 < $SOURCE_CACHE/$SOURCE2 +true diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS index d5465a1e0c..406f921957 100755 --- a/net/cacti/DETAILS +++ b/net/cacti/DETAILS @@ -1,16 +1,11 @@ SPELL=cacti - VERSION=0.8.7a + VERSION=0.8.7e SOURCE=$SPELL-$VERSION.tar.gz -#official patches! - SOURCE1=graph-issue-wrra-specs.patch - SOURCE2=cmd-php-non-unique-hosts.patch - SOURCE1_URL=http://www.cacti.net/downloads/patches/$VERSION/$SOURCE1 - SOURCE2_URL=http://www.cacti.net/downloads/patches/$VERSION/$SOURCE2 -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://www.cacti.net/downloads/$SOURCE - SOURCE_HASH=sha512:69a056d44a2048f5f0fe072f3190ec4d865fe0abfb7ee8ed343033208ae3a284275d59118994e3bd9fdba0e3c8e0e4ebb41fc869e8ff478df3a8620a581addba + SOURCE_HASH=sha512:b826381cc5e76f95a9bea32754785121d09da505f139323b7d111321f353d7be9ab8cedc5ae26cea828b23a36ad2fca7c2bcd82f541fc3bf485b209698924fdb LICENSE[0]=GPL - WEB_SITE=http://www.cacti.net + WEB_SITE=http://www.cacti.net/ ENTERED=20060131 KEYWORDS="net" SHORT="Network graphing solution" diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY index 2c07e05e10..5e179db512 100644 --- a/net/cacti/HISTORY +++ b/net/cacti/HISTORY @@ -1,3 +1,8 @@ +2009-09-26 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 0.8.7e; moved official patches to patches/ + * BUILD: removed patch-applying + * PRE_BUILD: added, to apply official patches + 2008-01-02 David Kowis <dkowis@shlrm.org> * DETAILS: version to 0.8.7a and added official patches * BUILD: modified to only patch two things diff --git a/net/cacti/PRE_BUILD b/net/cacti/PRE_BUILD new file mode 100755 index 0000000000..66c1eb8c05 --- /dev/null +++ b/net/cacti/PRE_BUILD @@ -0,0 +1,6 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && + +for patch in "$SPELL_DIRECTORY/patches"/*.patch; do + patch -p1 < $patch +done diff --git a/net/cacti/patches/cli_add_graph.patch b/net/cacti/patches/cli_add_graph.patch new file mode 100644 index 0000000000..b82d21a1de --- /dev/null +++ b/net/cacti/patches/cli_add_graph.patch @@ -0,0 +1,11 @@ +--- ../tags/0.8.7e/cli/add_graphs.php 2009-06-28 12:34:31.000000000 -0400 ++++ 0.8.7/cli/add_graphs.php 2009-08-18 20:04:44.000000000 -0400 +@@ -570,7 +570,7 @@ + echo " 3|Fields = Verify all Fields\n"; + echo "List Options:\n"; + echo " --list-hosts\n"; +- echo " --list-graph-templates [--host_template=[ID]]\n"; ++ echo " --list-graph-templates [--host-template-id=[ID]]\n"; + echo " --list-input-fields --graph-template-id=[ID]\n"; + echo " --list-snmp-queries\n"; + echo " --list-query-types --snmp-query-id [ID]\n"; diff --git a/net/cacti/patches/snmp_invalid_response.patch b/net/cacti/patches/snmp_invalid_response.patch new file mode 100644 index 0000000000..5b2dd20f19 --- /dev/null +++ b/net/cacti/patches/snmp_invalid_response.patch @@ -0,0 +1,25 @@ +--- ../tags/0.8.7e/include/global_arrays.php 2009-06-28 12:34:31.000000000 -0400 ++++ 0.8.7/include/global_arrays.php 2009-08-18 20:04:44.000000000 -0400 +@@ -174,6 +174,10 @@ + "DES" => "DES (default)", + "AES128" => "AES"); + ++$banned_snmp_strings = array( ++ "End of MIB", ++ "No Such"); ++ + $logfile_options = array(1 => + "Logfile Only", + "Logfile and Syslog/Eventlog", +--- ../tags/0.8.7e/lib/snmp.php 2009-06-28 12:34:30.000000000 -0400 ++++ 0.8.7/lib/snmp.php 2009-08-18 20:04:44.000000000 -0400 +@@ -27,9 +27,6 @@ + define("SNMP_METHOD_PHP", 1); + define("SNMP_METHOD_BINARY", 2); + +-/* declare once, use many times */ +-$banned_snmp_strings = array("End of MIB", "No Such"); +- + /* we must use an apostrophe to escape community names under Unix in case the user uses + characters that the shell might interpret. the ucd-snmp binaries on Windows flip out when + you do this, but are perfectly happy with a quotation mark. */ diff --git a/net/cacti/patches/template_duplication.patch b/net/cacti/patches/template_duplication.patch new file mode 100644 index 0000000000..cd6ff4b67d --- /dev/null +++ b/net/cacti/patches/template_duplication.patch @@ -0,0 +1,234 @@ +diff -ruBbd 0.8.7e/cli/repair_templates.php 0.8.7/cli/repair_templates.php +--- 0.8.7e/cli/repair_templates.php 2009-08-18 22:03:22.000000000 -0400 ++++ 0.8.7/cli/repair_templates.php 2009-08-20 07:43:54.000000000 -0400 +@@ -0,0 +1,135 @@ ++<?php
++/*
++ +-------------------------------------------------------------------------+
++ | Copyright (C) 2004-2009 The Cacti Group |
++ | |
++ | This program is free software; you can redistribute it and/or |
++ | modify it under the terms of the GNU General Public License |
++ | as published by the Free Software Foundation; either version 2 |
++ | of the License, or (at your option) any later version. |
++ | |
++ | This program is distributed in the hope that it will be useful, |
++ | but WITHOUT ANY WARRANTY; without even the implied warranty of |
++ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
++ | GNU General Public License for more details. |
++ +-------------------------------------------------------------------------+
++ | Cacti: The Complete RRDTool-based Graphing Solution |
++ +-------------------------------------------------------------------------+
++ | This code is designed, written, and maintained by the Cacti Group. See |
++ | about.php and/or the AUTHORS file for specific developer information. |
++ +-------------------------------------------------------------------------+
++ | http://www.cacti.net/ |
++ +-------------------------------------------------------------------------+
++*/
++
++/* do NOT run this script through a web browser */
++if (!isset($_SERVER["argv"][0]) || isset($_SERVER['REQUEST_METHOD']) || isset($_SERVER['REMOTE_ADDR'])) {
++ die("<br><strong>This script is only meant to run at the command line.</strong>");
++}
++
++$no_http_headers = true;
++
++include(dirname(__FILE__) . "/../include/global.php");
++include_once("../lib/utility.php");
++include_once("../lib/template.php");
++
++/* process calling arguments */
++$parms = $_SERVER["argv"];
++array_shift($parms);
++
++$execute = FALSE;
++
++foreach($parms as $parameter) {
++ @list($arg, $value) = @explode("=", $parameter);
++
++ switch ($arg) {
++ case "--execute":
++ $execute = TRUE;
++ break;
++ case "-h":
++ case "-v":
++ case "-V":
++ case "--version":
++ case "--help":
++ display_help();
++ exit;
++ default:
++ print "ERROR: Invalid Parameter " . $parameter . "\n\n";
++ display_help();
++ exit;
++ }
++}
++
++if ($execute) {
++ echo "NOTE: Repairing All Duplicated Templates\n";
++} else {
++ echo "NOTE: Performing Check of Templates\n";
++}
++
++/* repair data templates first */
++if ($execute) {
++ echo "NOTE: Repairing Data Templates\n";
++} else {
++ echo "NOTE: Performing Check of Data Templates\n";
++}
++
++$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT data_template_id FROM data_template_rrd WHERE hash='' AND local_data_id=0");
++if (sizeof($damaged_template_ids)) {
++ foreach($damaged_template_ids as $id) {
$template_name = db_fetch_cell("SELECT name FROM data_template WHERE id=" . $id["data_template_id"]);
++ echo "NOTE: Data Template '$template_name' is Damaged and can be repaired\n";
++ }
++
++ $damaged_templates = db_fetch_assoc("SELECT * FROM data_template_rrd WHERE hash='' AND local_data_id=0");
++ if (sizeof($damaged_templates)) {
++ echo "NOTE: -- Damaged Data Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
++ if ($execute) {
++ foreach($damaged_templates as $template) {
++ $hash = get_hash_data_template($template["local_data_template_rrd_id"], "data_template_item");
++ db_execute("UPDATE data_template_rrd SET hash='$hash' WHERE id=" . $template["id"]);
++ }
++ }
++ }
++} else {
++ echo "NOTE: No Damaged Data Templates Found\n";
++}
++
++/* reset the array */
++$damaged_templates = array();
++
++/* repair graph templates */
++if ($execute) {
++ echo "NOTE: Repairing Graph Templates\n";
++} else {
++ echo "NOTE: Performing Check of Graph Templates\n";
++}
++
++$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT graph_template_id FROM graph_template_input WHERE hash=''");
++if (sizeof($damaged_template_ids)) {
++ foreach($damaged_template_ids as $id) {
++ $template_name = db_fetch_cell("SELECT name FROM graph_templates WHERE id=" . $id["graph_template_id"]);
++ echo "NOTE: Graph Template '$template_name' is Damaged and can be repaired\n";
++ }
++
++ $damaged_templates = db_fetch_assoc("SELECT * FROM graph_template_input WHERE hash=''");
++ if (sizeof($damaged_templates)) {
++ echo "NOTE: -- Damaged Graph Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
++ if ($execute) {
++ foreach($damaged_templates as $template) {
++ $hash = get_hash_graph_template(0, "graph_template_input");
++ db_execute("UPDATE graph_template_input SET hash='$hash' WHERE id=" . $template["id"]);
++ }
++ }
++ }
++} else {
++ echo "NOTE: No Damaged Graph Templates Found\n";
++}
++
++
++/* display_help - displays the usage of the function */
++function display_help () {
++ print "Cacti Database Template Repair Tool v1.0, Copyright 2004-2009 - The Cacti Group\n\n";
++ print "usage: repair_templates.php --execute [--help]\n\n";
++ print "--execute - Perform the repair\n";
++ print "--help - display this help message\n";
++}
++?>
+diff -ruBbd 0.8.7e/docs/README 0.8.7/docs/README +--- 0.8.7e/docs/README 2009-08-18 21:57:30.000000000 -0400 ++++ 0.8.7/docs/README 2009-08-18 21:58:09.000000000 -0400 +@@ -90,6 +90,9 @@ + table + poller_reindex_hosts.php - Cause data query reindex on hosts + rebuild_poller_cache.php - Rebuilds the poller cache ++ repair_templates.php - Certain templates, when created using the "duplicate" ++ function in Cacti, do not import/export well. This utility repairs ++ those templates. + + + +diff -ruBbd 0.8.7e/lib/export.php 0.8.7/lib/export.php +--- 0.8.7e/lib/export.php 2009-08-18 21:56:47.000000000 -0400 ++++ 0.8.7/lib/export.php 2009-08-18 21:57:50.000000000 -0400 +@@ -811,7 +811,9 @@ + } + + function xml_character_encode($text) { +- ++ if (function_exists("htmlspecialchars")) { ++ return htmlspecialchars($text, ENT_QUOTES, "UTF-8"); ++ } else { + $text = str_replace("&", "&", $text); + $text = str_replace(">", ">", $text); + $text = str_replace("<", "<", $text); +@@ -819,6 +821,7 @@ + $text = str_replace("\'", "'", $text); + + return $text; ++ } + } + + ?> +diff -ruBbd 0.8.7e/lib/import.php 0.8.7/lib/import.php +--- 0.8.7e/lib/import.php 2009-08-18 21:56:59.000000000 -0400 ++++ 0.8.7/lib/import.php 2009-08-18 21:57:55.000000000 -0400 +@@ -36,10 +36,6 @@ + return $info_array; + } + +- if (isset($xml_array["name"])) { +- $xml_array["name"] = htmlspecialchars($xml_array["name"]); +- } +- + while (list($hash, $hash_array) = each($xml_array)) { + /* parse information from the hash */ + $parsed_hash = parse_xml_hash($hash); +@@ -115,7 +111,7 @@ + $_graph_template_id = db_fetch_cell("select id from graph_templates where hash='$hash'"); + $save["id"] = (empty($_graph_template_id) ? "0" : $_graph_template_id); + $save["hash"] = $hash; +- $save["name"] = htmlspecialchars($xml_array["name"]); ++ $save["name"] = $xml_array["name"]; + $graph_template_id = sql_save($save, "graph_templates"); + + $hash_cache["graph_template"][$hash] = $graph_template_id; +@@ -914,9 +910,13 @@ + } + + function xml_character_decode($text) { ++ if (function_exists("html_entity_decode")) { ++ return html_entity_decode($text, ENT_QUOTES, "UTF-8"); ++ } else { + $trans_tbl = get_html_translation_table(HTML_ENTITIES); + $trans_tbl = array_flip($trans_tbl); + return strtr($text, $trans_tbl); ++ } + } + + ?> +diff -ruBbd 0.8.7e/lib/utility.php 0.8.7/lib/utility.php +--- 0.8.7e/lib/utility.php 2009-08-18 21:57:08.000000000 -0400 ++++ 0.8.7/lib/utility.php 2009-08-18 21:58:00.000000000 -0400 +@@ -346,6 +346,7 @@ + $save["name"] = $graph_template_input["name"]; + $save["description"] = $graph_template_input["description"]; + $save["column_name"] = $graph_template_input["column_name"]; ++ $save["hash"] = get_hash_graph_template(0, "graph_template_input"); + + $graph_template_input_id = sql_save($save, "graph_template_input"); + +@@ -436,6 +437,11 @@ + $save["local_data_id"] = (isset($local_data_id) ? $local_data_id : 0); + $save["local_data_template_rrd_id"] = (isset($data_template_rrd["local_data_template_rrd_id"]) ? $data_template_rrd["local_data_template_rrd_id"] : 0); + $save["data_template_id"] = (!empty($_local_data_id) ? $data_template_rrd["data_template_id"] : $data_template_id); ++ if ($save["local_data_id"] == 0) { ++ $save["hash"] = get_hash_data_template($data_template_rrd["local_data_template_rrd_id"], "data_template_item"); ++ } else { ++ $save["hash"] = ''; ++ } + + while (list($field, $array) = each($struct_data_source_item)) { + $save{$field} = $data_template_rrd{$field}; diff --git a/net/gip/DETAILS b/net/gip/DETAILS index 2bb46b67a8..f0ee3f8d66 100755 --- a/net/gip/DETAILS +++ b/net/gip/DETAILS @@ -1,10 +1,10 @@ SPELL=gip VERSION=1.7.0-1 - SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_URL[0]=http://dl.debain.org/$SPELL/$SOURCE - SOURCE_HASH=sha512:9dbeeace2f36a3a938300d39a269c6077b18ff9bf6cf62fd1f10b98f392521629fcd5ab9bea2c313953d3f314ed4f24f4c2cc23378055b9b6033ccd07c29bca6 + SOURCE=$SPELL-$VERSION.tar.gz + SOURCE_URL[0]=http://gip.googlecode.com/files/$SOURCE + SOURCE_HASH=sha512:ab918fcc57d09226690ef2936bbfa5c0a9332ffe7f0bef33a7bd820bbc5af0e8220429cb5e9d10014ea66cdf49cfa96fc02afc246edea4f25647eeb2a073f984 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" - WEB_SITE=http://www.debain.org/software/gip/ + WEB_SITE=http://code.google.com/p/gip/ LICENSE[0]=GPL ENTERED=20080429 SHORT="GTK IP address calculator" diff --git a/net/gip/HISTORY b/net/gip/HISTORY index 55c9a1f795..12ab12d23e 100644 --- a/net/gip/HISTORY +++ b/net/gip/HISTORY @@ -1,3 +1,6 @@ +2009-09-26 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: renewed website and source url + 2009-01-06 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.7.0-1; fixed source url * PRE_BUILD: removed libsigc++ hacks (upstream fixed) diff --git a/net/spine/DEPENDS b/net/spine/DEPENDS new file mode 100755 index 0000000000..e238d7f862 --- /dev/null +++ b/net/spine/DEPENDS @@ -0,0 +1,2 @@ +depends net-snmp && +depends mysql diff --git a/net/spine/DETAILS b/net/spine/DETAILS new file mode 100755 index 0000000000..0b83afb846 --- /dev/null +++ b/net/spine/DETAILS @@ -0,0 +1,17 @@ + SPELL=spine + VERSION=0.8.7e + SOURCE=cacti-$SPELL-$VERSION.tar.gz + SOURCE_URL[0]=http://www.cacti.net/downloads/$SPELL/$SOURCE + SOURCE_HASH=sha512:7ec964922770f7db89fdf62dff74fdd98397a045239e9e776efd8f07791d243125211d660acc54060cb7e386d8d9997e6cef2c4fc1364e7076f8e3c6ddd90536 +SOURCE_DIRECTORY="$BUILD_DIRECTORY/cacti-$SPELL-$VERSION" + WEB_SITE=http://www.cacti.net/spine_info.php + LICENSE[0]=LGPL + ENTERED=20090926 + SHORT="poller for Cacti" +cat << EOF +Spine, formally Cactid, is a poller for Cacti that primarily strives to be +as fast as possible. For this reason it is written in native C, makes use +of POSIX threads, and is linked directly against the net-snmp library for +minmumal SNMP polling overhead. Spine is a replacement for the default cmd.php +poller so you must decide if using Spine makes sense for your installation. +EOF diff --git a/net/spine/HISTORY b/net/spine/HISTORY new file mode 100644 index 0000000000..63f1531a01 --- /dev/null +++ b/net/spine/HISTORY @@ -0,0 +1,2 @@ +2009-09-26 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS, DETAILS, HISTORY, patches/*: spell created diff --git a/net/spine/PRE_BUILD b/net/spine/PRE_BUILD new file mode 100755 index 0000000000..66c1eb8c05 --- /dev/null +++ b/net/spine/PRE_BUILD @@ -0,0 +1,6 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && + +for patch in "$SPELL_DIRECTORY/patches"/*.patch; do + patch -p1 < $patch +done diff --git a/net/spine/patches/mysql_client_reconnect.patch b/net/spine/patches/mysql_client_reconnect.patch new file mode 100644 index 0000000000..5880915f92 --- /dev/null +++ b/net/spine/patches/mysql_client_reconnect.patch @@ -0,0 +1,15 @@ +--- 0.8.7e/sql.c 2009-06-28 21:45:02.000000000 -0400 ++++ ../branches/0.8.7/sql.c 2009-08-18 20:51:30.000000000 -0400 +@@ -186,6 +186,12 @@ + die("FATAL: MySQL options unable to set timeout value"); + } + ++ my_bool reconnect = 1; ++ options_error = mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect); ++ if (options_error < 0) { ++ die("FATAL: MySQL options unable to set reconnect option\n"); ++ } ++ + while (tries > 0) { + tries--; + diff --git a/net/spine/patches/ping_reliability.patch b/net/spine/patches/ping_reliability.patch new file mode 100644 index 0000000000..0535fa5ecf --- /dev/null +++ b/net/spine/patches/ping_reliability.patch @@ -0,0 +1,45 @@ +--- 0.8.7e/ping.c 2009-06-28 21:45:02.000000000 -0400 ++++ ../branches/0.8.7/ping.c 2009-08-18 20:51:30.000000000 -0400 +@@ -890,7 +890,7 @@ + return(cleaned_hostname); + } + +-/*! \fn unsigned short get_checksum(void* buf, int len) ++/*! \fn unsigned short int get_checksum(void* buf, int len) + * \brief calculates a 16bit checksum of a packet buffer + * \param buf the input buffer to calculate the checksum of + * \param len the size of the input buffer +@@ -898,11 +898,12 @@ + * \return 16bit checksum of an input buffer of size len. + * + */ +-unsigned short get_checksum(void* buf, int len) { ++unsigned short int get_checksum(void* buf, int len) { + int nleft = len; + int32_t sum = 0; +- unsigned short answer; +- unsigned short* w = (unsigned short*)buf; ++ unsigned short int answer; ++ unsigned short int* w = (unsigned short int*)buf; ++ unsigned short int odd_byte = 0; + + while (nleft > 1) { + sum += *w++; +@@ -910,7 +911,8 @@ + } + + if (nleft == 1) { +- sum += *(unsigned char*)w; ++ *(unsigned char*)(&odd_byte) = *(unsigned char*)w; ++ sum += odd_byte; + } + + sum = (sum >> 16) + (sum & 0xffff); +--- 0.8.7e/ping.h 2009-06-28 21:45:02.000000000 -0400 ++++ ../branches/0.8.7/ping.h 2009-08-18 20:51:30.000000000 -0400 +@@ -142,4 +142,4 @@ + extern char *remove_tcp_udp_from_hostname(char *hostname); + extern void update_host_status(int status, host_t *host, ping_t *ping, int availability_method); + extern int init_sockaddr(struct sockaddr_in *name, const char *hostname, unsigned short int port); +-extern unsigned short get_checksum(void* buf, int len); ++extern unsigned short int get_checksum(void* buf, int len); diff --git a/net/spine/patches/snmp_v3_fix.patch b/net/spine/patches/snmp_v3_fix.patch new file mode 100644 index 0000000000..6efe1736ed --- /dev/null +++ b/net/spine/patches/snmp_v3_fix.patch @@ -0,0 +1,88 @@ +--- 0.8.7e/configure.ac 2009-06-28 21:45:02.000000000 -0400 ++++ ../branches/0.8.7/configure.ac 2009-08-18 20:51:30.000000000 -0400 +@@ -351,6 +351,21 @@ + AC_MSG_RESULT([no]) + fi + ++# ****************** Force Net-SNMP Version Checks *********************** ++# If we should use the system popen or nifty popen ++AC_MSG_CHECKING(whether to verify net-snmp library vs header versions) ++AC_ARG_ENABLE(strict-snmp, ++ [ --enable-strict-snmp Enable checking of Net-SNMP library vs header versions (default: disabled)], ++ [ ENABLED_SNMP_VERSION=$enableval ], ++ [ ENABLED_SNMP_VERSION=no ] ++ ) ++if test "$ENABLED_SNMP_VERSION" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE(VERIFY_PACKAGE_VERSION, 1, If we are going to force Net-SNMP library and header versons to be the same) ++else ++ AC_MSG_RESULT([no]) ++fi ++ + # ****************** gethostbyname_r Check *********************** + # Linux Variant + AC_MSG_CHECKING([for glibc gethostbyname_r]) +--- 0.8.7e/snmp.c 2009-06-28 21:45:02.000000000 -0400 ++++ ../branches/0.8.7/snmp.c 2009-08-18 20:51:30.000000000 -0400 +@@ -91,7 +91,7 @@ + netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_BARE_VALUE, 1); + netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_NUMERIC_TIMETICKS, 1); + +- #ifdef PACKAGE_VERSION ++ #if defined(VERIFY_PACKAGE_VERSION) && defined(PACKAGE_VERSION) + /* check that the headers we compiled with match the library we linked with - + apparently not defined in UCD-SNMP... + */ +@@ -215,24 +215,22 @@ + session.securityName = snmp_username; + session.securityNameLen = strlen(session.securityName); + ++ if (snmp_context && strlen(snmp_context)) { + session.contextName = snmp_context; + session.contextNameLen = strlen(session.contextName); ++ } + + session.securityAuthKeyLen = USM_AUTH_KU_LEN; + +- /* set the engineBoots and engineTime to null so that they are discovered */ +- session.engineBoots = 0; +- session.engineTime = 0; +- + /* set the authentication protocol */ + if (strcmp(snmp_auth_protocol, "MD5") == 0) { + /* set the authentication method to MD5 */ +- session.securityAuthProto = snmp_duplicate_objid(usmHMACMD5AuthProtocol, OIDSIZE(usmHMACMD5AuthProtocol)); +- session.securityAuthProtoLen = OIDSIZE(usmHMACMD5AuthProtocol); ++ session.securityAuthProto = snmp_duplicate_objid(usmHMACMD5AuthProtocol, USM_AUTH_PROTO_MD5_LEN); ++ session.securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN; + }else{ + /* set the authentication method to SHA1 */ +- session.securityAuthProto = snmp_duplicate_objid(usmHMACSHA1AuthProtocol, OIDSIZE(usmHMACSHA1AuthProtocol)); +- session.securityAuthProtoLen = OIDSIZE(usmHMACSHA1AuthProtocol); ++ session.securityAuthProto = snmp_duplicate_objid(usmHMACSHA1AuthProtocol, USM_AUTH_PROTO_SHA_LEN); ++ session.securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN; + } + + /* set the authentication key to the hashed version. The password must me at least 8 char */ +@@ -255,16 +253,16 @@ + session.securityLevel = SNMP_SEC_LEVEL_AUTHNOPRIV; + }else{ + if (strcmp(snmp_priv_protocol, "DES") == 0) { +- session.securityPrivProto = snmp_duplicate_objid(usmDESPrivProtocol, OIDSIZE(usmDESPrivProtocol)); +- session.securityPrivProtoLen = OIDSIZE(usmDESPrivProtocol); ++ session.securityPrivProto = snmp_duplicate_objid(usmDESPrivProtocol, USM_PRIV_PROTO_DES_LEN); ++ session.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN; + session.securityPrivKeyLen = USM_PRIV_KU_LEN; + + /* set the security level to authenticate, and encrypted */ + session.securityLevel = SNMP_SEC_LEVEL_AUTHPRIV; + }else{ +- #if defined(usmAESPrivProtocol) && SNMP_DEFAULT_PRIV_PROTO == usmAESPrivProtocol +- session.securityPrivProto = snmp_duplicate_objid(usmAESPrivProtocol, OIDSIZE(usmAESPrivProtocol)); +- session.securityPrivProtoLen = OIDSIZE(usmAESPrivProtocol); ++ #if defined(USM_PRIV_PROTO_AES_LEN) ++ session.securityPrivProto = snmp_duplicate_objid(usmAESPrivProtocol, USM_PRIV_PROTO_AES_LEN); ++ session.securityPrivProtoLen = USM_PRIV_PROTO_AES_LEN; + session.securityPrivKeyLen = USM_PRIV_KU_LEN; + #else + session.securityPrivProto = snmp_duplicate_objid(usmAES128PrivProtocol, OIDSIZE(usmAES128PrivProtocol)); diff --git a/spelling/hunspell/DETAILS b/spelling/hunspell/DETAILS index 38f43e9fb8..01563f8c4a 100755 --- a/spelling/hunspell/DETAILS +++ b/spelling/hunspell/DETAILS @@ -1,5 +1,5 @@ SPELL=hunspell - VERSION=1.1.12 + VERSION=1.2.8 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE} diff --git a/spelling/hunspell/HISTORY b/spelling/hunspell/HISTORY index c246a0ea78..0d9dc4ccd5 100644 --- a/spelling/hunspell/HISTORY +++ b/spelling/hunspell/HISTORY @@ -1,3 +1,6 @@ +2009-09-26 Bor Kraljič <pyrobor@ver.si> + * DETAILS: updated spell to 1.2.8 + 2007-10-13 George Sherwood <george@beernabeer.com> * DETAILS: Updated to version 1.1.12 diff --git a/spelling/hunspell/hunspell-1.1.12.tar.gz.sig b/spelling/hunspell/hunspell-1.1.12.tar.gz.sig Binary files differdeleted file mode 100644 index 9ed7cef00e..0000000000 --- a/spelling/hunspell/hunspell-1.1.12.tar.gz.sig +++ /dev/null diff --git a/spelling/hunspell/hunspell-1.2.8.tar.gz.sig b/spelling/hunspell/hunspell-1.2.8.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..68b2e1b0c8 --- /dev/null +++ b/spelling/hunspell/hunspell-1.2.8.tar.gz.sig |