SOURCES: awstats-created_dir_mode.patch, awstats-PLD.patch - updated to 6.9

[luzik]

Author: luzik                        Date: Tue Mar 24 07:58:47 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 6.9

---- Files affected:
SOURCES:
   awstats-created_dir_mode.patch (1.1 -> 1.2) , awstats-PLD.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/awstats-created_dir_mode.patch
diff -u SOURCES/awstats-created_dir_mode.patch:1.1 SOURCES/awstats-created_dir_mode.patch:1.2
--- SOURCES/awstats-created_dir_mode.patch:1.1	Sun Aug 21 19:49:47 2005
+++ SOURCES/awstats-created_dir_mode.patch	Tue Mar 24 08:58:41 2009
@@ -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)."
+ 				);

================================================================
Index: SOURCES/awstats-PLD.patch
diff -u SOURCES/awstats-PLD.patch:1.2 SOURCES/awstats-PLD.patch:1.3
--- SOURCES/awstats-PLD.patch:1.2	Tue Jan 16 14:06:29 2007
+++ SOURCES/awstats-PLD.patch	Tue Mar 24 08:58:41 2009
@@ -73,26 +73,14 @@
  		$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"
+ 		);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/awstats-created_dir_mode.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/awstats-PLD.patch?r1=1.2&r2=1.3&f=u