network/cacti: Updated for version 0.8.7h.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

3 files changed, 33 insertions, 35 deletions

diff --git a/network/cacti/cacti.SlackBuild b/network/cacti/cacti.SlackBuild
index 4dcdbb5e2c..5d7a4f5401 100644
--- a/network/cacti/cacti.SlackBuild
+++ b/network/cacti/cacti.SlackBuild
@@ -3,11 +3,30 @@
 # Slackware build script for cacti:
 # a network graphing solution using rrdtool
 
-# Written by Niels Horn <niels.horn@gmail.com>
-# revision date 2010/09/17
+# Copyright 2009-2011  Niels Horn, Rio de Janeiro, RJ, Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# revision date 2011/10/03
 
 PRGNAM=cacti
-VERSION=${VERSION:-0.8.7g_p7}
+VERSION=${VERSION:-0.8.7h}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -26,13 +45,7 @@ for i in $(echo $DOCROOT | tr "/" " "); do
 done
 
 # Current PATCHES (empty if none for now)
-PATCHES="data_source_deactivate.patch \
-graph_list_view.patch \
-html_output.patch \
-ldap_group_authenication.patch \
-script_server_command_line_parse.patch \
-ping.patch \
-poller_interval.patch"
+PATCHES=""
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -58,7 +71,7 @@ done
 mkdir -p $PKG/$DOCROOT/$PRGNAM
 cp -a \
   *.php *.pl \
-  include resource lib rra images cli scripts log install \
+  include resource lib rra images cli scripts install \
     $PKG/$DOCROOT/$PRGNAM/
 chown -R $PHPUSER:$PHPGROUP $PKG/$DOCROOT/$PRGNAM
 
@@ -71,10 +84,11 @@ cd -
 
 # Rename config file and set permissions to hide passwords
 mv $PKG/etc/$PRGNAM/config.php $PKG/etc/$PRGNAM/config.php.new
-chmod 600 $PKG/etc/$PRGNAM/config.php.new
+chmod 640 $PKG/etc/$PRGNAM/config.php.new
 
-# Rename initial log file to avoid overwriting it during upgrades
-mv $PKG/$DOCROOT/$PRGNAM/log/$PRGNAM.log $PKG/$DOCROOT/$PRGNAM/log/$PRGNAM.log.new
+# Create empty log file
+mkdir -p $PKG/var/log/cacti
+touch $PKG/var/log/cacti/cacti.log.new
 
 # Copy docs & create symbolic link
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -94,8 +108,6 @@ cp cacti.sql $PKG/usr/share/$PRGNAM
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
-# include logfile rename to doinst.sh
-echo "config .$DOCROOT/$PRGNAM/log/$PRGNAM.log.new" >> $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/cacti/cacti.info b/network/cacti/cacti.info
index a18e416721..df49e58752 100644
--- a/network/cacti/cacti.info
+++ b/network/cacti/cacti.info
@@ -1,24 +1,10 @@
 PRGNAM="cacti"
-VERSION="0.8.7g_p7"
+VERSION="0.8.7h"
 HOMEPAGE="http://www.cacti.net/"
-DOWNLOAD="http://www.cacti.net/downloads/cacti-0.8.7g.tar.gz \
-          http://www.cacti.net/downloads/patches/0.8.7g/data_source_deactivate.patch \
-          http://www.cacti.net/downloads/patches/0.8.7g/graph_list_view.patch \
-          http://www.cacti.net/downloads/patches/0.8.7g/html_output.patch \
-          http://www.cacti.net/downloads/patches/0.8.7g/ldap_group_authenication.patch \
-          http://www.cacti.net/downloads/patches/0.8.7g/script_server_command_line_parse.patch \
-          http://www.cacti.net/downloads/patches/0.8.7g/ping.patch \
-          http://www.cacti.net/downloads/patches/0.8.7g/poller_interval.patch"
-MD5SUM="268421cb1a58d3444f7ecbddb4c4b016 \
-        d39570fd2e2b5c7f9aa47000b8a28c42 \
-        6c2f7db4af48e59323c5e8b25a34866b \
-        134d120930e4f2211f017f5b71d9280a \
-        5bb62cc6fde7c99f0c29cab869412f73 \
-        e14edee082d1250e3946c3caa58a40b4 \
-        2b303584a557ef16d112b109898ca5e8 \
-        37c74d5aabf4042e886dab114158ba19"
+DOWNLOAD="http://www.cacti.net/downloads/cacti-0.8.7h.tar.gz"
+MD5SUM="58c9371341f49a190ae11a85118e598d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"
diff --git a/network/cacti/doinst.sh b/network/cacti/doinst.sh
index adb1b10ae8..0509665b68 100644
--- a/network/cacti/doinst.sh
+++ b/network/cacti/doinst.sh
@@ -12,4 +12,4 @@ config() {
 }
 
 config etc/cacti/config.php.new
-
+config var/log/cacti/cacti.log.new