Compare commits

..

9 commits

Author SHA1 Message Date
Tim Jackson
a75956c3e0 Clean up changelog 2023-02-09 21:58:41 +01:00
Tim Jackson
fd75858d8d Merge branch 'f37' into epel8 2023-02-09 21:27:57 +01:00
Tim Jackson
9dc284d739 re-add the perl dep 2023-01-20 09:23:27 +01:00
Tim Jackson
b2ff4b0230 Merge branch 'rawhide' into epel8 2023-01-09 23:21:04 +01:00
Tim Jackson
4036c73375 Merge branch 'master' into epel8 2020-12-30 23:07:50 +01:00
Tim Jackson
f336689c6b Update to version 7.8 2020-08-09 23:37:27 +02:00
Tim Jackson
6daa30541d Fix broken Apache configuration on EPEL8 (#1823626) 2020-08-05 00:31:42 +02:00
Petr Lautrbach
105e25f8b3 import awstats-7.7 from Fedora 30 2020-03-12 16:30:09 +01:00
Gwyn Ciesla
92c8e2a3d3 "Adding package.cfg file" 2020-03-12 08:15:05 -05:00
4 changed files with 48 additions and 39 deletions

1
.gitignore vendored
View file

@ -8,4 +8,3 @@ 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

View file

@ -0,0 +1,38 @@
From: Chris Caron <lead2gold@gmail.com>
Date: Tue, 29 Nov 2016 20:33:53 -0500
Subject: update default path to be more compatible with Linux distro
Website: http://nuxref.com
Make it so you don't have to pass in the -awstats=/path/to/awstats.pl
every time any script is called.
---
diff -Naur awstats-7.4/tools/awstats_buildstaticpages.pl awstats-7.4.patched/tools/awstats_buildstaticpages.pl
--- awstats-7.4/tools/awstats_buildstaticpages.pl 2014-09-23 03:16:09.000000000 -0400
+++ awstats-7.4.patched/tools/awstats_buildstaticpages.pl 2016-11-29 20:33:53.203777945 -0500
@@ -299,6 +299,10 @@
# Check if AWSTATS prog is found
my $AwstatsFound=0;
if (-s "$Awstats") { $AwstatsFound=1; }
+elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
+ $Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
+ $AwstatsFound=1;
+}
elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
$Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
$AwstatsFound=1;
diff -Naur awstats-7.4/tools/awstats_updateall.pl awstats-7.4.patched/tools/awstats_updateall.pl
--- awstats-7.4/tools/awstats_updateall.pl 2014-09-23 03:16:09.000000000 -0400
+++ awstats-7.4.patched/tools/awstats_updateall.pl 2016-11-29 20:34:58.026745752 -0500
@@ -129,6 +129,10 @@
# Check if AWSTATS prog is found
my $AwstatsFound=0;
if (-s "$Awstats") { $AwstatsFound=1; }
+ elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
+ $Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
+ $AwstatsFound=1;
+ }
elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
$Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
$AwstatsFound=1;

View file

@ -1,9 +1,8 @@
Name: awstats
Version: 8.0
Release: 2%{?dist}
Version: 7.9
Release: 1%{?dist}
Summary: Advanced Web Statistics
# Automatically converted from old format: GPLv3+ - review is highly recommended.
License: GPL-3.0-or-later
License: GPLv3+
URL: https://www.awstats.org/
Source0: https://downloads.sourceforge.net/project/awstats/AWStats/%{version}/awstats-%{version}.tar.gz
Source1: %{name}.cron
@ -18,8 +17,9 @@ 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: crontabs
Requires(post): perl-interpreter
# For systemd.macros
@ -41,6 +41,7 @@ Apache, IIS, Weblogic, Webstar, Squid, ... but also mail or FTP servers.
This program can measure visits, unique visitors, authenticated users, pages,
domains/countries, OS busiest times, robot visits, type of files, search
engines/keywords used, visit duration, HTTP errors and more...
Statistics can be updated from a browser or your scheduler.
The program also supports virtual servers, plugins and a lot of features.
@ -50,8 +51,8 @@ http://localhost/awstats/awstats.pl
%prep
%setup -q
%patch -P0 -p 1
%patch -P1 -p 1
%patch0 -p 1
%patch1 -p 1
# Fix style sheets.
perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
@ -62,6 +63,7 @@ find tools/xslt -type f | xargs chmod -x
perl -pi -e 's/\r//g' docs/COPYING.TXT docs/LICENSE.TXT docs/pad_awstats.xml docs/awstats_changelog.txt docs/styles.css tools/httpd_conf tools/logresolvemerge.pl tools/awstats_exportlib.pl tools/awstats_buildstaticpages.pl tools/maillogconvert.pl tools/urlaliasbuilder.pl wwwroot/cgi-bin/awredir.pl
# Encoding
recode ISO-8859-1..UTF-8 docs/awstats_changelog.txt
# Stray version control file
rm -f tools/webmin/.gitignore
@ -159,39 +161,9 @@ fi
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Sat Nov 22 2025 Tim Jackson <rpm@timj.co.uk> - 8.0-1
* Update to 8.0
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.9-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 7.9-6
- convert license to SPDX
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Tim Jackson <rpm@timj.co.uk> - 7.9-1
- Version 7.9
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.8-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Jan 09 2023 Tim Jackson <rpm@timj.co.uk> - 7.8-9
- Fix CVE-2022-46391 (rhbz #2150632)
- Clean up spec file, removing conditionals for now-obsolete releases

View file

@ -1 +1 @@
SHA512 (awstats-8.0.tar.gz) = b14f820e2ea6895baa0034828bba422d2f0dadd70387f682c1e9f25a72d8817ecf91127e254d6c6e7e7c866e02860a05112b0ac4452da7e71b2d9a6f57f21d03
SHA512 (awstats-7.9.tar.gz) = 1270c7486a5558a54abc7b43cd92ffcea356ff4c00271bb824758ef4f5736eff559dd38eb7bc7bff8d45efa970a60ddcc5771762a3c3a32f003b0e39c55814d9