[vhffs-dev] [2272] added patches for AWStats 7.4

[ Thread Index | Date Index | More vhffs.org/vhffs-dev Archives ]


Revision: 2272
Author:   gradator
Date:     2015-02-13 00:27:31 +0100 (Fri, 13 Feb 2015)
Log Message:
-----------
added patches for AWStats 7.4

Modified Paths:
--------------
    trunk/vhffs-patches/Makefile.am

Added Paths:
-----------
    trunk/vhffs-patches/awstats/awstats_7.4_vhffs.patch
    trunk/vhffs-patches/awstats/repository.awstats_7.4_vhffs.patch

Removed Paths:
-------------
    trunk/vhffs-patches/awstats/awstats_6.95_vhffs.patch
    trunk/vhffs-patches/awstats/repository.awstats_6.95_vhffs.patch

Modified: trunk/vhffs-patches/Makefile.am
===================================================================
--- trunk/vhffs-patches/Makefile.am	2015-02-11 23:59:20 UTC (rev 2271)
+++ trunk/vhffs-patches/Makefile.am	2015-02-12 23:27:31 UTC (rev 2272)
@@ -1,10 +1,10 @@
 EXTRA_DIST = \
-	awstats/awstats_6.95_vhffs.patch \
 	awstats/awstats_7.0_vhffs.patch \
 	awstats/awstats_7.1_vhffs.patch \
-	awstats/repository.awstats_6.95_vhffs.patch \
+	awstats/awstats_7.4_vhffs.patch \
 	awstats/repository.awstats_7.0_vhffs.patch \
 	awstats/repository.awstats_7.1_vhffs.patch \
+	awstats/repository.awstats_7.4_vhffs.patch \
 	lighttpd/mod_partialcontentabuse.c \
 	lighttpd/README \
 	lighttpd/lighttpd-1.4.28-mod_partialcontentabuse.patch \

