SPECS: cacti.spec - rel 2: use system adodb, resolves CVE-2006-014...

[glen]

Author: glen                         Date: Sat Apr 15 11:30:09 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2: use system adodb, resolves CVE-2006-0147, CVE-2006-0146, CVE-2006-0410, CVE-2006-0806

---- Files affected:
SPECS:
   cacti.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/cacti.spec
diff -u SPECS/cacti.spec:1.40 SPECS/cacti.spec:1.41
--- SPECS/cacti.spec:1.40	Tue Jan 17 11:01:01 2006
+++ SPECS/cacti.spec	Sat Apr 15 13:30:04 2006
@@ -4,7 +4,7 @@
 Summary(pl):	Cacti - frontend w PHP do rrdtoola
 Name:		cacti
 Version:	0.8.6h
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
@@ -13,10 +13,11 @@
 Patch1:		http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch
 Patch2:		http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch
 Patch3:		http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch
-Patch4:         %{name}-plugin-%{version}.diff
+Patch4:		%{name}-plugin-%{version}.diff
 Patch5:		%{name}-config.patch
 URL:		http://www.cacti.net/
 BuildRequires:	rpm-perlprov
+Requires:	adodb >= 4.67-1.17
 Requires:	crondaemon
 Requires:	net-snmp-utils
 Requires:	php
@@ -62,7 +63,7 @@
 %patch4 -p1
 %patch5 -p1
 
-%build
+rm -rf lib/adodb
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -107,7 +108,7 @@
 ln -sf /var/lib/%{name}/rra $RPM_BUILD_ROOT%{webadminroot}/rra
 
 cat  << 'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name}
-*/5 * * * * http umask 022; /usr/bin/php %{webadminroot}/poller.php > /dev/null 2>&1
+*/5 * * * * http umask 022; %{_bindir}/php %{webadminroot}/poller.php > /dev/null 2>&1
 EOF
 
 %clean
@@ -131,6 +132,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2006/04/15 11:30:04  glen
+- rel 2: use system adodb, resolves CVE-2006-0147, CVE-2006-0146, CVE-2006-0410, CVE-2006-0806
+
 Revision 1.40  2006/01/17 10:01:01  arekm
 - updated to 0.8.6h (official mysql 5.x fixes)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cacti.spec?r1=1.40&r2=1.41&f=u