rpms/awstats/EL-5 awstats-6.9-CVE-2008-3714-debian.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 awstats.spec, 1.25, 1.26 sources, 1.11, 1.12 awstats-6.7-CVE-2008-3714.patch, 1.3, NONE

[Tim Jackson]

Author: timj

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

Modified Files:
	.cvsignore awstats.spec sources 
Added Files:
	awstats-6.9-CVE-2008-3714-debian.patch 
Removed Files:
	awstats-6.7-CVE-2008-3714.patch 
Log Message:
Update to awstats 6.9


awstats-6.9-CVE-2008-3714-debian.patch:

--- NEW FILE awstats-6.9-CVE-2008-3714-debian.patch ---
diff -up ./wwwroot/cgi-bin/awstats.pl.CVE-2008-3714 ./wwwroot/cgi-bin/awstats.pl
--- ./wwwroot/cgi-bin/awstats.pl.CVE-2008-3714	2008-12-31 09:09:43.000000000 +0100
+++ ./wwwroot/cgi-bin/awstats.pl	2008-12-31 09:10:11.000000000 +0100
@@ -7521,8 +7521,8 @@ sub EncodeString {
 sub DecodeEncodedString {
 	my $stringtodecode = shift;
 	$stringtodecode =~ tr/\+/ /s;
-	$stringtodecode =~ s/%22//g;
 	$stringtodecode =~ s/%([A-F0-9][A-F0-9])/pack("C", hex($1))/ieg;
+	$stringtodecode =~ s/["']//g;
 	return $stringtodecode;
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 Sep 2007 09:55:42 -0000	1.7
+++ .cvsignore	14 Jun 2009 09:59:32 -0000	1.8
@@ -1,2 +1 @@
-awstats-6.6.tar.gz
-awstats-6.7-xmlhistory.patch
+awstats-6.9.tar.gz


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/awstats.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- awstats.spec	15 Dec 2008 03:48:35 -0000	1.25
+++ awstats.spec	14 Jun 2009 09:59:33 -0000	1.26
@@ -1,6 +1,6 @@
 Name:       awstats
-Version:    6.7
-Release:    5%{?dist}
+Version:    6.9
+Release:    1%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPLv2
 Group:      Applications/Internet
@@ -9,11 +9,7 @@ Source0:    http://dl.sf.net/awstats/aws
 Source1:    awstats.README.SELinux
 Source2:    awstats.README.Fedora
 
-# Fix XML output for history files
-# http://awstats.cvs.sourceforge.net/awstats/awstats/wwwroot/cgi-bin/awstats.pl?r1=1.892&r2=1.894&view=patch
-Patch0:     awstats-6.7-xmlhistory.patch
-
-Patch1:     awstats-6.7-CVE-2008-3714.patch
+Patch0:     awstats-6.9-CVE-2008-3714-debian.patch
 
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,12 +48,7 @@ This package adds SELinux enforcement to
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
-
-# patch creates backups even though it shouldn't
-rm wwwroot/cgi-bin/awstats.pl.orig
-
+%patch0 -p0 -b .CVE-2008-3714
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -122,10 +113,6 @@ install -p -m 644 $RPM_BUILD_ROOT/%{_sys
 perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
              $RPM_BUILD_ROOT%{_datadir}/%{name}/tools/{*.pl,httpd_conf}
 
-# Remove some upstream version control files
-find $RPM_BUILD_ROOT%{_datadir} -name .cvsignore | xargs rm -f
-find docs/ -name .cvsignore | xargs rm -f
-
 # Fix encoding of changelog
 iconv -f iso-8859-1 -t utf-8 < docs/awstats_changelog.txt > docs/awstats_changelog.txt.utf8
 mv docs/awstats_changelog.txt.utf8 docs/awstats_changelog.txt
@@ -219,6 +206,9 @@ fi
 
 
 %changelog
+* Sat May 30 2009 Tim Jackson <rpm at timj.co.uk> 6.9-1
+- Update to 6.9
+
 * Mon Dec 15 2008 Tim Jackson <rpm at timj.co.uk> 6.7-5
 - remove extraneous file awstats.orig from package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	18 Sep 2007 09:55:42 -0000	1.11
+++ sources	14 Jun 2009 09:59:33 -0000	1.12
@@ -1,2 +1 @@
-512cd146247eb178ef023c924f7bb766  awstats-6.7.tar.gz
-cbf319b3472a022cd2452d612ac28117  awstats-6.7-xmlhistory.patch
+fc19dbb8449eccf3300efb30ca3376cb  awstats-6.9.tar.gz


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