diff options
| author | Niels Horn <niels.horn@gmail.com> | 2010-07-22 18:05:26 -0500 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2010-07-25 21:52:40 -0500 |
| commit | 4b1779ae81fe9e2e5ec955e9591f6f79c7cb33be (patch) | |
| tree | dfec018fc88dafb2c5ab04f19eeff53d2e579b48 /network | |
| parent | 109c11fb9c58bc7e1f8bec08904c50ca5ed4d95f (diff) | |
network/cacti: Updated for version 0.8.7g.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
Diffstat (limited to 'network')
| -rw-r--r-- | network/cacti/cacti.SlackBuild | 23 | ||||
| -rw-r--r-- | network/cacti/cacti.info | 20 |
2 files changed, 15 insertions, 28 deletions
diff --git a/network/cacti/cacti.SlackBuild b/network/cacti/cacti.SlackBuild index 2af8d0a0b5266..64edf55a4b823 100644 --- a/network/cacti/cacti.SlackBuild +++ b/network/cacti/cacti.SlackBuild @@ -4,15 +4,16 @@ # a network graphing solution using rrdtool # Written by Niels Horn <niels.horn@gmail.com> -# revision date 2010/07/05 +# revision date 2010/07/16 PRGNAM=cacti -VERSION=${VERSION:-0.8.7e_p6} +VERSION=${VERSION:-0.8.7g} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -SRCVERSION=$(echo $VERSION | cut -f1 -d_) +# Remove patch-level from $PRGNAM if it exists +SRCVERSION=$(echo "${VERSION}_" | cut -f1 -d_) DOCROOT=${DOCROOT:-/var/www/htdocs} PHPUSER=${PHPUSER:-root} @@ -24,14 +25,8 @@ for i in $(echo $DOCROOT | tr "/" " "); do RELPATH="${RELPATH}../" done -PATCHES="\ -cli_add_graph.patch \ -snmp_invalid_response.patch \ -template_duplication.patch \ -fix_icmp_on_windows_iis_servers.patch \ -cross_site_fix.patch \ -sql_injection_template_export.patch \ -" +# Current PATCHES (empty if none for now) +PATCHES="" CWD=$(pwd) TMP=${TMP:-/tmp/SBo} @@ -72,6 +67,9 @@ cd - mv $PKG/etc/$PRGNAM/config.php $PKG/etc/$PRGNAM/config.php.new chmod 600 $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 + # Copy docs & create symbolic link mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ @@ -90,7 +88,8 @@ 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 7ea1963a1b13e..df0e8830b83ca 100644 --- a/network/cacti/cacti.info +++ b/network/cacti/cacti.info @@ -1,22 +1,10 @@ PRGNAM="cacti" -VERSION="0.8.7e_p6" +VERSION="0.8.7g" HOMEPAGE="http://www.cacti.net/" -DOWNLOAD="http://www.cacti.net/downloads/cacti-0.8.7e.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" -MD5SUM="7563a58a57d2c6cc0da28cc341a30969 \ - 8599b4c9433cb1751086ef394bba66ee \ - 85c71f16fcbf79a11f24609b973199d8 \ - b1bd81dc89aa3e30365d0c9d45956255 \ - 7fe579f0d2fb999c5866e8218436a65d \ - 4323da80d4dc0238fc4902dcd27f47f0 \ - 7e82d147a279f5726dc1ad6bf838f6b0" +DOWNLOAD="http://www.cacti.net/downloads/cacti-0.8.7g.tar.gz" +MD5SUM="268421cb1a58d3444f7ecbddb4c4b016" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Niels Horn" EMAIL="niels.horn@gmail.com" -APPROVED="rworkman" +APPROVED="Erik Hanson" |