OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Jan-2008 20:14:13
Branch: HEAD Handle: 2008011219141200
Modified files:
openpkg-src/cacti cacti-cron.sh cacti.spec
Log:
Cacti cron-job nowadays is a CLI command; fix path detection of tools
like 'php' and 'rrdtool' in installer
Summary:
Revision Changes Path
1.5 +1 -2 openpkg-src/cacti/cacti-cron.sh
1.46 +3 -2 openpkg-src/cacti/cacti.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cacti/cacti-cron.sh
============================================================================
$ cvs diff -u -r1.4 -r1.5 cacti-cron.sh
--- openpkg-src/cacti/cacti-cron.sh 14 Sep 2004 10:26:11 -0000 1.4
+++ openpkg-src/cacti/cacti-cron.sh 12 Jan 2008 19:14:12 -0000 1.5
@@ -3,6 +3,5 @@
## cacti-cron.sh -- Cacti Cron Job
##
-server=`grep '^Listen' @l_prefix@/etc/cacti/cacti-apache.conf | head -1 |
awk '{ print $2; }'`
[EMAIL PROTECTED]@/bin/wget -qO /dev/null http://$server/cacti/poller.php ||
true
[EMAIL PROTECTED]@/bin/php @l_prefix@/share/cacti/poller.php >/dev/null 2>&1
|| true
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cacti/cacti.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 cacti.spec
--- openpkg-src/cacti/cacti.spec 1 Jan 2008 14:51:38 -0000 1.45
+++ openpkg-src/cacti/cacti.spec 12 Jan 2008 19:14:12 -0000 1.46
@@ -32,7 +32,7 @@
Group: Monitoring
License: GPL
Version: 0.8.7a
-Release: 20080101
+Release: 20080112
# list of sources
Source0: http://www.cacti.net/downloads/cacti-%{version}.tar.gz
@@ -46,7 +46,7 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
PreReq: OpenPKG, openpkg >= 20060823
-PreReq: rrdtool, mysql, snmp, perl, php, wget
+PreReq: rrdtool, mysql, snmp, perl, php
PreReq: apache
PreReq: apache-php
PreReq: apache-php::with_mysql = yes
@@ -103,6 +103,7 @@
cacti.sql
%{l_shtool} subst \
-e 's;docs/;../docs/;g' \
+ -e 's;"/bin";"%{l_prefix}/bin", "%{l_prefix}/sbin", "/bin";g' \
install/index.php
%{l_shtool} subst \
-e 's;#!/usr/bin/php;#!%{l_prefix}/bin/php;' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
