rpms/cacti/EL-5 cacti.spec, 1.21, 1.22 sources, 1.8, 1.9 cli_add_graph.patch, 1.1, NONE cross_site_fix.patch, 1.1, NONE snmp_invalid_response.patch, 1.1, NONE sql_injection_template_export.patch, 1.1, NONE template_duplication.patch, 1.1, NONE

[Mike McGrath]

Author: mmcgrath

Update of /cvs/pkgs/rpms/cacti/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5894/EL-5

Modified Files:
	cacti.spec sources 
Removed Files:
	cli_add_graph.patch cross_site_fix.patch 
	snmp_invalid_response.patch 
	sql_injection_template_export.patch template_duplication.patch 
Log Message:
Upstream released new version (has security fixes)



Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/EL-5/cacti.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- cacti.spec	23 Apr 2010 13:54:05 -0000	1.21
+++ cacti.spec	24 May 2010 15:56:59 -0000	1.22
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.7e
-Release: 4%{?dist}
+Version: 0.8.7f
+Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,11 +11,6 @@ Source0: http://www.cacti.net/downloads/
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
-Patch0: cli_add_graph.patch
-Patch1: snmp_invalid_response.patch
-Patch2: template_duplication.patch
-Patch3: cross_site_fix.patch
-Patch4: sql_injection_template_export.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,11 +30,6 @@ used to creating traffic graphs with MRT
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -115,6 +105,10 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Mon May 24 2010 Mike McGrath <mmcgrath at redhat.com> - 0.8.7f-1
+- Upstream released new version
+- Contains security updates #595289
+
 * Fri Apr 23 2010 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-4
 - Pulling in patches from upstream
 - SQL injection fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Aug 2009 02:14:37 -0000	1.8
+++ sources	24 May 2010 15:57:00 -0000	1.9
@@ -1 +1 @@
-7563a58a57d2c6cc0da28cc341a30969  cacti-0.8.7e.tar.gz
+c50a49e3b439dba1fd44ddc34276d4df  cacti-0.8.7f.tar.gz


--- cli_add_graph.patch DELETED ---


--- cross_site_fix.patch DELETED ---


--- snmp_invalid_response.patch DELETED ---


--- sql_injection_template_export.patch DELETED ---


--- template_duplication.patch DELETED ---