rpms/cacti/EL-5 cacti.spec, 1.13, 1.14 sources, 1.4, 1.5 CVE-2007-3112.patch, 1.1, NONE cacti-0.8.6h-dbcfg.patch, 1.2, NONE graph_debug_lockup_fix.patch, 1.1, NONE ping_php_version4_snmpgetnext.patch, 1.1, NONE snmpwalk_fix.patch, 1.1, NONE thumbnail_graphs_not_working.patch, 1.1, NONE tree_console_missing_hosts.patch, 1.1, NONE

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10251/EL-5

Modified Files:
	cacti.spec sources 
Removed Files:
	CVE-2007-3112.patch cacti-0.8.6h-dbcfg.patch 
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Log Message:
removed un-needed patches as well as new upstream version


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-5/cacti.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cacti.spec	21 Sep 2007 14:57:00 -0000	1.13
+++ cacti.spec	20 Nov 2007 15:13:20 -0000	1.14
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.6j
-Release: 9%{?dist}
+Version: 0.8.7a
+Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,14 +11,6 @@
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
 
-Patch1: cacti-0.8.6h-dbcfg.patch
-Patch2: CVE-2007-3112.patch
-Patch3: ping_php_version4_snmpgetnext.patch
-Patch4: tree_console_missing_hosts.patch
-Patch5: thumbnail_graphs_not_working.patch
-Patch6: graph_debug_lockup_fix.patch
-Patch7: snmpwalk_fix.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp
@@ -37,13 +29,6 @@
 
 %prep
 %setup -q
-%patch1 -p0
-%patch2 -p3
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -64,9 +49,9 @@
 %{__cp} -a images/ include/ install/ lib/ resource/ %{buildroot}%{_datadir}/%{name}
 %{__cp} %{SOURCE3} ./docs/README.cacti
 %{__cp} -a docs/ %{buildroot}/%{_docdir}/%{name}-%{version}
-%{__mv} %{buildroot}/%{_datadir}/%{name}/include/db.php %{buildroot}/%{_sysconfdir}/%{name}/db.php
+%{__mv} %{buildroot}/%{_datadir}/%{name}/include/config.php %{buildroot}/%{_sysconfdir}/%{name}/db.php
 %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/cmd.php %{buildroot}/%{_datadir}/%{name}/poller.php
-ln -s %{_sysconfdir}/%{name}/db.php %{buildroot}/%{_datadir}/%{name}/include/db.php
+ln -s %{_sysconfdir}/%{name}/db.php %{buildroot}/%{_datadir}/%{name}/include/config.php
 ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log
@@ -115,8 +100,13 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
-- Added rest of official patches
+* Tue Nov 20 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.7a-1
+- Upstream released new version
+- Fixes for bug #391691 - CVE-2007-6035
+
+* Fri Oct 13 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.7-2
+- Upstream released new version
+- No longer need to patch for /etc/cacti/*
 
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 May 2007 20:46:41 -0000	1.4
+++ sources	20 Nov 2007 15:13:20 -0000	1.5
@@ -1 +1 @@
-29436be46b289d13dfce48e7618129e2  cacti-0.8.6j.tar.gz
+7d298e496058ec91f6d1ecdc97e0cca5  cacti-0.8.7a.tar.gz


--- CVE-2007-3112.patch DELETED ---


--- cacti-0.8.6h-dbcfg.patch DELETED ---


--- graph_debug_lockup_fix.patch DELETED ---


--- ping_php_version4_snmpgetnext.patch DELETED ---


--- snmpwalk_fix.patch DELETED ---


--- thumbnail_graphs_not_working.patch DELETED ---


--- tree_console_missing_hosts.patch DELETED ---