- updated for awstats-6.6

Changed files:
    awstats-PLD.patch -> 1.2

diff --git a/awstats-PLD.patch b/awstats-PLD.patch
index 2d410eaccaca444613fb79d562ea1c7ae5cea843..bc25f52c2d62980a9f4d1aa98eef3bc0fc0c3959 100644 (file)
--- a/awstats-PLD.patch
+++ b/awstats-PLD.patch
@@ -1,6 +1,6 @@
-diff -Naur awstats-6.5.orig/tools/awstats_buildstaticpages.pl awstats-6.5/tools/awstats_buildstaticpages.pl
---- awstats-6.5.orig/tools/awstats_buildstaticpages.pl 2005-03-20 19:11:05.000000000 +0100
-+++ awstats-6.5/tools/awstats_buildstaticpages.pl      2006-02-26 16:03:40.162984464 +0100
+diff -Nur b.awstats-6.6/tools/awstats_buildstaticpages.pl n.awstats-6.6/tools/awstats_buildstaticpages.pl
+--- b.awstats-6.6/tools/awstats_buildstaticpages.pl    2006-02-08 23:26:14.000000000 +0100
++++ n.awstats-6.6/tools/awstats_buildstaticpages.pl    2007-01-16 13:15:15.000000000 +0100
 @@ -133,7 +133,7 @@
        my @PossibleConfigDir=();
  
@@ -21,9 +21,9 @@ diff -Naur awstats-6.5.orig/tools/awstats_buildstaticpages.pl awstats-6.5/tools/
        $AwstatsFound=1;
  }
  if (! $AwstatsFound) {
-diff -Naur awstats-6.5.orig/tools/awstats_configure.pl awstats-6.5/tools/awstats_configure.pl
---- awstats-6.5.orig/tools/awstats_configure.pl        2005-03-27 16:50:22.000000000 +0200
-+++ awstats-6.5/tools/awstats_configure.pl     2006-02-26 16:06:53.265628400 +0100
+diff -Nur b.awstats-6.6/tools/awstats_configure.pl n.awstats-6.6/tools/awstats_configure.pl
+--- b.awstats-6.6/tools/awstats_configure.pl   2006-02-08 23:26:14.000000000 +0100
++++ n.awstats-6.6/tools/awstats_configure.pl   2007-01-16 13:15:15.000000000 +0100
 @@ -29,11 +29,11 @@
  $AWSTATS_DIRDATA_PATH
  /;
@@ -41,23 +41,18 @@ diff -Naur awstats-6.5.orig/tools/awstats_configure.pl awstats-6.5/tools/awstats
  $AWSTATS_DIRDATA_PATH='/var/lib/awstats';                                             # Used only when configure ran on linux
  
  
-@@ -604,11 +604,11 @@
-       if ($OS eq 'linux')             {
-               print "\n-----> Define config file path\n";\r
-               print "In which directory do you plan to store your config file(s) ?\n";\r
--              print "Default: /etc/awstats\n";\r
-+              print "Default: /etc/webapps/awstats\n";\r
-               my $bidon='';\r
-               print "Directory path to store config file(s) (Enter for default):\n> ";\r
-               $bidon=<STDIN>; chomp $bidon;\r
+@@ -608,7 +608,7 @@
+               my $bidon='';
+               print "Directory path to store config file(s) (Enter for default):\n> ";
+               $bidon=<STDIN>; chomp $bidon;
 -              if (! $bidon) { $bidon = "/etc/awstats"; }
 +              if (! $bidon) { $bidon = "/etc/webapps/awstats"; }
-               my $configdir=$bidon;\r
+               my $configdir=$bidon;
                if (! -d $configdir) {
                        # Create the directory for config files
-diff -Naur awstats-6.5.orig/tools/awstats_updateall.pl awstats-6.5/tools/awstats_updateall.pl
---- awstats-6.5.orig/tools/awstats_updateall.pl        2004-06-07 14:27:26.000000000 +0200
-+++ awstats-6.5/tools/awstats_updateall.pl     2006-02-26 16:02:19.621228672 +0100
+diff -Nur b.awstats-6.6/tools/awstats_updateall.pl n.awstats-6.6/tools/awstats_updateall.pl
+--- b.awstats-6.6/tools/awstats_updateall.pl   2006-07-24 01:57:48.000000000 +0200
++++ n.awstats-6.6/tools/awstats_updateall.pl   2007-01-16 13:15:15.000000000 +0100
 @@ -13,7 +13,7 @@
  my $VERSION="1.0 (build $REVISION)";
  
@@ -67,7 +62,7 @@ diff -Naur awstats-6.5.orig/tools/awstats_updateall.pl awstats-6.5/tools/awstats
  
  my $Debug=0;
  
-@@ -121,8 +121,8 @@
+@@ -130,8 +130,8 @@
        # Check if AWSTATS prog is found
        my $AwstatsFound=0;
        if (-s "$Awstats") { $AwstatsFound=1; }
@@ -78,19 +73,19 @@ diff -Naur awstats-6.5.orig/tools/awstats_updateall.pl awstats-6.5/tools/awstats
                $AwstatsFound=1;
        }
        if (! $AwstatsFound) {
-diff -Naur awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl awstats-6.5/wwwroot/cgi-bin/awstats.pl
---- awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl        2006-02-26 15:57:27.391654000 +0100
-+++ awstats-6.5/wwwroot/cgi-bin/awstats.pl     2006-02-26 16:00:29.892909912 +0100
-@@ -1091,7 +1091,7 @@
-       my @PossibleConfigDir=();
- 
-       if ($configdir) { @PossibleConfigDir=("$configdir"); }
+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");
+               #}
+       }
 -      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='';
-@@ -5567,8 +5567,8 @@
+@@ -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";