Version 7.8

- drop patch0

awstats-7.0-httpd-2.4.patch

@@ -1,45 +0,0 @@
-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 @@
- 
- #
- # Directives to add to your Apache conf file to allow use of AWStats as a CGI.
--# Note that path "/usr/local/awstats/" must reflect your AWStats install path.
-+# Note that path "/usr/share/awstats/" must reflect your AWStats install path.
- #
--Alias /awstatsclasses "/usr/local/awstats/wwwroot/classes/"
--Alias /awstatscss "/usr/local/awstats/wwwroot/css/"
--Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/"
--ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/"
-+Alias /awstatsclasses "/usr/share/awstats/wwwroot/classes/"
-+Alias /awstatscss "/usr/share/awstats/wwwroot/css/"
-+Alias /awstatsicons "/usr/share/awstats/wwwroot/icon/"
-+ScriptAlias /awstats/ "/usr/share/awstats/wwwroot/cgi-bin/"
- 
- 
- #
- # This is to permit URL access to scripts/files in AWStats directory.
- #
--<Directory "/usr/local/awstats/wwwroot">
-+<Directory "/usr/share/awstats/wwwroot">
-     Options None
-     AllowOverride None
--    Order allow,deny
--    Allow from all
-+    <IfModule mod_authz_core.c>
-+        # Apache 2.4	
-+        Require local
-+    </IfModule>
-+    <IfModule !mod_authz_core.c>
-+        # Apache 2.2
-+        Order allow,deny
-+        Allow from 127.0.0.1
-+        Allow from ::1
-+    </IfModule>
- </Directory>
-+# Additional Perl modules
-+<IfModule mod_env.c>
-+    SetEnv PERL5LIB /usr/share/awstats/lib:/usr/share/awstats/plugins
-+</IfModule>
-+

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;

awstats.spec

@@ -8,6 +8,7 @@ Source0:    http://downloads.sourceforge.net/project/awstats/AWStats/%{version}/
 Source1:    %{name}.cron
 Patch0:     awstats-awredir.pl-sanitize-parameters.patch
 
+
 %if 0%{?rhel} >= 7 || 0%{?fedora}
 # fix configuration for httpd 2.4 (#871366)
 Patch1:     awstats-7.0-httpd-2.4.patch
@@ -17,15 +18,16 @@ Patch1:     awstats-7.0-httpd-2.4.patch
 %define use_systemd (0%{?fedora} || 0%{?rhel} >= 7)
 
 BuildArch:  noarch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  coreutils
 BuildRequires:  findutils
-BuildRequires:  perl-interpreter
+BuildRequires:  perl
 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
+Requires:   crontabs
+Requires(post): perl
 
 %if %use_systemd
 # For systemd.macros
@@ -179,162 +181,18 @@ fi
 * Fri Aug 07 2020 Tim Jackson <rpm@timj.co.uk> - 7.8-1
 - Version 7.8
 
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Mon Aug 26 2019 Petr Lautrbach <plautrba@redhat.com> - 7.7-1.1
+- version 7.7
 
