- updated to 7.9

diff --git a/awstats-PLD.patch b/awstats-PLD.patch
index 23962b980ababa1f91a68e4d68776312de9f0ff1..b491b3a009741c8d844a2ebac922b8816e079e60 100644 (file)
--- a/awstats-PLD.patch
+++ b/awstats-PLD.patch
@@ -1,7 +1,7 @@
-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 @@
+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 -Nur b.awstats-6.6/tools/awstats_buildstaticpages.pl n.awstats-6.6/tools/aw
  
        # 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 -Nur b.awstats-6.6/tools/awstats_buildstaticpages.pl n.awstats-6.6/tools/aw
 +      $Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
        $AwstatsFound=1;
  }
- if (! $AwstatsFound) {
-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 @@
+ 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,7 +41,7 @@ diff -Nur b.awstats-6.6/tools/awstats_configure.pl n.awstats-6.6/tools/awstats_c
  $AWSTATS_DIRDATA_PATH='/var/lib/awstats';                                             # Used only when configure ran on linux
  
  
-@@ -608,7 +608,7 @@
+@@ -610,7 +610,7 @@
                my $bidon='';
                print "Directory path to store config file(s) (Enter for default):\n> ";
                $bidon=<STDIN>; chomp $bidon;
@@ -50,10 +50,10 @@ diff -Nur b.awstats-6.6/tools/awstats_configure.pl n.awstats-6.6/tools/awstats_c
                my $configdir=$bidon;
                if (! -d $configdir) {
                        # Create the directory for config files
-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 @@
+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
@@ -62,7 +62,7 @@ diff -Nur b.awstats-6.6/tools/awstats_updateall.pl n.awstats-6.6/tools/awstats_u
  
  my $Debug=0;
  
-@@ -130,8 +130,8 @@
+@@ -129,8 +129,8 @@
        # Check if AWSTATS prog is found
        my $AwstatsFound=0;
        if (-s "$Awstats") { $AwstatsFound=1; }
@@ -73,13 +73,14 @@ diff -Nur b.awstats-6.6/tools/awstats_updateall.pl n.awstats-6.6/tools/awstats_u
                $AwstatsFound=1;
        }
        if (! $AwstatsFound) {
---- awstats-7.0/wwwroot/cgi-bin/awstats.pl~    2011-01-13 13:23:54.000000000 +0200
-+++ awstats-7.0/wwwroot/cgi-bin/awstats.pl     2011-01-13 14:22:50.921961909 +0200
-@@ -1712,6 +1712,7 @@
+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",
+                       "/usr/local/etc/awstats",
                        "/etc/opt/awstats"

diff --git a/awstats-created_dir_mode.patch b/awstats-created_dir_mode.patch
index a6a68141aed7f9a1130c28df3f9b400e50e5a8a6..d7e2cf6f9ddcb4cb7c5aedbf46a4f00b4bff7300 100644 (file)
--- a/awstats-created_dir_mode.patch
+++ b/awstats-created_dir_mode.patch
@@ -1,11 +1,12 @@
---- 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 {
+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        2023-01-17 13:56:28.000000000 +0100
++++ awstats-7.9/wwwroot/cgi-bin/awstats.pl     2024-01-07 20:09:51.559596037 +0100
+@@ -3056,7 +3056,7 @@
        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)."
-                               );
+                               error(
+ "$PROG failed to create directory DirData (DirData=\"$DirData\", CreateDirDataIfNotExists=$CreateDirDataIfNotExists)."

diff --git a/awstats.spec b/awstats.spec
index e54f2d61a6c3a4dd32808750ea4d53d85d29552e..1e21d337635cc41307fada1673ef59d81c1aea02 100644 (file)
--- a/awstats.spec
+++ b/awstats.spec
@@ -7,12 +7,12 @@
 Summary:       Advanced Web Statistics is a free powerful server log file analyzer
 Summary(pl.UTF-8):     Zaawansowany program do analizowania logów serwera
 Name:          awstats
-Version:       7.8
-Release:       2
+Version:       7.9
+Release:       1
 License:       GPL v3+
 Group:         Applications/Networking
 Source0:       http://awstats.sourceforge.net/files/%{name}-%{version}.tar.gz
-# Source0-md5: 46986723e04b1980389193153915e760
+# Source0-md5: c283e0170700461596f9c9e121ea2896
 Source1:       %{name}.crontab
 Source2:       %{name}-httpd.conf
 Source3:       %{name}.conf
@@ -23,7 +23,7 @@ Patch2:               %{name}-PLD.patch
 URL:           https://awstats.sourceforge.io/
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.264
-Requires(triggerpostun):       sed >= 4.0
+Requires(postun):      sed >= 4.0
 Requires:      perl-Geo-IP
 Requires:      perl-Storable
 Requires:      perl-Time-HiRes

diff --git a/awstats_conf.patch b/awstats_conf.patch
index 18748a2e24ba2a8ebc540f9cef914871daaf6c0d..258bc94aee3d777bfc834e92144b2dbe4c7104d1 100644 (file)
--- a/awstats_conf.patch
+++ b/awstats_conf.patch
@@ -1,8 +1,8 @@
-diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.5/wwwroot/cgi-bin/awstats.model.conf
---- awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf        2005-03-27 16:44:52.000000000 +0200
-+++ awstats-6.5/wwwroot/cgi-bin/awstats.model.conf     2005-08-21 19:36:33.000000000 +0200
-@@ -48,7 +48,7 @@
- # If there is several log files from load balancing servers :
+diff -ur awstats-7.9.orig/wwwroot/cgi-bin/awstats.model.conf awstats-7.9/wwwroot/cgi-bin/awstats.model.conf
+--- awstats-7.9.orig/wwwroot/cgi-bin/awstats.model.conf        2021-08-19 04:00:58.000000000 +0200
++++ awstats-7.9/wwwroot/cgi-bin/awstats.model.conf     2024-01-07 20:08:45.852760449 +0100
+@@ -47,7 +47,7 @@
+ # If there are several log files from load balancing servers :
  # Example: "/pathtotools/logresolvemerge.pl *.log |"
  #
 -LogFile="/var/log/httpd/mylog.log"
@@ -10,7 +10,7 @@ diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.
  
  
  # Enter the log file type you want to analyze.
-@@ -118,7 +118,7 @@
+@@ -123,7 +123,7 @@
  # Example for IIS:
  # LogFormat = 2
  #
@@ -19,7 +19,7 @@ diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.
  
  
  # If your log field's separator is not a space, you can change this parameter.
-@@ -149,7 +149,7 @@
+@@ -154,7 +154,7 @@
  # Example: "ftp.domain.com"
  # Example: "domain.com"
  #
@@ -28,7 +28,7 @@ diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.
  
  
  # Enter here all other possible domain names, addresses or virtual host
-@@ -164,7 +164,7 @@
+@@ -169,7 +169,7 @@
  # Note: You can also use @/mypath/myfile if list of aliases are in a file.
  # Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]"
  #
@@ -37,7 +37,7 @@ diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.
  
  
  # If you want to have hosts reported by name instead of ip address, AWStats
-@@ -199,7 +199,7 @@
+@@ -219,7 +219,7 @@
  # Example: "C:/awstats_data_dir"
  # Default: "."          (means same directory as awstats.pl)
  #
@@ -46,7 +46,7 @@ diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.
  
  
  # Relative or absolute web URL of your awstats cgi-bin directory.
-@@ -208,7 +208,7 @@
+@@ -228,7 +228,7 @@
  # Example: "/awstats"
  # Default: "/cgi-bin"   (means awstats.pl is in "/yourwwwroot/cgi-bin")
  #
@@ -55,7 +55,7 @@ diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.
  
  
  # Relative or absolute web URL of your awstats icon directory.
-@@ -218,7 +218,7 @@
+@@ -238,7 +238,7 @@
  # Example: "../icon"
  # Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon")
  #
@@ -63,8 +63,8 @@ diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.
 +DirIcons="/awstatsicons"
  
  
- # When this parameter is set to 1, AWStats add a button on report page to
-@@ -357,7 +357,7 @@
+ # When this parameter is set to 1, AWStats adds a button on the report page to
+@@ -378,7 +378,7 @@
  # Possible values: 0 or 1
  # Default: 0
  #
@@ -72,8 +72,8 @@ diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.
 +CreateDirDataIfNotExists=1
  
  
- # You can choose in which format the Awstats history database is saved.
-@@ -876,7 +876,7 @@
+ # You can choose in which format the AWStats history database is saved.
+@@ -945,7 +945,7 @@
  # Example: "/usr/share/awstats/lang"
  # Default: "./lang" (means lang directory is in same location than awstats.pl)
  #
@@ -82,7 +82,7 @@ diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.
  
  
  # Show menu header with reports' links
-@@ -1186,7 +1186,7 @@
+@@ -1275,7 +1275,7 @@
  # Example: "/css/awstats_bw.css"
  # Default: ""
  #
@@ -90,4 +90,4 @@ diff -dur -x '*~' awstats-6.5.orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.
 +StyleSheet="/awstatscss/awstats_default.css"
  
  
- # Those colors parameters can be used (if StyleSheet parameter is not used)
+ # Those color parameters can be used (if StyleSheet parameter is not used)