Clean up changelog

Merge branch 'f37' into epel8
re-add the perl dep
2023-02-09 21:58:41 +01:00 · 2023-02-09 21:27:57 +01:00 · 2023-01-20 09:23:27 +01:00 · 2023-01-09 23:21:04 +01:00 · 2020-12-30 23:07:50 +01:00 · 2020-08-09 23:37:27 +02:00
2 changed files with 42 additions and 4 deletions
--- a/awstats-awstats_path.patch
+++ b/awstats-awstats_path.patch
@ -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;
--- a/awstats.spec
+++ b/awstats.spec
@ -17,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
@ -40,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.

@ -61,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

@ -161,9 +164,6 @@ fi
 * 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
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