From aa5b56081cbcba7a08e7f906b8bee7e774885343 Mon Sep 17 00:00:00 2001
From: Thomas Penteker <tek@serverop.de>
Date: Thu, 22 Apr 2010 22:56:16 +0200
Subject: [PATCH] cacti: 0.8.7e include some security critical patches

---
 cacti/.footprint |  1 +
 cacti/.md5sum    |  6 ++++++
 cacti/Pkgfile    | 14 ++++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/cacti/.footprint b/cacti/.footprint
index 248f82355..2abb40dc9 100644
--- a/cacti/.footprint
+++ b/cacti/.footprint
@@ -24,6 +24,7 @@ drwxr-xr-x	root/root	var/www/htdocs/cacti/cli/
 -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/repair_templates.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
diff --git a/cacti/.md5sum b/cacti/.md5sum
index c43e0c17e..bedc3429d 100644
--- a/cacti/.md5sum
+++ b/cacti/.md5sum
@@ -1 +1,7 @@
 7563a58a57d2c6cc0da28cc341a30969  cacti-0.8.7e.tar.gz
+8599b4c9433cb1751086ef394bba66ee  cli_add_graph.patch
+4323da80d4dc0238fc4902dcd27f47f0  cross_site_fix.patch
+7fe579f0d2fb999c5866e8218436a65d  fix_icmp_on_windows_iis_servers.patch
+85c71f16fcbf79a11f24609b973199d8  snmp_invalid_response.patch
+7e82d147a279f5726dc1ad6bf838f6b0  sql_injection_template_export.patch
+b1bd81dc89aa3e30365d0c9d45956255  template_duplication.patch
diff --git a/cacti/Pkgfile b/cacti/Pkgfile
index b28ee44ad..e7cee94de 100644
--- a/cacti/Pkgfile
+++ b/cacti/Pkgfile
@@ -6,10 +6,20 @@
 
 name=cacti
 version=0.8.7e
-release=1
-source=(http://www.$name.net/downloads/$name-$version.tar.gz)
+release=2
+source=(http://www.$name.net/downloads/$name-$version.tar.gz
+ http://www.cacti.net/downloads/patches/0.8.7e/cli_add_graph.patch
+ http://www.cacti.net/downloads/patches/0.8.7e/snmp_invalid_response.patch
+ http://www.cacti.net/downloads/patches/0.8.7e/template_duplication.patch
+ http://www.cacti.net/downloads/patches/0.8.7e/fix_icmp_on_windows_iis_servers.patch
+ http://www.cacti.net/downloads/patches/0.8.7e/cross_site_fix.patch
+ http://www.cacti.net/downloads/patches/0.8.7e/sql_injection_template_export.patch
+ )
 
 build () {
+  cd $name-$version
+  for i in ../*.patch;do patch -p1 -i "$i";done
+  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}