rpms/awstats/FC-5 awstats.spec,1.15,1.16

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4652

Modified Files:
	awstats.spec 
Log Message:
revert to FC-5 version + encoding fix


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- awstats.spec	30 Oct 2006 14:05:02 -0000	1.15
+++ awstats.spec	30 Oct 2006 14:23:25 -0000	1.16
@@ -1,13 +1,14 @@
 Name:       awstats
-Version:    6.6
-Release:    0.3.beta%{?dist}
+Version:    6.5
+Release:    6%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-#Source0:    http://dl.sf.net/awstats/awstats-6.6.tar.gz
-Source0:    http://awstats.sourceforge.net/files/awstats-6.6.tar.gz
+Source0:    http://dl.sf.net/awstats/awstats-6.5.tar.gz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
 Source1:    awstats.README.SELinux
+Patch0:     awstats-6.5-CVE-2006-1945.patch
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
@@ -34,6 +35,8 @@
 
 %prep
 %setup -q
+# no backup or the orig file will be installed
+%patch0 -p0
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -173,14 +176,14 @@
 
 
 %changelog
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.5-5
 - fix DOS encoding on logresolvemerge.pl
 
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
-- rebuild
+* Tue May 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-5
+- really fix CVE-2006-1945...
 
-* Sun May 07 2006 Aurelien Bompard <gauret[AT]free.fr> 6.6-0.1.beta
-- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923)
+* Mon May 08 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-4
+- add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923)
 
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-3
 - SELinux support: use semanage to label the cgi and the database files