network/awstats: Updated for version 7.2.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

2 files changed, 15 insertions, 42 deletions

diff --git a/network/awstats/patches/awstats_configure.pl.patch b/network/awstats/patches/awstats_configure.pl.patch
index 2f1e51f5c3..3f8995ca5a 100644
--- a/network/awstats/patches/awstats_configure.pl.patch
+++ b/network/awstats/patches/awstats_configure.pl.patch
@@ -1,15 +1,6 @@
-By Nishant Limbachia <nishant@mnspace.net>
-
-Patch awstats_configure.pl file in case somebody runs it.
-Following things are patched:
-1. Use correct paths 
-2. Stop awstats_configure.pl to get the current working directory
-   on first run (use standard path instead)
-3. Added support to restart httpd server for Slackware
-
---- tools/awstats_configure.pl.orig	2009-01-27 13:23:05.000000000 -0600
-+++ tools/awstats_configure.pl	2009-01-27 13:36:46.000000000 -0600
-@@ -28,16 +28,14 @@
+--- tools/awstats_configure.pl.orig	2013-11-06 23:39:01.487947740 -0600
++++ tools/awstats_configure.pl	2013-11-07 07:17:47.975586091 -0600
+@@ -28,11 +28,11 @@
  $AWSTATS_MODEL_CONFIG
  $AWSTATS_DIRDATA_PATH
  /;
@@ -26,12 +17,7 @@ Following things are patched:
  $AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf';		# Used only when configure ran on linux
  $AWSTATS_DIRDATA_PATH='/var/lib/awstats';						# Used only when configure ran on linux
  
--
--
- #-------------------------------------------------------
- # Defines
- #-------------------------------------------------------
-@@ -306,7 +304,7 @@
+@@ -306,7 +306,7 @@
  print "\n-----> Running OS detected: $OSLib{$OS}\n";
  
  if ($OS eq 'linux') {
@@ -40,7 +26,7 @@ Following things are patched:
  	$AWSTATS_PATH=~s/tools[\\\/]?$//;
  	$AWSTATS_PATH=~s/[\\\/]$//;
  	if ($AWSTATS_PATH ne '/usr/local/awstats') {
-@@ -662,6 +660,12 @@
+@@ -660,6 +660,12 @@
      		print "\n-----> Restart Web server with '$command'\n";
  	 	    my $ret=`$command`;
  	 	    print "$ret";
diff --git a/network/awstats/patches/httpd-awstats.conf.patch b/network/awstats/patches/httpd-awstats.conf.patch
index 8416e86420..76a276f1aa 100644
--- a/network/awstats/patches/httpd-awstats.conf.patch
+++ b/network/awstats/patches/httpd-awstats.conf.patch
@@ -1,23 +1,8 @@
---- tools/httpd_conf.orig	2010-10-23 19:51:54.680793559 -0500
-+++ tools/httpd_conf	2010-10-23 20:05:01.614053640 -0500
-@@ -1,29 +1,23 @@
--#
--# Content of this file, with correct values, can be automatically added to
--# your Apache server by using the AWStats configure.pl tool.
--#
--
--
--# If using Windows and Perl ActiveStat, this is to enable Perl script as CGI.
--#ScriptInterpreterSource registry
--
-+# Modified by Nishant Limbachia <nishant _AT_ mnspace _DOT_ net>
-+# Modified on Oct 23, 2010
-+# 1. Fixup paths for SlackBuilds.org
-+# 2. Tighten default access mode
- 
- #
+--- tools/httpd_conf.orig	2013-11-06 23:39:17.353035049 -0600
++++ tools/httpd_conf	2013-11-07 07:34:04.009417358 -0600
+@@ -12,18 +12,19 @@
  # 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/local/awstats/" must reflect your AWStats install path.
  #
 -Alias /awstatsclasses "/usr/local/awstats/wwwroot/classes/"
 -Alias /awstatscss "/usr/local/awstats/wwwroot/css/"
@@ -33,12 +18,14 @@
  # This is to permit URL access to scripts/files in AWStats directory.
  #
 -<Directory "/usr/local/awstats/wwwroot">
+-    Options None
++# Allowing access only via local machine may be too restrictive so you can 
++# set Require ip directive below to allow access to AWStats
++# via your local LAN.  
 +<Directory "@DOCROOT@/awstats/wwwroot">
-     Options None
++    Options FollowSymLinks ExecCGI
      AllowOverride None
 -    Order allow,deny
 -    Allow from all
-+    Order deny,allow
-+    Deny from all
-+    Allow from localhost
++    Require ip 127.0.0.1
  </Directory>