From aee7c4ef2398e5ac26d5f8dec77719778ed58d65 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 09:26:23 +0100 Subject: [PATCH 01/13] Remove perl(MODULE_COMPAT), it will be replaced by generators --- awstats.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/awstats.spec b/awstats.spec index f2b17e7..b71c414 100644 --- a/awstats.spec +++ b/awstats.spec @@ -24,7 +24,6 @@ BuildRequires: findutils BuildRequires: perl-interpreter BuildRequires: perl-generators BuildRequires: recode -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl-Net-IP, perl-Net-DNS, perl-Geo-IP Requires: crontabs Requires(post): perl-interpreter From 9439ecc5c99908df10bd9fc4cbb06399e663330f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:34:41 +0000 Subject: [PATCH 02/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- awstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awstats.spec b/awstats.spec index b71c414..522c2ac 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,6 +1,6 @@ Name: awstats Version: 7.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Advanced Web Statistics License: GPLv3+ URL: http://awstats.sourceforge.net @@ -167,6 +167,9 @@ fi %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 7.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 09 2023 Tim Jackson - 7.8-9 - Fix CVE-2022-46391 (rhbz #2150632) - Clean up spec file, removing conditionals for now-obsolete releases From 0aaaa886fb70b76930fd2b1e2a72871804679b1f Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Wed, 18 Jan 2023 23:56:18 +0100 Subject: [PATCH 03/13] Update to AWStats 7.9 --- .gitignore | 1 + ...d-2.4.patch => awstats-7.9-httpd-2.4.patch | 14 +++--------- awstats-CVE-2020-35176.patch | 20 ----------------- awstats-CVE-2022-46391.patch | 13 ----------- awstats.spec | 22 +++++++------------ sources | 2 +- 6 files changed, 13 insertions(+), 59 deletions(-) rename awstats-7.0-httpd-2.4.patch => awstats-7.9-httpd-2.4.patch (74%) delete mode 100644 awstats-CVE-2020-35176.patch delete mode 100644 awstats-CVE-2022-46391.patch diff --git a/.gitignore b/.gitignore index f81cfd7..81997fe 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ awstats-7.0.tar.gz /awstats-7.6.tar.gz /awstats-7.7.tar.gz /awstats-7.8.tar.gz +/awstats-7.9.tar.gz diff --git a/awstats-7.0-httpd-2.4.patch b/awstats-7.9-httpd-2.4.patch similarity index 74% rename from awstats-7.0-httpd-2.4.patch rename to awstats-7.9-httpd-2.4.patch index 2fe23b6..a441127 100644 --- a/awstats-7.0-httpd-2.4.patch +++ b/awstats-7.9-httpd-2.4.patch @@ -1,7 +1,6 @@ -diff -up awstats-7.0/tools/httpd_conf.http-2.4 awstats-7.0/tools/httpd_conf ---- awstats-7.0/tools/httpd_conf.http-2.4 2012-11-16 16:11:07.612386681 +0100 -+++ awstats-7.0/tools/httpd_conf 2012-11-16 16:44:24.921755562 +0100 -@@ -10,20 +10,33 @@ +--- awstats-7.9/tools/httpd_conf.orig 2014-09-23 09:16:09.000000000 +0200 ++++ awstats-7.9/tools/httpd_conf 2023-01-18 23:30:18.097762242 +0100 +@@ -10,20 +10,26 @@ # # Directives to add to your Apache conf file to allow use of AWStats as a CGI. @@ -28,14 +27,7 @@ diff -up awstats-7.0/tools/httpd_conf.http-2.4 awstats-7.0/tools/httpd_conf - Order allow,deny - Allow from all + -+ # Apache 2.4 + Require local -+ -+ -+ # Apache 2.2 -+ Order allow,deny -+ Allow from 127.0.0.1 -+ Allow from ::1 + +# Additional Perl modules diff --git a/awstats-CVE-2020-35176.patch b/awstats-CVE-2020-35176.patch deleted file mode 100644 index c954a95..0000000 --- a/awstats-CVE-2020-35176.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl -index e709b7f5..8341c0a5 100755 ---- a/wwwroot/cgi-bin/awstats.pl -+++ b/wwwroot/cgi-bin/awstats.pl -@@ -1711,13 +1711,13 @@ sub Read_Config { - # Check config file in common possible directories : - # Windows : "$DIR" (same dir than awstats.pl) - # Standard, Mandrake and Debian package : "/etc/awstats" -- # Other possible directories : "/usr/local/etc/awstats", "/etc" -+ # Other possible directories : "/usr/local/etc/awstats", - # FHS standard, Suse package : "/etc/opt/awstats" - my $configdir = shift; - my @PossibleConfigDir = ( - "$DIR", - "/etc/awstats", -- "/usr/local/etc/awstats", "/etc", -+ "/usr/local/etc/awstats", - "/etc/opt/awstats" - ); - diff --git a/awstats-CVE-2022-46391.patch b/awstats-CVE-2022-46391.patch deleted file mode 100644 index bed1e7b..0000000 --- a/awstats-CVE-2022-46391.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/wwwroot/cgi-bin/plugins/hostinfo.pm b/wwwroot/cgi-bin/plugins/hostinfo.pm -index 95b2c20b7..1f0ac6994 100644 ---- a/wwwroot/cgi-bin/plugins/hostinfo.pm -+++ b/wwwroot/cgi-bin/plugins/hostinfo.pm -@@ -181,7 +181,7 @@ sub BuildFullHTMLOutput_hostinfo { - - &tab_head("Full Whois Field",0,0,'whois'); - if ($w && $w->response()) { -- print "
".($w->response())."
\n"; -+ print "
".CleanXSS($w->response())."
\n"; - } - else { - print "
The Whois command failed.
Did the server running AWStats is allowed to send WhoIs queries (If a firewall is running, port 43 should be opened from inside to outside) ?

\n"; diff --git a/awstats.spec b/awstats.spec index 522c2ac..74fdbb2 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,22 +1,15 @@ Name: awstats -Version: 7.8 -Release: 10%{?dist} +Version: 7.9 +Release: 1%{?dist} Summary: Advanced Web Statistics License: GPLv3+ -URL: http://awstats.sourceforge.net -Source0: http://downloads.sourceforge.net/project/awstats/AWStats/%{version}/awstats-%{version}.tar.gz +URL: https://www.awstats.org/ +Source0: https://downloads.sourceforge.net/project/awstats/AWStats/%{version}/awstats-%{version}.tar.gz Source1: %{name}.cron Patch0: awstats-awredir.pl-sanitize-parameters.patch # fix configuration for httpd 2.4 (#871366) -Patch1: awstats-7.0-httpd-2.4.patch - -# https://github.com/eldy/awstats/pull/196/commits/0d4d4c05f8e73be8f71dd361dc55cbd52858b823.diff -Patch2: awstats-CVE-2020-35176.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=2150632 -# https://github.com/eldy/AWStats/commit/38682330e1ec3f3af95f9436640358b2d9e4a965.diff -Patch3: awstats-CVE-2022-46391.patch +Patch1: awstats-7.9-httpd-2.4.patch BuildArch: noarch BuildRequires: coreutils @@ -58,8 +51,6 @@ http://localhost/awstats/awstats.pl %setup -q %patch0 -p 1 %patch1 -p 1 -%patch2 -p 1 -%patch3 -p 1 # Fix style sheets. perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/* @@ -167,6 +158,9 @@ fi %changelog +* Wed Jan 18 2023 Tim Jackson - 7.9-1 +- Version 7.9 + * Wed Jan 18 2023 Fedora Release Engineering - 7.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 318d463..3a8025b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (awstats-7.8.tar.gz) = b532f74a8b420841b1ae7eea73fd341049925af01688a06114f53807c14c6a4edc4ca4f671b2b9c1aee8024ba25ccf69b6eae391250e5722d2fd719de4cf87e2 +SHA512 (awstats-7.9.tar.gz) = 1270c7486a5558a54abc7b43cd92ffcea356ff4c00271bb824758ef4f5736eff559dd38eb7bc7bff8d45efa970a60ddcc5771762a3c3a32f003b0e39c55814d9 From 9cdc31d8f8678835901387fab905bfab614e8bba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:16:22 +0000 Subject: [PATCH 04/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- awstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awstats.spec b/awstats.spec index 74fdbb2..503000f 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,6 +1,6 @@ Name: awstats Version: 7.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Advanced Web Statistics License: GPLv3+ URL: https://www.awstats.org/ @@ -158,6 +158,9 @@ fi %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 7.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Tim Jackson - 7.9-1 - Version 7.9 From a869d814c40b4bcb139fe83e2a3d88978764c860 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:03:00 +0000 Subject: [PATCH 05/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- awstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awstats.spec b/awstats.spec index 503000f..0328871 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,6 +1,6 @@ Name: awstats Version: 7.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced Web Statistics License: GPLv3+ URL: https://www.awstats.org/ @@ -158,6 +158,9 @@ fi %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 7.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 7.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c11176a78e8e7610a7b84c9e278b52e516fb6787 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:00:48 +0000 Subject: [PATCH 06/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- awstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awstats.spec b/awstats.spec index 0328871..2346cb9 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,6 +1,6 @@ Name: awstats Version: 7.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Advanced Web Statistics License: GPLv3+ URL: https://www.awstats.org/ @@ -158,6 +158,9 @@ fi %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 7.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 7.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f7da9ef99e250b8642f3ea39571a61c74ee11beb Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 07/13] Eliminate use of obsolete %patchN syntax (#2283636) --- awstats.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awstats.spec b/awstats.spec index 2346cb9..c5eea9b 100644 --- a/awstats.spec +++ b/awstats.spec @@ -49,8 +49,8 @@ http://localhost/awstats/awstats.pl %prep %setup -q -%patch0 -p 1 -%patch1 -p 1 +%patch -P0 -p 1 +%patch -P1 -p 1 # Fix style sheets. perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/* From 8ab5fcb95982eaf6300762c04bbbfcabc6fadd55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:58:07 +0000 Subject: [PATCH 08/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- awstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awstats.spec b/awstats.spec index c5eea9b..828d511 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,6 +1,6 @@ Name: awstats Version: 7.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Advanced Web Statistics License: GPLv3+ URL: https://www.awstats.org/ @@ -158,6 +158,9 @@ fi %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 7.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 23 2024 Fedora Release Engineering - 7.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 51624c431d25a278091bc79f65eb5c21b75b8dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 11:25:35 +0200 Subject: [PATCH 09/13] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- awstats.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/awstats.spec b/awstats.spec index 828d511..0788d64 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,8 +1,9 @@ Name: awstats Version: 7.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Advanced Web Statistics -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later URL: https://www.awstats.org/ Source0: https://downloads.sourceforge.net/project/awstats/AWStats/%{version}/awstats-%{version}.tar.gz Source1: %{name}.cron @@ -158,6 +159,9 @@ fi %changelog +* Thu Jul 25 2024 Miroslav Suchý - 7.9-6 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 7.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 52cc8b8398f3a83fc3d77971ab499ff92a835b70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:08:55 +0000 Subject: [PATCH 10/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- awstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awstats.spec b/awstats.spec index 0788d64..a7a424c 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,6 +1,6 @@ Name: awstats Version: 7.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Advanced Web Statistics # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -159,6 +159,9 @@ fi %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 7.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 7.9-6 - convert license to SPDX From e962c4f530e0b3d3c74f00896d433b512240abb4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:31:22 +0000 Subject: [PATCH 11/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- awstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awstats.spec b/awstats.spec index a7a424c..cf5987f 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,6 +1,6 @@ Name: awstats Version: 7.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Advanced Web Statistics # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -159,6 +159,9 @@ fi %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 7.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 7.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 24291e1a5b927800be6734cd775e8c1d9f88565a Mon Sep 17 00:00:00 2001 From: Tim Jackson Date: Tue, 6 Jan 2026 22:57:59 +0100 Subject: [PATCH 12/13] update to 8.0 --- .gitignore | 1 + awstats.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 81997fe..bd70761 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ awstats-7.0.tar.gz /awstats-7.7.tar.gz /awstats-7.8.tar.gz /awstats-7.9.tar.gz +/awstats-8.0.tar.gz diff --git a/awstats.spec b/awstats.spec index cf5987f..6d91c63 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,6 +1,6 @@ Name: awstats -Version: 7.9 -Release: 8%{?dist} +Version: 8.0 +Release: 1%{?dist} Summary: Advanced Web Statistics # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -159,6 +159,9 @@ fi %changelog +* Sat Nov 22 2025 Tim Jackson - 8.0-1 +* Update to 8.0 + * Wed Jul 23 2025 Fedora Release Engineering - 7.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 3a8025b..4008499 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (awstats-7.9.tar.gz) = 1270c7486a5558a54abc7b43cd92ffcea356ff4c00271bb824758ef4f5736eff559dd38eb7bc7bff8d45efa970a60ddcc5771762a3c3a32f003b0e39c55814d9 +SHA512 (awstats-8.0.tar.gz) = b14f820e2ea6895baa0034828bba422d2f0dadd70387f682c1e9f25a72d8817ecf91127e254d6c6e7e7c866e02860a05112b0ac4452da7e71b2d9a6f57f21d03 From 0e84a8ea105dfa54bee30cef30ae2e2949d46dbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 04:13:28 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- awstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awstats.spec b/awstats.spec index 6d91c63..6389fe6 100644 --- a/awstats.spec +++ b/awstats.spec @@ -1,6 +1,6 @@ Name: awstats Version: 8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Advanced Web Statistics # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -159,6 +159,9 @@ fi %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Sat Nov 22 2025 Tim Jackson - 8.0-1 * Update to 8.0