Deleted: trunk/vhffs-patches/awstats/awstats_6.95_vhffs.patch
===================================================================
--- trunk/vhffs-patches/awstats/awstats_6.95_vhffs.patch	2015-02-11 23:59:20 UTC (rev 2271)
+++ trunk/vhffs-patches/awstats/awstats_6.95_vhffs.patch	2015-02-12 23:27:31 UTC (rev 2272)
@@ -1,46 +0,0 @@
---- awstats.pl_	2012-04-30 18:52:22.668828732 +0200
-+++ awstats.pl	2012-04-30 18:56:16.064121136 +0200
-@@ -1716,29 +1716,12 @@
- 	# Other possible directories :				"/usr/local/etc/awstats", "/etc"
- 	# FHS standard, Suse package : 				"/etc/opt/awstats"
- 	my $configdir         = shift;
--	my @PossibleConfigDir = (
--			"$DIR",
--			"/etc/awstats",
--			"/usr/local/etc/awstats", "/etc",
--			"/etc/opt/awstats"
--		);
--
--	if ($configdir) {
--		# Check if configdir is outside default values.
--		my $outsidedefaultvalue=1;
--		foreach (@PossibleConfigDir) {
--			if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
--		}
- 
--		# If from CGI, overwriting of configdir with a value that differs from a default value
--		# is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
--		if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
--		{
--			error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
--		}
--
--		@PossibleConfigDir = ("$configdir");
--	}
-+	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';
-+	my @PossibleConfigDir = ( $vhffsconfigdir );
- 
- 	# Open config file
- 	$FileConfig = $FileSuffix = '';
-@@ -10111,7 +10094,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-patches/awstats/awstats_7.4_vhffs.patch
===================================================================
--- trunk/vhffs-patches/awstats/awstats_7.4_vhffs.patch	                        (rev 0)
+++ trunk/vhffs-patches/awstats/awstats_7.4_vhffs.patch	2015-02-12 23:27:31 UTC (rev 2272)
@@ -0,0 +1,46 @@
+--- awstats.pl.orig	2015-02-13 00:16:07.311804547 +0100
++++ awstats.pl	2015-02-13 00:16:53.927046972 +0100
+@@ -1715,29 +1715,12 @@
+ 	# Other possible directories :				"/usr/local/etc/awstats", "/etc"
+ 	# FHS standard, Suse package : 				"/etc/opt/awstats"
+ 	my $configdir         = shift;
+-	my @PossibleConfigDir = (
+-			"$DIR",
+-			"/etc/awstats",
+-			"/usr/local/etc/awstats", "/etc",
+-			"/etc/opt/awstats"
+-		); 
+ 
+-	if ($configdir) {
+-		# Check if configdir is outside default values.
+-		my $outsidedefaultvalue=1;
+-		foreach (@PossibleConfigDir) {
+-			if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
+-		}
+-
+-		# If from CGI, overwriting of configdir with a value that differs from a defautl value
+-		# is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+-		if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+-		{
+-			error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
+-		}
+-
+-		@PossibleConfigDir = ("$configdir");
+-	}
++	error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
++	use Digest::MD5;
++	my $vhffssitehash = Digest::MD5::md5_hex( $SiteConfig );
++	my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
++	my @PossibleConfigDir=("$vhffsconfigdir");
+ 
+ 	# Open config file
+ 	$FileConfig = $FileSuffix = '';
+@@ -17465,7 +17448,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" );
+ if (index($AWScript,'?')>-1) 
+ {
+     $AWScript .= '&';   # $AWScript contains URL parameters

Deleted: trunk/vhffs-patches/awstats/repository.awstats_6.95_vhffs.patch
===================================================================
--- trunk/vhffs-patches/awstats/repository.awstats_6.95_vhffs.patch	2015-02-11 23:59:20 UTC (rev 2271)
+++ trunk/vhffs-patches/awstats/repository.awstats_6.95_vhffs.patch	2015-02-12 23:27:31 UTC (rev 2272)
@@ -1,44 +0,0 @@
---- awstats.pl_	2012-04-30 18:52:22.668828732 +0200
-+++ awstats.pl	2012-04-30 18:58:32.599707630 +0200
-@@ -1716,29 +1716,10 @@
- 	# Other possible directories :				"/usr/local/etc/awstats", "/etc"
- 	# FHS standard, Suse package : 				"/etc/opt/awstats"
- 	my $configdir         = shift;
--	my @PossibleConfigDir = (
--			"$DIR",
--			"/etc/awstats",
--			"/usr/local/etc/awstats", "/etc",
--			"/etc/opt/awstats"
--		);
--
--	if ($configdir) {
--		# Check if configdir is outside default values.
--		my $outsidedefaultvalue=1;
--		foreach (@PossibleConfigDir) {
--			if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
--		}
- 
--		# If from CGI, overwriting of configdir with a value that differs from a default value
--		# is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
--		if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
--		{
--			error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
--		}
--
--		@PossibleConfigDir = ("$configdir");
--	}
-+	error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
-+	my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
-+	my @PossibleConfigDir = ($vhffsconfigdir );
- 
- 	# Open config file
- 	$FileConfig = $FileSuffix = '';
-@@ -10111,7 +10092,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-patches/awstats/repository.awstats_7.4_vhffs.patch
===================================================================
--- trunk/vhffs-patches/awstats/repository.awstats_7.4_vhffs.patch	                        (rev 0)
+++ trunk/vhffs-patches/awstats/repository.awstats_7.4_vhffs.patch	2015-02-12 23:27:31 UTC (rev 2272)
@@ -0,0 +1,44 @@
+--- awstats.pl.orig	2015-02-13 00:17:23.502566321 +0100
++++ awstats.pl	2015-02-13 00:17:28.926478173 +0100
+@@ -1715,29 +1715,10 @@
+ 	# Other possible directories :				"/usr/local/etc/awstats", "/etc"
+ 	# FHS standard, Suse package : 				"/etc/opt/awstats"
+ 	my $configdir         = shift;
+-	my @PossibleConfigDir = (
+-			"$DIR",
+-			"/etc/awstats",
+-			"/usr/local/etc/awstats", "/etc",
+-			"/etc/opt/awstats"
+-		); 
+ 
+-	if ($configdir) {
+-		# Check if configdir is outside default values.
+-		my $outsidedefaultvalue=1;
+-		foreach (@PossibleConfigDir) {
+-			if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
+-		}
+-
+-		# If from CGI, overwriting of configdir with a value that differs from a defautl value
+-		# is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+-		if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+-		{
+-			error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
+-		}
+-
+-		@PossibleConfigDir = ("$configdir");
+-	}
++	error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
++	my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
++	my @PossibleConfigDir=("$vhffsconfigdir");
+ 
+ 	# Open config file
+ 	$FileConfig = $FileSuffix = '';
+@@ -17465,7 +17446,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" );
+ if (index($AWScript,'?')>-1) 
+ {
+     $AWScript .= '&';   # $AWScript contains URL parameters


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/