-* Fri Jun 26 2020 Jitka Plesnikova <jplesnik@redhat.com> - 7.7-10
-- Perl 5.32 re-rebuild of bootstrapped packages
-
-* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 7.7-9
-- Perl 5.32 rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 7.7-6
-- Perl 5.30 rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 7.7-3
-- Perl 5.28 rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jan 08 2018 Petr Lautrbach <plautrba@redhat.com> - 7.7-1
-- Version 7.7
-
-* Tue Jan 02 2018 Petr Lautrbach <plautrba@redhat.com> - 7.6-8
-- Fix two path traversal issues in awstat.pl - CVE-2017-1000501 (#1529349)
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.6-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jul 14 2017 Petr Pisar <ppisar@redhat.com> - 7.6-6
-- perl dependency renamed to perl-interpreter manually
-  <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>
-
-* Thu Jul 13 2017 Petr Pisar <ppisar@redhat.com> - 7.6-5
-- perl dependency renamed to perl-interpreter
-  <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>
-
-* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 7.6-4
-- Perl 5.26 rebuild
-
-* Tue May 30 2017 Petr Lautrbach <plautrba@redhat.com> - 7.6-3
-- Revert "Move cron file to awstats-cron"
-
-* Tue May 23 2017 Petr Lautrbach <plautrba@redhat.com> - 7.6-2
-- Move cron file to awstats-cron
-- Update default path to be more compatible with Linux distro
-
-* Wed Apr 12 2017 Petr Lautrbach <plautrba@redhat.com> - 7.6-1
-- version 7.6
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jul 22 2016 Jitka Plesnikova <jplesnik@redhat.com> - 7.4-5
-- Fix FTBFS when perl is not in the SRPM build root
-
-* Sat May 14 2016 Jitka Plesnikova <jplesnik@redhat.com> - 7.4-4
-- Perl 5.24 rebuild
-
-* Thu Feb 25 2016 Petr Lautrbach <plautrba@redhat.com> 7.4-3
-- replace logos with Copyright and Trademark problem by unknown.png (#1196549)
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 7.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Sep 11 2015 Petr Lautrbach <plautrba@redhat.com> 7.4-1
-- version 7.4
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 7.3-3
-- Perl 5.22 rebuild
-
-* Fri Sep 05 2014 Jitka Plesnikova <jplesnik@redhat.com> - 7.3-2
-- Perl 5.20 rebuild
-
-* Wed Sep 03 2014 Petr Lautrbach <plautrba@redhat.com> 7.3-1
-- version 7.3
-
-* Tue Aug 26 2014 Jitka Plesnikova <jplesnik@redhat.com> - 7.2-2
-- Perl 5.20 rebuild
-
-* Mon Jun 09 2014 Petr Lautrbach <plautrba@redhat.com> 7.2-1
-- version 7.2
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.1.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Oct 10 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 7.1.1-5
-- Add BR: systemd for systemd.macros (RHBZ #1017665).
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.1.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 7.1.1-3
-- Perl 5.18 rebuild
-
-* Tue Apr 02 2013 Petr Lautrbach <plautrba@redhat.com> 7.1.1-2
-- add a missing requirement on crontab and fix (#947040)
-- add missing requirements (#908981)
-- spec file and patches cleanup
-
-* Mon Mar 18 2013 Petr Lautrbach <plautrba@redhat.com> 7.1.1-1
-- version 7.1.1
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Jan 04 2013 Petr Lautrbach <plautrba@redhat.com> 7.1-1
-- version 7.1
-
-* Fri Nov 16 2012 Petr Lautrbach <plautrba@redhat.com> 7.0-11
-- fix configuration for httpd 2.4 (#871366)
+* Thu Feb 21 2013 Petr Lautrbach <plautrba@redhat.com> 7.0-3
 - fix potential XSS attacks - CVE-2012-4547 (#871159)
 
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jun 08 2012 Petr Pisar <ppisar@redhat.com> - 7.0-9
-- Perl 5.16 rebuild
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Jan 02 2012 Petr Lautrbach <plautrba@redhat.com> 7.0-7
-- fix for perl-5.14 (#768443,#768982,#771031)
-
-* Fri Oct 07 2011 Petr Lautrbach <plautrba@redhat.com> 7.0-6
-- fix CRLF Injection flaw (#740926)
-
-* Mon Oct 03 2011 Petr Lautrbach <plautrba@redhat.com> 7.0-5
+* Fri Oct 07 2011 Petr Lautrbach <plautrba@redhat.com> 7.0-2
 - fix multiple XSS and sql injection flaws (#740926)
 
-* Wed Aug 10 2011 Petr Lautrbach <plautrba@redhat.com> 7.0-4
-- don't use Switch module
-
-* Tue Feb 15 2011 Petr Lautrbach <plautrba@redhat.com> 7.0-3
+* Tue Feb 15 2011 Petr Lautrbach <plautrba@redhat.com> 7.0-1
 - update to upstream 7.0 version
 
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jul 13 2010 Aurelien Bompard <abompard@fedoraproject.org> -  7.0-1
-- version 7.0
-
 * Thu Nov 26 2009 Aurelien Bompard <abompard@fedoraproject.org> -  6.95-1
 - version 6.95 (security fix)
 - drop patch0