ports/contrib
3
3
Fork 3
Code Issues Pull Requests Activity

cacti: 0.8.7b -> 0.8.7d

Browse Source
This commit is contained in:
Thomas Penteker 2009-02-12 18:16:46 +01:00
parent c123ec1dc1
commit 982004ae4f
7 changed files with 21 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cacti/.footprint
View File

@ -5,20 +5,26 @@ drwxr-xr-x root/root var/www/htdocs/cacti/
-rw-r--r-- root/root var/www/htdocs/cacti/about.php
-rw-r--r-- root/root var/www/htdocs/cacti/auth_changepassword.php
-rw-r--r-- root/root var/www/htdocs/cacti/auth_login.php
-rw------- root/root var/www/htdocs/cacti/cacti.sql
-rw-r--r-- root/root var/www/htdocs/cacti/cacti.sql
-rw-r--r-- root/root var/www/htdocs/cacti/cdef.php
drwxr-xr-x root/root var/www/htdocs/cacti/cli/
-rw-r--r-- root/root var/www/htdocs/cacti/cli/.htaccess
-rw-r--r-- root/root var/www/htdocs/cacti/cli/add_data_query.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/add_device.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/add_graph_template.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/add_graphs.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/add_perms.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/add_tree.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/copy_user.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/host_update_template.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/poller_data_sources_reapply_names.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/poller_graphs_reapply_names.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/poller_output_empty.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/poller_reindex_hosts.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/rebuild_poller_cache.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/repair_database.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/structure_rra_paths.php
-rw-r--r-- root/root var/www/htdocs/cacti/cli/upgrade_database.php
-rw-r--r-- root/root var/www/htdocs/cacti/cmd.php
-rw-r--r-- root/root var/www/htdocs/cacti/color.php
-rw-r--r-- root/root var/www/htdocs/cacti/data_input.php
@ -42,7 +48,9 @@ drwxr-xr-x root/root var/www/htdocs/cacti/docs/html/
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/check_rrd_owner.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/check_rrd_updating.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/check_zero_values.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/cli_add_data_query.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/cli_add_device.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/cli_add_graph_template.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/cli_add_graphs.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/cli_add_perms.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/cli_add_tree.html
@ -72,6 +80,9 @@ drwxr-xr-x root/root var/www/htdocs/cacti/docs/html/
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/host_variables.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/how_to.html
drwxr-xr-x root/root var/www/htdocs/cacti/docs/html/images/
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/images/data_source_title_example1.png
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/images/data_source_title_example2.png
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/images/data_source_title_template.png
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/images/data_template.png
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/images/export_template.png
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/images/graph_template.png
@ -123,6 +134,8 @@ drwxr-xr-x root/root var/www/htdocs/cacti/docs/html/images/
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/user_management.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/using_spine.html
-rw-r--r-- root/root var/www/htdocs/cacti/docs/html/variables.html
drwxr-xr-x root/root var/www/htdocs/cacti/docs/pdf/
-rw-r--r-- root/root var/www/htdocs/cacti/docs/pdf/README
drwxr-xr-x root/root var/www/htdocs/cacti/docs/text/
-rw-r--r-- root/root var/www/htdocs/cacti/docs/text/manual.txt
-rw-r--r-- root/root var/www/htdocs/cacti/gprint_presets.php
@ -210,24 +223,6 @@ drwxr-xr-x root/root var/www/htdocs/cacti/include/
-rw-r--r-- root/root var/www/htdocs/cacti/include/global_constants.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/global_form.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/global_settings.php
drwxr-xr-x root/root var/www/htdocs/cacti/include/html/
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_data_source_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_data_template_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_device_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_dq_view_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_dt_view_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_graph_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_graph_items_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_graph_template_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_graph_view_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_host_template_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_poller_item_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_snmp_cache_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_timespan_selector.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_timespan_settings.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_user_admin_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_user_log_filter_table.php
-rw-r--r-- root/root var/www/htdocs/cacti/include/html/inc_view_logfile_table.php
drwxr-xr-x root/root var/www/htdocs/cacti/include/jscalendar/
-rw-r--r-- root/root var/www/htdocs/cacti/include/jscalendar/calendar-setup.js
-rw-r--r-- root/root var/www/htdocs/cacti/include/jscalendar/calendar.js
@ -309,6 +304,8 @@ drwxr-xr-x root/root var/www/htdocs/cacti/install/
-rw-r--r-- root/root var/www/htdocs/cacti/install/0_8_6j_to_0_8_7.php
-rw-r--r-- root/root var/www/htdocs/cacti/install/0_8_7_to_0_8_7a.php
-rw-r--r-- root/root var/www/htdocs/cacti/install/0_8_7a_to_0_8_7b.php
-rw-r--r-- root/root var/www/htdocs/cacti/install/0_8_7b_to_0_8_7c.php
-rw-r--r-- root/root var/www/htdocs/cacti/install/0_8_7c_to_0_8_7d.php
-rw-r--r-- root/root var/www/htdocs/cacti/install/0_8_to_0_8_1.php
-rw-r--r-- root/root var/www/htdocs/cacti/install/index.php
-rw-r--r-- root/root var/www/htdocs/cacti/install/install_finish.gif
@ -434,6 +431,7 @@ drwxr-xr-x root/root var/www/htdocs/cacti/lib/adodb/lang/
-rw-r--r-- root/root var/www/htdocs/cacti/lib/sort.php
-rw-r--r-- root/root var/www/htdocs/cacti/lib/template.php
-rw-r--r-- root/root var/www/htdocs/cacti/lib/time.php
-rw-r--r-- root/root var/www/htdocs/cacti/lib/timespan_settings.php
-rw-r--r-- root/root var/www/htdocs/cacti/lib/tree.php
-rw-r--r-- root/root var/www/htdocs/cacti/lib/utility.php
-rw-r--r-- root/root var/www/htdocs/cacti/lib/variables.php

