[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.5.dfsg-2-12-gcfe841d

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit cfe841d8b07dd4ea46df0b0ef47a514ac6ae7511
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed May 19 13:47:58 2010 +0200

    Unfuzz (unapplied) patch 0006, and refresh patches 0006, 1015 and 1016 with compacting quilt options --no-index --no-timestamps -pab.

diff --git a/debian/patches/0006_more_xss.patch b/debian/patches/0006_more_xss.patch
index e751e2b..9aedbb8 100644
--- a/debian/patches/0006_more_xss.patch
+++ b/debian/patches/0006_more_xss.patch
@@ -2,11 +2,9 @@ Description: CVS fix for upstream XSS bug.
 Author: Florian Weimer <fw at deneb.enyo.de>
 Bug-Debian: http://bugs.debian.org/495432
 
-Index: awstats/wwwroot/cgi-bin/awstats.pl
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/awstats.pl	2009-11-11 16:28:52.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/awstats.pl	2009-11-11 16:30:24.000000000 +0300
-@@ -7690,6 +7690,7 @@
+--- a/wwwroot/cgi-bin/awstats.pl
++++ b/wwwroot/cgi-bin/awstats.pl
+@@ -7694,6 +7694,7 @@
  sub DecodeEncodedString {
  	my $stringtodecode = shift;
  	$stringtodecode =~ tr/\+/ /s;
diff --git a/debian/patches/1015_ignore_case_for_rtsp.patch b/debian/patches/1015_ignore_case_for_rtsp.patch
index 23ee845..e6e6564 100644
--- a/debian/patches/1015_ignore_case_for_rtsp.patch
+++ b/debian/patches/1015_ignore_case_for_rtsp.patch
@@ -2,10 +2,8 @@ Description: Recognize method/protocol RTSP in uppercase
 Author: Lee Maguire <lee-debian at hexkey.co.uk>
 Bug-Debian: http://bugs.debian.org/350601
 
-Index: awstats/wwwroot/cgi-bin/awstats.pl
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/awstats.pl	2010-05-18 20:07:08.000000000 +0400
-+++ awstats/wwwroot/cgi-bin/awstats.pl	2010-05-18 20:07:25.000000000 +0400
+--- a/wwwroot/cgi-bin/awstats.pl
++++ b/wwwroot/cgi-bin/awstats.pl
 @@ -10869,7 +10869,7 @@
  			( $LogType eq 'W' || $LogType eq 'S' )
  			&& (   $field[$pos_method] eq 'GET'
diff --git a/debian/patches/1016_report_permissions_problem_for_configs.patch b/debian/patches/1016_report_permissions_problem_for_configs.patch
index b527244..2beabed 100644
--- a/debian/patches/1016_report_permissions_problem_for_configs.patch
+++ b/debian/patches/1016_report_permissions_problem_for_configs.patch
@@ -2,10 +2,8 @@ Description: Report permissions problem while reading awstats.custom.conf
 Author: Ken Neighbors <KenNeighbors at gmail.com>
 Bug-Debian: http://bugs.debian.org/572353
 
-Index: awstats/wwwroot/cgi-bin/awstats.pl
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/awstats.pl	2010-05-18 22:22:42.000000000 +0400
-+++ awstats/wwwroot/cgi-bin/awstats.pl	2010-05-18 22:24:14.000000000 +0400
+--- a/wwwroot/cgi-bin/awstats.pl
++++ b/wwwroot/cgi-bin/awstats.pl
 @@ -1745,11 +1745,17 @@
  			$FileSuffix = ".$SiteConfig";
  			last;

-- 
awstats Debian packaging