From 560ee5fd89dec71e579e043fb95b995ea9f91566 Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Jun 14 2009 09:59:33 +0000
Subject: Update to awstats 6.9


---

diff --git a/.cvsignore b/.cvsignore
index f35450a..37811e5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-awstats-6.6.tar.gz
-awstats-6.7-xmlhistory.patch
+awstats-6.9.tar.gz
diff --git a/awstats-6.7-CVE-2008-3714.patch b/awstats-6.7-CVE-2008-3714.patch
deleted file mode 100644
index 2dd85d7..0000000
--- a/awstats-6.7-CVE-2008-3714.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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-14 17:25:46.000000000 +0000
-@@ -4381,6 +4381,7 @@
- 	my $stringtodecode=shift;
- 	$stringtodecode =~ tr/\+/ /s;
- 	$stringtodecode =~ s/%([A-F0-9][A-F0-9])/pack("C", hex($1))/ieg;
-+	$stringtodecode =~ s/["']//g;
- 	return $stringtodecode;
- }
- 
diff --git a/awstats-6.9-CVE-2008-3714-debian.patch b/awstats-6.9-CVE-2008-3714-debian.patch
new file mode 100644
index 0000000..ad59113
--- /dev/null
+++ b/awstats-6.9-CVE-2008-3714-debian.patch
@@ -0,0 +1,13 @@
+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;
+ }
+ 
diff --git a/awstats.spec b/awstats.spec
index 8b80359..507a6f8 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -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/awstats-%{version}.tar.gz
 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 AWstats.
 
 %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/%{_sysconfdir}/%{name}/%{name}.{model,localhos
 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@timj.co.uk> 6.9-1
+- Update to 6.9
+
 * Mon Dec 15 2008 Tim Jackson <rpm@timj.co.uk> 6.7-5
 - remove extraneous file awstats.orig from package
 
diff --git a/sources b/sources
index 4216b4e..2a32536 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-512cd146247eb178ef023c924f7bb766  awstats-6.7.tar.gz
-cbf319b3472a022cd2452d612ac28117  awstats-6.7-xmlhistory.patch
+fc19dbb8449eccf3300efb30ca3376cb  awstats-6.9.tar.gz