5
cacti/.md5sum
View File

@ -1,4 +1 @@
63ffca5735b60bc33c68bc880f0e8042 cacti-0.8.7b.tar.gz
b11131800e961416fe0dc9416176156d reset_each_patch.patch
696606f4b6e32067e230c640002c5875 snmp_auth_none_notice.patch
65f08218027c7d5fe645f519777cc88c upgrade_from_086k_fix.patch
0822068bfa547278e94d3143ef9279e0 cacti-0.8.7d.tar.gz

12
cacti/Pkgfile
View File

@ -5,19 +5,11 @@
# Depends on: rrdtool mod_php mysql net-snmp php-mysql php
name=cacti
version=0.8.7b
version=0.8.7d
release=1
source=(http://www.$name.net/downloads/$name-$version.tar.gz \
http://www.cacti.net/downloads/patches/0.8.7b/reset_each_patch.patch \
http://www.cacti.net/downloads/patches/0.8.7b/snmp_auth_none_notice.patch \
http://www.cacti.net/downloads/patches/0.8.7b/upgrade_from_086k_fix.patch)
source=(http://www.$name.net/downloads/$name-$version.tar.gz)
build () {
cd $name-$version
patch -p1 -N < ../reset_each_patch.patch
patch -p1 -N < ../snmp_auth_none_notice.patch
patch -p1 -N < ../upgrade_from_086k_fix.patch
cd ..
mkdir -p $PKG/var/www/htdocs
mv $name-$version $PKG/var/www/htdocs/$name
chown -R cactiuser $PKG/var/www/htdocs/$name/{rra,log}

2
cacti/pre-install
View File

@ -1,4 +1,4 @@
#!/bin/bash
getent passwd cacti || useradd -m -d /var/empty -s /bin/false cactiuser
getent passwd cactiuser || useradd -m -d /var/empty -s /bin/false cactiuser
passwd -l cactiuser

27
cacti/reset_each_patch.patch
View File

@ -1,27 +0,0 @@
--- 0.8.7/lib/functions.php 2008/02/01 19:58:05 4448
+++ 0.8.7-patched/lib/functions.php 2008/03/17 23:45:09 4552
@@ -143,14 +143,16 @@
function read_default_config_option($config_name) {
global $config, $settings;
- reset($settings);
- while (list($tab_name, $tab_array) = each($settings)) {
- if ((isset($tab_array[$config_name])) && (isset($tab_array[$config_name]["default"]))) {
- return $tab_array[$config_name]["default"];
- }else{
- while (list($field_name, $field_array) = each($tab_array)) {
- if ((isset($field_array["items"])) && (isset($field_array["items"][$config_name])) && (isset($field_array["items"][$config_name]["default"]))) {
- return $field_array["items"][$config_name]["default"];
+ if (is_array($settings)) {
+ reset($settings);
+ while (list($tab_name, $tab_array) = each($settings)) {
+ if ((isset($tab_array[$config_name])) && (isset($tab_array[$config_name]["default"]))) {
+ return $tab_array[$config_name]["default"];
+ }else{
+ while (list($field_name, $field_array) = each($tab_array)) {
+ if ((isset($field_array["items"])) && (isset($field_array["items"][$config_name])) && (isset($field_array["items"][$config_name]["default"]))) {
+ return $field_array["items"][$config_name]["default"];
+ }
}
}
}

11
cacti/snmp_auth_none_notice.patch
View File

@ -1,11 +0,0 @@
diff -ruBbd cacti-0.8.7b/lib/snmp.php cacti-0.8.7b-patched/lib/snmp.php
--- cacti-0.8.7b/lib/snmp.php 2008-02-11 19:57:48.000000000 -0500
+++ cacti-0.8.7b-patched/lib/snmp.php 2008-02-29 20:53:00.000000000 -0500
@@ -225,6 +225,7 @@
function cacti_snmp_walk($hostname, $community, $oid, $version, $username, $password, $auth_proto, $priv_pass, $priv_proto, $context, $port = 161, $timeout = 500, $retries = 0, $environ = SNMP_POLLER) {
global $config;
+ $snmp_auth = '';
$snmp_array = array();
$temp_array = array();

12
cacti/upgrade_from_086k_fix.patch
View File

@ -1,12 +0,0 @@
--- cacti-0.8.7b/install/index.php 2008-02-11 18:57:48.000000000 -0600
+++ cacti-0.8.7b-patched/install/index.php 2008-03-03 20:45:43.000000000 -0600
@@ -27,7 +27,8 @@
/* allow the upgrade script to run for as long as it needs to */
ini_set("max_execution_time", "0");
-$cacti_versions = array("0.8", "0.8.1", "0.8.2", "0.8.2a", "0.8.3", "0.8.3a", "0.8.4", "0.8.5", "0.8.5a", "0.8.6", "0.8.6a", "0.8.6b", "0.8.6c", "0.8.6d", "0.8.6e", "0.8.6f", "0.8.6g", "0.8.6h", "0.8.6i", "0.8.6j", "0.8.7", "0.8.7a", "0.8.7b");
+$cacti_versions = array("0.8", "0.8.1", "0.8.2", "0.8.2a", "0.8.3", "0.8.3a", "0.8.4", "0.8.5", "0.8.5a", "0.8.6", "0.8.6a", "0.8.6b", "0.8.6c", "0.8.6d", "0.8.6e", "0.8.6f", "0.8.6g", "0.8.6h", "0.8.6i", "0.8.6j", "0.8.6k", "0.8.7", "0.8.7a", "0.8.7b");
+
$old_cacti_version = db_fetch_cell("select cacti from version");