From 0324cdbd19f1b09b66390823029e11993d40b140 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 31 Jan 2011 20:58:14 +0100
Subject: [PATCH] Updated cacti (0.8.7g).

---
 config/rootfiles/packages/cacti | 9 ++++++---
 lfs/cacti                       | 7 ++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/rootfiles/packages/cacti b/config/rootfiles/packages/cacti
index 1935c5aaf0..123d1f6aa9 100644
--- a/config/rootfiles/packages/cacti
+++ b/config/rootfiles/packages/cacti
@@ -16,6 +16,7 @@ usr/share/cacti/cli/add_graph_template.php
 usr/share/cacti/cli/add_graphs.php
 usr/share/cacti/cli/add_perms.php
 usr/share/cacti/cli/add_tree.php
+usr/share/cacti/cli/convert_innodb.php
 usr/share/cacti/cli/copy_user.php
 usr/share/cacti/cli/host_update_template.php
 usr/share/cacti/cli/import_template.php
@@ -25,6 +26,7 @@ usr/share/cacti/cli/poller_output_empty.php
 usr/share/cacti/cli/poller_reindex_hosts.php
 usr/share/cacti/cli/rebuild_poller_cache.php
 usr/share/cacti/cli/repair_database.php
+usr/share/cacti/cli/repair_templates.php
 usr/share/cacti/cli/structure_rra_paths.php
 usr/share/cacti/cli/upgrade_database.php
 usr/share/cacti/cmd.php
@@ -311,6 +313,8 @@ usr/share/cacti/install/0_8_7a_to_0_8_7b.php
 usr/share/cacti/install/0_8_7b_to_0_8_7c.php
 usr/share/cacti/install/0_8_7c_to_0_8_7d.php
 usr/share/cacti/install/0_8_7d_to_0_8_7e.php
+usr/share/cacti/install/0_8_7e_to_0_8_7f.php
+usr/share/cacti/install/0_8_7f_to_0_8_7g.php
 usr/share/cacti/install/0_8_to_0_8_1.php
 usr/share/cacti/install/index.php
 usr/share/cacti/install/install_finish.gif
@@ -495,8 +499,7 @@ usr/share/cacti/utilities.php
 #var/cacti
 #var/cacti/log
 var/cacti/log/.htaccess
-var/cacti/log/.placeholder
-var/cacti/log/cacti.log
+#var/cacti/log/cacti.log
 #var/cacti/rra
-var/cacti/rra/.placeholder
+var/cacti/rra/.htaccess
 var/ipfire/backup/addons/includes/cacti
diff --git a/lfs/cacti b/lfs/cacti
index 9862cfeb17..ef06eade18 100644
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.8.7e
+VER        = 0.8.7g
 
 THISAPP    = cacti-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cacti
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "netsnmpd mysql"
 
@@ -44,7 +44,8 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7563a58a57d2c6cc0da28cc341a30969
+$(DL_FILE)_MD5 = 268421cb1a58d3444f7ecbddb4c4b016
+
 
 install : $(TARGET)
 
-- 
2.39.2