[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.5_dfsg-5-10-gbabebf9

[Sergey B Kirpichev]

The following commit has been merged in the master branch:
commit 12f115f151be5f392415c32eceee610cf2c7e3e4
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Thu Mar 3 00:16:59 2011 +0300

    Unfuzz patches

diff --git a/debian/patches/1003_redirect_to_STDERR.patch b/debian/patches/1003_redirect_to_STDERR.patch
index 3bd6cad..009dc71 100644
--- a/debian/patches/1003_redirect_to_STDERR.patch
+++ b/debian/patches/1003_redirect_to_STDERR.patch
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/296435
 
 --- a/tools/awstats_buildstaticpages.pl
 +++ b/tools/awstats_buildstaticpages.pl
-@@ -81,7 +81,7 @@
+@@ -80,7 +80,7 @@
  # Return:		None
  #------------------------------------------------------------------------------
  sub error {
@@ -13,7 +13,7 @@ Bug-Debian: http://bugs.debian.org/296435
      exit 1;
  }
  
-@@ -101,7 +101,7 @@
+@@ -100,7 +100,7 @@
  #    		print "$messagestring<br />\n";
  #    	}
  #    	else {
@@ -59,7 +59,7 @@ Bug-Debian: http://bugs.debian.org/296435
  
 --- a/tools/logresolvemerge.pl
 +++ b/tools/logresolvemerge.pl
-@@ -107,7 +107,7 @@
+@@ -111,7 +111,7 @@
  # Return:		None
  #------------------------------------------------------------------------------
  sub error {
@@ -68,7 +68,7 @@ Bug-Debian: http://bugs.debian.org/296435
      exit 1;
  }
  
-@@ -136,7 +136,7 @@
+@@ -140,7 +140,7 @@
  sub warning {
  	my $messagestring=shift;
  	if ($Debug) { debug("$messagestring",1); }
diff --git a/debian/patches/1004_perl_version.patch b/debian/patches/1004_perl_version.patch
index 2b164c4..ae615b6 100644
--- a/debian/patches/1004_perl_version.patch
+++ b/debian/patches/1004_perl_version.patch
@@ -6,7 +6,7 @@ Bug-Debian: http://bugs.debian.org/519319
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -1847,7 +1847,7 @@
+@@ -1852,7 +1852,7 @@
  					$includeFile = "$1$includeFile";
  				}
  			}
@@ -17,7 +17,7 @@ Bug-Debian: http://bugs.debian.org/519319
  				);
 --- a/tools/awstats_buildstaticpages.pl
 +++ b/tools/awstats_buildstaticpages.pl
-@@ -193,7 +193,7 @@
+@@ -192,7 +192,7 @@
  			    # Correct relative include files
  				if ($FileConfig =~ /^(.*[\\\/])[^\\\/]*$/) { $includeFile = "$1$includeFile"; }
  			}
diff --git a/debian/patches/1009_hurd_url.patch b/debian/patches/1009_hurd_url.patch
index 7ac4b55..64a6d95 100644
--- a/debian/patches/1009_hurd_url.patch
+++ b/debian/patches/1009_hurd_url.patch
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/408086
 
 --- a/wwwroot/cgi-bin/lib/operating_systems.pm
 +++ b/wwwroot/cgi-bin/lib/operating_systems.pm
-@@ -245,7 +245,7 @@
+@@ -253,7 +253,7 @@
  'linux','<a href="http://www.distrowatch.com/" title="Linux DistroWatch home page. Useful if you find the associated user agent string in your logs. [new window]" target="_blank">Linux (Unknown/unspecified)</a>',
  'linux','GNU Linux (Unknown or unspecified distribution)',
  # Hurd
diff --git a/debian/patches/1010_dirdata_permissions.patch b/debian/patches/1010_dirdata_permissions.patch
index 62a2325..65de7f6 100644
--- a/debian/patches/1010_dirdata_permissions.patch
+++ b/debian/patches/1010_dirdata_permissions.patch
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/299148
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -2965,7 +2965,7 @@
+@@ -2972,7 +2972,7 @@
  	if ( !$MigrateStats && !-d $DirData ) {
  		if ($CreateDirDataIfNotExists) {
  			if ($Debug) { debug( " Make directory $DirData", 2 ); }
diff --git a/debian/patches/1014_websec_robot.patch b/debian/patches/1014_websec_robot.patch
index f66cb57..0801039 100644
--- a/debian/patches/1014_websec_robot.patch
+++ b/debian/patches/1014_websec_robot.patch
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/284149
 
 --- a/wwwroot/cgi-bin/lib/browsers.pm
 +++ b/wwwroot/cgi-bin/lib/browsers.pm
-@@ -242,7 +242,8 @@
+@@ -253,7 +253,8 @@
  'POE\-Component\-Client\-HTTP',
  'mozilla',				# Must be at end because a lot of browsers contains mozilla in string
  'libwww',				# Must be at end because some browser have both 'browser id' and 'libwww'
@@ -14,7 +14,7 @@ Bug-Debian: http://bugs.debian.org/284149
  );
  
  # BrowsersHashIDLib
-@@ -468,7 +469,8 @@
+@@ -479,7 +480,8 @@
  'POE\-Component\-Client\-HTTP','HTTP user-agent for POE (portable networking framework for Perl)',
  'mozilla','Mozilla',
  'libwww','LibWWW',
diff --git a/debian/patches/2001_awstatsprog_path.patch b/debian/patches/2001_awstatsprog_path.patch
index 86c10d0..41fc874 100644
--- a/debian/patches/2001_awstatsprog_path.patch
+++ b/debian/patches/2001_awstatsprog_path.patch
@@ -3,7 +3,7 @@ Author: Sergey B Kirpichev <skirpichev at gmail.com>
 
 --- a/tools/awstats_buildstaticpages.pl
 +++ b/tools/awstats_buildstaticpages.pl
-@@ -308,8 +308,8 @@
+@@ -307,8 +307,8 @@
  # Check if AWSTATS prog is found
  my $AwstatsFound=0;
  if (-s "$Awstats") { $AwstatsFound=1; }

-- 
awstats Debian packaging