| [vhffs-dev] [1522] added awstats patches for awstats 6.95 |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1522
Author: gradator
Date: 2009-09-06 17:09:47 +0200 (Sun, 06 Sep 2009)
Log Message:
-----------
added awstats patches for awstats 6.95
Added Paths:
-----------
trunk/vhffs-robots/misc/awstats_6.95_vhffs.patch
trunk/vhffs-robots/misc/repository.awstats_6.95_vhffs.patch
Removed Paths:
-------------
trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch
trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch
trunk/vhffs-robots/misc/awstats_6.6_vhffs.patch
trunk/vhffs-robots/misc/repository.awstats_6.4_vhffs.patch
trunk/vhffs-robots/misc/repository.awstats_6.5_vhffs.patch
trunk/vhffs-robots/misc/repository.awstats_6.6_vhffs.patch
Deleted: trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch 2009-08-27 21:36:46 UTC (rev 1521)
+++ trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch 2009-09-06 15:09:47 UTC (rev 1522)
@@ -1,27 +0,0 @@
---- /usr/lib/cgi-bin/awstats.pl 2006-05-26 09:38:54.000000000 +0200
-+++ awstats.pl 2007-03-01 00:05:51.000000000 +0100
-@@ -1091,10 +1091,10 @@
- my $configdir=shift;
- my @PossibleConfigDir=();
-
-- if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
-- @PossibleConfigDir=("$configdir");
-- }
-- else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
-+ use Digest::MD5 qw(md5 md5_hex md5_base64);
-+ my $vhffssitehash = md5_hex( $SiteConfig );
-+ my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
-+ @PossibleConfigDir=("$vhffsconfigdir");
-
- # Open config file
- $FileConfig=$FileSuffix='';
-@@ -5740,7 +5740,7 @@
- else { @DOWIndex = (0,1,2,3,4,5,6); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript=($WrapperScript?"$WrapperScript":"$DirCgi$PROG.$Extension");
-+$AWScript=($WrapperScript?"$WrapperScript":"/$DirCgi$PROG.$Extension");
-
- # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
- if (! $HeaderHTMLSent) { &html_head; }
Deleted: trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch 2009-08-27 21:36:46 UTC (rev 1521)
+++ trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch 2009-09-06 15:09:47 UTC (rev 1522)
@@ -1,25 +0,0 @@
---- awstats.pl.org 2008-02-08 19:42:07.000000000 +0100
-+++ awstats.pl 2008-02-08 19:43:21.000000000 +0100
-@@ -1131,8 +1131,11 @@
- my $configdir=shift;
- my @PossibleConfigDir=();
-
-- if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) { @PossibleConfigDir=("$configdir"); }
-- else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
-+ use Digest::MD5 qw(md5 md5_hex md5_base64);
-+ my $vhffssitehash = md5_hex( $SiteConfig );
-+ my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
-+ @PossibleConfigDir=("$vhffsconfigdir");
-
- # Open config file
- $FileConfig=$FileSuffix='';
-@@ -5878,7 +5881,7 @@
- else { @DOWIndex = (0,1,2,3,4,5,6); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript=($WrapperScript?"$WrapperScript":"$DirCgi$PROG.$Extension");
-+$AWScript=($WrapperScript?"$WrapperScript":"/$DirCgi$PROG.$Extension");
-
- # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
- if (! $HeaderHTMLSent) { &html_head; }
Deleted: trunk/vhffs-robots/misc/awstats_6.6_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_6.6_vhffs.patch 2009-08-27 21:36:46 UTC (rev 1521)
+++ trunk/vhffs-robots/misc/awstats_6.6_vhffs.patch 2009-09-06 15:09:47 UTC (rev 1522)
@@ -1,36 +0,0 @@
---- /usr/lib/cgi-bin/awstats.pl 2007-04-09 18:52:46.000000000 +0200
-+++ awstats.pl 2007-04-09 18:50:35.000000000 +0200
-@@ -1131,19 +1131,11 @@
- my $configdir=shift;
- my @PossibleConfigDir=();
-
-- if ($configdir)
-- {
-- # If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
-- if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
-- {
-- error("Sorry, to allow overwriting of configdir parameter from an AWStats CGI usage, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1");
-- }
-- else
-- {
-- @PossibleConfigDir=("$configdir");
-- }
-- }
-- else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
-+ use Digest::MD5 qw(md5 md5_hex md5_base64);
-+ my $vhffssitehash = md5_hex( $SiteConfig );
-+ my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
-+ @PossibleConfigDir=("$vhffsconfigdir");
-
- # Open config file
- $FileConfig=$FileSuffix='';
-@@ -5858,7 +5850,7 @@
- else { @DOWIndex = (0,1,2,3,4,5,6); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript=($WrapperScript?"$WrapperScript":"$DirCgi$PROG.$Extension");
-+$AWScript=($WrapperScript?"$WrapperScript":"/$DirCgi$PROG.$Extension");
-
- # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
- if (! $HeaderHTMLSent) { &html_head; }
Added: trunk/vhffs-robots/misc/awstats_6.95_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_6.95_vhffs.patch (rev 0)
+++ trunk/vhffs-robots/misc/awstats_6.95_vhffs.patch 2009-09-06 15:09:47 UTC (rev 1522)
@@ -0,0 +1,39 @@
+--- awstats.pl 2009-09-06 15:02:19.000000000 +0000
++++ awstats.pl.web 2009-09-06 15:04:13.000000000 +0000
+@@ -1718,22 +1718,11 @@
+ my $configdir = shift;
+ my @PossibleConfigDir = ();
+
+- if ($configdir) {
+- # If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+- if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
+- error("Sorry, to allow overwriting of configdir parameter from an AWStats CGI usage, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1");
+- }
+- else {
+- @PossibleConfigDir = ("$configdir");
+- }
+- }
+- else {
+- @PossibleConfigDir = (
+- "$DIR", "/etc/awstats",
+- "/usr/local/etc/awstats", "/etc",
+- "/etc/opt/awstats"
+- );
+- }
++ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
++ use Digest::MD5 qw(md5 md5_hex md5_base64);
++ my $vhffssitehash = md5_hex( $SiteConfig );
++ my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
++ @PossibleConfigDir=("$vhffsconfigdir");
+
+ # Open config file
+ $FileConfig = $FileSuffix = '';
+@@ -10081,7 +10070,7 @@
+ else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
+
+ # Should we link to ourselves or to a wrapper script
+-$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
++$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
+
+ # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
+ if ( !$HeaderHTMLSent ) { &html_head; }
Deleted: trunk/vhffs-robots/misc/repository.awstats_6.4_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/repository.awstats_6.4_vhffs.patch 2009-08-27 21:36:46 UTC (rev 1521)
+++ trunk/vhffs-robots/misc/repository.awstats_6.4_vhffs.patch 2009-09-06 15:09:47 UTC (rev 1522)
@@ -1,25 +0,0 @@
---- /usr/lib/cgi-bin/awstats.pl 2006-05-26 09:38:54.000000000 +0200
-+++ awstats.pl 2007-03-01 00:05:51.000000000 +0100
-@@ -1091,10 +1091,10 @@
- my $configdir=shift;
- my @PossibleConfigDir=();
-
-- if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
-- @PossibleConfigDir=("$configdir");
-- }
-- else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
-+ my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
-+ @PossibleConfigDir=("$vhffsconfigdir");
-
- # Open config file
- $FileConfig=$FileSuffix='';
-@@ -5740,7 +5740,7 @@
- else { @DOWIndex = (0,1,2,3,4,5,6); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript=($WrapperScript?"$WrapperScript":"$DirCgi$PROG.$Extension");
-+$AWScript=($WrapperScript?"$WrapperScript":"/$DirCgi$PROG.$Extension");
-
- # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
- if (! $HeaderHTMLSent) { &html_head; }
Deleted: trunk/vhffs-robots/misc/repository.awstats_6.5_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/repository.awstats_6.5_vhffs.patch 2009-08-27 21:36:46 UTC (rev 1521)
+++ trunk/vhffs-robots/misc/repository.awstats_6.5_vhffs.patch 2009-09-06 15:09:47 UTC (rev 1522)
@@ -1,25 +0,0 @@
---- /usr/lib/cgi-bin/awstats.pl 2006-05-26 09:38:54.000000000 +0200
-+++ /data/logs/repository/awstats.pl 2007-03-11 12:12:03.000000000 +0100
-@@ -1091,10 +1091,9 @@
- my $configdir=shift;
- my @PossibleConfigDir=();
-
-- if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
-- @PossibleConfigDir=("$configdir");
-- }
-- else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
-+ my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
-+ @PossibleConfigDir=("$vhffsconfigdir");
-
- # Open config file
- $FileConfig=$FileSuffix='';
-@@ -5740,7 +5739,7 @@
- else { @DOWIndex = (0,1,2,3,4,5,6); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript=($WrapperScript?"$WrapperScript":"$DirCgi$PROG.$Extension");
-+$AWScript=($WrapperScript?"$WrapperScript":"/$DirCgi$PROG.$Extension");
-
- # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
- if (! $HeaderHTMLSent) { &html_head; }
Deleted: trunk/vhffs-robots/misc/repository.awstats_6.6_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/repository.awstats_6.6_vhffs.patch 2009-08-27 21:36:46 UTC (rev 1521)
+++ trunk/vhffs-robots/misc/repository.awstats_6.6_vhffs.patch 2009-09-06 15:09:47 UTC (rev 1522)
@@ -1,34 +0,0 @@
---- /usr/lib/cgi-bin/awstats.pl 2007-04-09 18:52:46.000000000 +0200
-+++ awstats.pl 2007-04-09 18:50:35.000000000 +0200
-@@ -1131,19 +1131,11 @@
- my $configdir=shift;
- my @PossibleConfigDir=();
-
-- if ($configdir)
-- {
-- # If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
-- if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
-- {
-- error("Sorry, to allow overwriting of configdir parameter from an AWStats CGI usage, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1");
-- }
-- else
-- {
-- @PossibleConfigDir=("$configdir");
-- }
-- }
-- else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
-+ my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
-+ @PossibleConfigDir=("$vhffsconfigdir");
-
- # Open config file
- $FileConfig=$FileSuffix='';
-@@ -5858,7 +5850,7 @@
- else { @DOWIndex = (0,1,2,3,4,5,6); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript=($WrapperScript?"$WrapperScript":"$DirCgi$PROG.$Extension");
-+$AWScript=($WrapperScript?"$WrapperScript":"/$DirCgi$PROG.$Extension");
-
- # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
- if (! $HeaderHTMLSent) { &html_head; }
Added: trunk/vhffs-robots/misc/repository.awstats_6.95_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/repository.awstats_6.95_vhffs.patch (rev 0)
+++ trunk/vhffs-robots/misc/repository.awstats_6.95_vhffs.patch 2009-09-06 15:09:47 UTC (rev 1522)
@@ -0,0 +1,37 @@
+--- awstats.pl 2009-09-06 15:02:19.000000000 +0000
++++ awstats.pl.downloads 2009-09-06 15:05:31.000000000 +0000
+@@ -1718,22 +1718,9 @@
+ my $configdir = shift;
+ my @PossibleConfigDir = ();
+
+- if ($configdir) {
+- # If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+- if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
+- error("Sorry, to allow overwriting of configdir parameter from an AWStats CGI usage, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1");
+- }
+- else {
+- @PossibleConfigDir = ("$configdir");
+- }
+- }
+- else {
+- @PossibleConfigDir = (
+- "$DIR", "/etc/awstats",
+- "/usr/local/etc/awstats", "/etc",
+- "/etc/opt/awstats"
+- );
+- }
++ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
++ my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
++ @PossibleConfigDir=("$vhffsconfigdir");
+
+ # Open config file
+ $FileConfig = $FileSuffix = '';
+@@ -10081,7 +10068,7 @@
+ else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
+
+ # Should we link to ourselves or to a wrapper script
+-$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
++$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
+
+ # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
+ if ( !$HeaderHTMLSent ) { &html_head; }