cacti: include official patches

3 files changed, 6 insertions, 110 deletions

diff --git a/cacti/.footprint b/cacti/.footprint
index 4e5354b25..7f6d1d7de 100644
--- a/cacti/.footprint
+++ b/cacti/.footprint
@@ -34,112 +34,6 @@ drwxr-xr-x	root/root	var/www/htdocs/cacti/cli/
 -rw-r--r--	root/root	var/www/htdocs/cacti/data_queries.php
 -rw-r--r--	root/root	var/www/htdocs/cacti/data_sources.php
 -rw-r--r--	root/root	var/www/htdocs/cacti/data_templates.php
-drwxr-xr-x	root/root	var/www/htdocs/cacti/docs/
-drwxr-xr-x	root/root	var/www/htdocs/cacti/docs/html/
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/LICENSE.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/advanced_topics.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/basics.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/batch_copy_users.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/bsd_ports.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/cacti_help.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/cdefs.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/check_cacti_poller.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/check_data_gathering.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/check_mysql_updating.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/check_rrd_graph.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/check_rrd_numbers.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
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/cli_copy_user.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/cli_poller_graphs_reapply_names.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/cli_poller_output_empty.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/cli_poller_reindex_hosts.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/copying_user.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/create_new_user.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/data_input_methods.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/data_presentation.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/data_queries.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/data_storage.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/debug_miscellaneous.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/debug_rpm_installation.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/debugging.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/delete_users.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/enable_disable_users.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/faq.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/graph_howto.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/graph_overview.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/graph_snmp_oid.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/graph_templates.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/graph_viewing.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/guest_access.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/host_templates.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
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/graph_tree.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/host_template.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/import_template.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/new_device.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/new_graphs.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/principles_of_operation.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_batch_copy_1.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_batch_copy_2.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_copy_1.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_copy_2.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_delete_1.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_delete_2.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_edit.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_enable_disable_1.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_enable_disable_2.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_list.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/images/user_management_new.png
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/index.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/install_unix.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/install_windows.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/installation.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/making_scripts_work_with_cacti.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/migration_php_scripts_to_script_server.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/new_graphs.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/operating_principles.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/php_script_server.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/reference.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/requirements.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/rrdtool_features.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/script_query_xml.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/scripts.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/snmp_query_xml.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/template_export.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/template_import.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/templates.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/testing_script_in_script_server.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/unix_apply_patches.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/unix_configure_cacti.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/unix_configure_httpd.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/unix_configure_mysql.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/unix_configure_php.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/unix_configure_spine.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/upgrade.html
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/html/upgrade_using_hostmib_data_queries.html
--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/txt/
--rw-r--r--	root/root	var/www/htdocs/cacti/docs/txt/manual.txt
 -rw-r--r--	root/root	var/www/htdocs/cacti/gprint_presets.php
 -rw-r--r--	root/root	var/www/htdocs/cacti/graph.php
 -rw-r--r--	root/root	var/www/htdocs/cacti/graph_image.php
diff --git a/cacti/.md5sum b/cacti/.md5sum
index a5cc6f831..d22e9e7e8 100644
--- a/cacti/.md5sum
+++ b/cacti/.md5sum
@@ -1 +1,2 @@
 268421cb1a58d3444f7ecbddb4c4b016  cacti-0.8.7g.tar.gz
+6b2e880a4d9e1ace71c6d45424c63683  cacti_official_patches.diff
diff --git a/cacti/Pkgfile b/cacti/Pkgfile
index 68c4b2e6a..038c5fd08 100644
--- a/cacti/Pkgfile
+++ b/cacti/Pkgfile
@@ -6,12 +6,13 @@
 
 name=cacti
 version=0.8.7g
-release=2
-source=(http://www.$name.net/downloads/$name-$version.tar.gz)
+release=3
+source=(http://www.$name.net/downloads/$name-$version.tar.gz
+        http://crux.nu/~tek/cacti_official_patches.diff)
 
 build () {
   cd $name-$version
-  #for i in ../*.patch;do patch -p1 -i "$i";done
+  patch -p1 -i ../cacti_official_patches.diff
   cd ..
   mkdir -p $PKG/var/www/htdocs    
   mv $name-$version $PKG/var/www/htdocs/$name
@@ -19,5 +20,5 @@ build () {
   sed -i -e "s|\$config\['url_path'] = '/'|\$config\['url_path'] = '/cacti/'|g" \
     $PKG/var/www/htdocs/$name/include/global.php
   rm $PKG/var/www/htdocs/cacti/{README,LICENSE}
-  rm $PKG/var/www/htdocs/cacti/docs/{CHANGELOG,CONTRIB,README}
+  rm -r $PKG/var/www/htdocs/cacti/docs
 }