- updated to 7.9

[packages/awstats.git] / awstats-PLD.patch

diff --git a/awstats-PLD.patch b/awstats-PLD.patch
index 2d410eaccaca444613fb79d562ea1c7ae5cea843..b491b3a009741c8d844a2ebac922b8816e079e60 100644 (file)
--- a/awstats-PLD.patch
+++ b/awstats-PLD.patch
@@ -1,7 +1,7 @@
-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
-@@ -133,7 +133,7 @@
+diff -ur awstats-7.9.orig/tools/awstats_buildstaticpages.pl awstats-7.9/tools/awstats_buildstaticpages.pl
+--- awstats-7.9.orig/tools/awstats_buildstaticpages.pl 2021-08-19 04:00:58.000000000 +0200
++++ awstats-7.9/tools/awstats_buildstaticpages.pl      2024-01-07 20:10:32.230113241 +0100
+@@ -129,7 +129,7 @@
        my @PossibleConfigDir=();
  
        if ($configdir) { @PossibleConfigDir=("$configdir"); }
@@ -10,7 +10,7 @@ diff -Naur awstats-6.5.orig/tools/awstats_buildstaticpages.pl awstats-6.5/tools/
  
        # Open config file
        $FileConfig=$FileSuffix='';
-@@ -293,8 +293,8 @@
+@@ -299,8 +299,8 @@
  # Check if AWSTATS prog is found
  my $AwstatsFound=0;
  if (-s "$Awstats") { $AwstatsFound=1; }
@@ -20,11 +20,11 @@ diff -Naur awstats-6.5.orig/tools/awstats_buildstaticpages.pl awstats-6.5/tools/
 +      $Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
        $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
-@@ -29,11 +29,11 @@
+ elsif (-s "/usr/lib/cgi-bin/awstats.pl") {
+diff -ur awstats-7.9.orig/tools/awstats_configure.pl awstats-7.9/tools/awstats_configure.pl
+--- awstats-7.9.orig/tools/awstats_configure.pl        2019-06-27 11:30:40.000000000 +0200
++++ awstats-7.9/tools/awstats_configure.pl     2024-01-07 20:10:32.231113254 +0100
+@@ -28,11 +28,11 @@
  $AWSTATS_DIRDATA_PATH
  /;
  $AWSTATS_PATH='';
@@ -41,24 +41,19 @@ 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
+@@ -610,7 +610,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
-@@ -13,7 +13,7 @@
+diff -ur awstats-7.9.orig/tools/awstats_updateall.pl awstats-7.9/tools/awstats_updateall.pl
+--- awstats-7.9.orig/tools/awstats_updateall.pl        2014-09-23 09:16:09.000000000 +0200
++++ awstats-7.9/tools/awstats_updateall.pl     2024-01-07 20:10:32.231113254 +0100
+@@ -12,7 +12,7 @@
  my $VERSION="1.0 (build $REVISION)";
  
  # Default value of DIRCONFIG
@@ -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 @@
+@@ -129,8 +129,8 @@
        # Check if AWSTATS prog is found
        my $AwstatsFound=0;
        if (-s "$Awstats") { $AwstatsFound=1; }
@@ -78,26 +73,14 @@ 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"); }
--      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 @@
-       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";
+diff -ur awstats-7.9.orig/wwwroot/cgi-bin/awstats.pl awstats-7.9/wwwroot/cgi-bin/awstats.pl
+--- awstats-7.9.orig/wwwroot/cgi-bin/awstats.pl        2024-01-07 20:09:51.559596037 +0100
++++ awstats-7.9/wwwroot/cgi-bin/awstats.pl     2024-01-07 20:10:32.235113304 +0100
+@@ -1716,6 +1716,7 @@
+       my $configdir         = shift;
+       my @PossibleConfigDir = (
+                       "$DIR",
++                      "/etc/webapps/awstats",
+                       "/etc/awstats",
+                       "/usr/local/etc/awstats",
+                       "/etc/opt/awstats"