From ba3fd4999e00cb4c5cf05807b789711e3c347fac Mon Sep 17 00:00:00 2001
From: Aurelien Bompard <abompard@fedoraproject.org>
Date: Dec 31 2008 08:15:36 +0000
Subject: - version 6.9

- use Debian's version of the CVE-2008-3714 fix

---

diff --git a/.cvsignore b/.cvsignore
index fe295bb..37811e5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-awstats-6.8.tar.gz
+awstats-6.9.tar.gz
diff --git a/awstats-6.8-CVE-2008-3714-debian.patch b/awstats-6.8-CVE-2008-3714-debian.patch
deleted file mode 100644
index 9111eb3..0000000
--- a/awstats-6.8-CVE-2008-3714-debian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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-06 10:19:42.000000000 +0100
-+++ ./wwwroot/cgi-bin/awstats.pl	2008-12-06 10:21:01.000000000 +0100
-@@ -4407,6 +4407,7 @@ sub DecodeEncodedString {
- 	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 0d72ace..8dc5d63 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -1,14 +1,13 @@
 Name:       awstats
-Version:    6.8
-Release:    3%{?dist}
+Version:    6.9
+Release:    1%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPLv2
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
 Source0:    http://dl.sf.net/awstats/awstats-%{version}.tar.gz
 #Source0:    http://awstats.sourceforge.net/files/awstats-6.6.tar.gz
-# http://awstats.cvs.sourceforge.net/awstats/awstats/wwwroot/cgi-bin/awstats.pl?r1=1.910&r2=1.912&view=patch
-Patch0:     awstats-6.8-CVE-2008-3714-debian.patch
+Patch0:     awstats-6.9-CVE-2008-3714-debian.patch
 
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -161,6 +160,10 @@ fi
 
 
 %changelog
+* Wed Dec 31 2008 Aurelien Bompard <abompard@fedoraproject.org> 6.9-1
+- version 6.9
+- use Debian's version of the CVE-2008-3714 fix
+
 * Sat Dec 06 2008 Aurelien Bompard <abompard@fedoraproject.org> 6.8-3
 - Use Debian's patch for CVE-2008-3714 (rh#474396)
 
diff --git a/sources b/sources
index bb02ebc..2a32536 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a35d5a2ca29b31dabd650f3e5f173e9  awstats-6.8.tar.gz
+fc19dbb8449eccf3300efb30ca3376cb  awstats-6.9.tar.gz