rpms/awstats/EL-5 awstats-6.7-CVE-2008-3714.patch, 1.2, 1.3 awstats.spec, 1.24, 1.25

[Tim Jackson]

Author: timj

Update of /cvs/extras/rpms/awstats/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19822

Modified Files:
	awstats-6.7-CVE-2008-3714.patch awstats.spec 
Log Message:
remove extraneous file awstats.orig from package


awstats-6.7-CVE-2008-3714.patch:

Index: awstats-6.7-CVE-2008-3714.patch
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/awstats-6.7-CVE-2008-3714.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- awstats-6.7-CVE-2008-3714.patch	7 Dec 2008 18:40:14 -0000	1.2
+++ awstats-6.7-CVE-2008-3714.patch	15 Dec 2008 03:48:35 -0000	1.3
@@ -1,6 +1,6 @@
 diff -ur awstats-6.7/wwwroot/cgi-bin/awstats.pl awstats-6.7-CVE-2008-3714/wwwroot/cgi-bin/awstats.pl
 --- awstats-6.7/wwwroot/cgi-bin/awstats.pl	2007-07-07 12:00:06.000000000 +0100
-+++ awstats-6.7-CVE-2008-3714/wwwroot/cgi-bin/awstats.pl	2008-12-06 15:01:44.000000000 +0000
++++ awstats-6.7-CVE-2008-3714/wwwroot/cgi-bin/awstats.pl	2008-12-14 17:25:46.000000000 +0000
 @@ -4381,6 +4381,7 @@
  	my $stringtodecode=shift;
  	$stringtodecode =~ tr/\+/ /s;
@@ -9,4 +9,3 @@
  	return $stringtodecode;
  }
  
-Only in awstats-6.7-CVE-2008-3714/wwwroot/cgi-bin: awstats.pl.orig


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/awstats.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- awstats.spec	7 Dec 2008 18:40:14 -0000	1.24
+++ awstats.spec	15 Dec 2008 03:48:35 -0000	1.25
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.7
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPLv2
 Group:      Applications/Internet
@@ -54,6 +54,10 @@
 %setup -q
 %patch0 -p0
 %patch1 -p1
+
+# patch creates backups even though it shouldn't
+rm wwwroot/cgi-bin/awstats.pl.orig
+
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -215,6 +219,9 @@
 
 
 %changelog
+* Mon Dec 15 2008 Tim Jackson <rpm at timj.co.uk> 6.7-5
+- remove extraneous file awstats.orig from package
+
 * Sat Dec 06 2008 Tim Jackson <rpm at timj.co.uk> 6.7-4
 - Use Debian's patch for CVE-2008-3714 (#474396)
 - Add README.Fedora file pointing people towards the -selinux subpackage