From b011c50eaaa94f4fea09cb0705311f6a1660cb64 Mon Sep 17 00:00:00 2001
From: luzik <luzik@pld-linux.org>
Date: Tue, 24 Mar 2009 07:58:41 +0000
Subject: [PATCH] - updated to 6.9

Changed files:
    awstats-PLD.patch -> 1.3
    awstats-created_dir_mode.patch -> 1.2
---
 awstats-PLD.patch              | 32 ++++++++++----------------------
 awstats-created_dir_mode.patch | 21 ++++++++++-----------
 2 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/awstats-PLD.patch b/awstats-PLD.patch
index bc25f52..76f7f66 100644
--- a/awstats-PLD.patch
+++ b/awstats-PLD.patch
@@ -73,26 +73,14 @@ diff -Nur b.awstats-6.6/tools/awstats_updateall.pl n.awstats-6.6/tools/awstats_u
  		$AwstatsFound=1;
  	}
  	if (! $AwstatsFound) {
-diff -Nur b.awstats-6.6/wwwroot/cgi-bin/awstats.pl n.awstats-6.6/wwwroot/cgi-bin/awstats.pl
---- b.awstats-6.6/wwwroot/cgi-bin/awstats.pl	2007-01-16 13:14:33.000000000 +0100
-+++ n.awstats-6.6/wwwroot/cgi-bin/awstats.pl	2007-01-16 13:15:15.000000000 +0100
-@@ -1143,7 +1143,7 @@
- 			@PossibleConfigDir=("$configdir");
- 		#}
+--- awstats-6.9/wwwroot/cgi-bin/awstats.pl.fix	2009-03-20 13:48:27.572771826 +0100
++++ awstats-6.9/wwwroot/cgi-bin/awstats.pl	2009-03-20 13:49:16.911789620 +0100
+@@ -1642,7 +1642,7 @@ sub Read_Config {
  	}
--	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+	else { @PossibleConfigDir=("$DIR","/etc/webapps/awstats","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
- 
- 	# Open config file
- 	$FileConfig=$FileSuffix='';
-@@ -5681,8 +5681,8 @@
- 	print "  First, $PROG tries to read $PROG.virtualhostname.conf as the config file.\n";
- 	print "  If not found, $PROG tries to read $PROG.conf\n";
- 	print "  Note 1: Config files ($PROG.virtualhostname.conf or $PROG.conf) must be\n";
--	print "   in /etc/awstats, /usr/local/etc/awstats, /etc or same directory than\n";
--	print "   awstats.pl script file.\n";
-+	print "   in /etc/webapps/awstasts, /etc/awstats, /usr/local/etc/awstats, /etc\n";
-+	print "   or same directory than awstats.pl script file.\n";
- 	print "  Note 2: If AWSTATS_FORCE_CONFIG environment variable is defined, AWStats will\n";
- 	print "   use it as the \"config\" value, whatever is the value on command line or URL.\n";
- 	print "   See AWStats documentation for all setup instrutions.\n";
+ 	else {
+ 		@PossibleConfigDir = (
+-							   "$DIR",                   "/etc/awstats",
++							   "$DIR", "/etc/webapps/awstats", "/etc/awstats",
+ 							   "/usr/local/etc/awstats", "/etc",
+ 							   "/etc/opt/awstats"
+ 		);
diff --git a/awstats-created_dir_mode.patch b/awstats-created_dir_mode.patch
index 949a385..a6a6814 100644
--- a/awstats-created_dir_mode.patch
+++ b/awstats-created_dir_mode.patch
@@ -1,12 +1,11 @@
-diff -dur -x '*~' awstats-6.5.orig1/wwwroot/cgi-bin/awstats.pl awstats-6.5/wwwroot/cgi-bin/awstats.pl
---- awstats-6.5.orig1/wwwroot/cgi-bin/awstats.pl	2005-03-20 19:11:05.000000000 +0100
-+++ awstats-6.5/wwwroot/cgi-bin/awstats.pl	2005-08-21 19:43:31.000000000 +0200
-@@ -1770,7 +1770,7 @@
- 	if (! $MigrateStats && ! -d $DirData) {
+--- awstats-6.9/wwwroot/cgi-bin/awstats.pl.fix	2009-03-20 13:53:04.308433852 +0100
++++ awstats-6.9/wwwroot/cgi-bin/awstats.pl	2009-03-20 13:53:20.211765413 +0100
+@@ -2850,7 +2850,7 @@ sub Check_Config {
+ 	if ( !$MigrateStats && !-d $DirData ) {
  		if ($CreateDirDataIfNotExists) {
- 			if ($Debug) { debug(" Make directory $DirData",2); }
--			my $mkdirok=mkdir "$DirData", 0766;
-+			my $mkdirok=mkdir "$DirData", 0755;
- 			if (! $mkdirok) { error("$PROG failed to create directory DirData (DirData=\"$DirData\", CreateDirDataIfNotExists=$CreateDirDataIfNotExists)."); }
- 		}
- 		else {
+ 			if ($Debug) { debug( " Make directory $DirData", 2 ); }
+-			my $mkdirok = mkdir "$DirData", 0766;
++			my $mkdirok = mkdir "$DirData", 0755;
+ 			if ( !$mkdirok ) {
+ 				error(          "$PROG failed to create directory DirData (DirData=\"$DirData\", CreateDirDataIfNotExists=$CreateDirDataIfNotExists)."
+ 				);
-- 
2.44.0