network/awstats: Updated for version 7.2.

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

6 files changed, 36 insertions, 58 deletions

diff --git a/network/awstats/awstats.SlackBuild b/network/awstats/awstats.SlackBuild
index 9403c14d53c5..e3bcc8274c03 100644
--- a/network/awstats/awstats.SlackBuild
+++ b/network/awstats/awstats.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for awstats
 # Home Page http://awstats.sourceforge.net/
 
-# Copyright (c) 2009-2011, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2009-2013, Nishant Limbachia, Hoffman Estates, IL, USA
 # <nishant _AT_ mnspace _DOT_ net>
 # All rights reserved.
 #
@@ -27,10 +27,9 @@
 
 # Modified by the SlackBuilds.org project.
 
-PRGNAM=awstats
-VERSION=${VERSION:-7.0}
-# hardcode ARCH
-ARCH=noarch
+PRGNAM="awstats"
+VERSION=${VERSION:-7.2}
+ARCH=noarch # hardcode ARCH
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +68,9 @@ mkdir -p $PKG/etc/awstats $PKG/etc/httpd/extra
 mkdir -m 0770 -p $PKG/var/lib/awstats
 
 cp -a README.TXT docs/* $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a tools wwwroot $PKG/$DOCROOT/awstats
+cp -a tools/nginx/awstats-fcgi.php \
+  tools/nginx/awstats-nginx.conf $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a tools/*.pl wwwroot $PKG/$DOCROOT/awstats
 install -m 0644 -D wwwroot/cgi-bin/awstats.model.conf $PKG/etc/awstats/awstats.model.conf.new
 cat tools/httpd_conf >> $PKG/etc/httpd/extra/httpd-awstats.conf.new
 
@@ -80,6 +81,9 @@ ln -sf ${DOCROOT}/awstats/wwwroot/cgi-bin/awstats.pl $PKG/usr/bin/awstats.pl
 # Change ownership and perms
 chown -R $AWUSER:$AWGROUP $PKG/$DOCROOT/$PRGNAM $PKG/var/lib/awstats
 
+find $PKG/$(echo ${DOCROOT} | sed 's|/||')/$PRGNAM -type f -perm 0755 -exec chmod 0750 '{}' \;
+find $PKG/$(echo ${DOCROOT} | sed 's|/||')/$PRGNAM -type d -perm 0755 -perm 0700 -exec chmod 0750 {} \;
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/network/awstats/awstats.info b/network/awstats/awstats.info
index d136e2dab806..08964f39c772 100644
--- a/network/awstats/awstats.info
+++ b/network/awstats/awstats.info
@@ -1,8 +1,8 @@
 PRGNAM="awstats"
-VERSION="7.0"
+VERSION="7.2"
 HOMEPAGE="http://awstats.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/awstats/awstats-7.0.tar.gz"
-MD5SUM="3e8e09b9ebe74513bb34290dbcd37b45"
+DOWNLOAD="http://prdownloads.sourceforge.net/awstats/awstats-7.2.tar.gz"
+MD5SUM="0608ee882bc4a7088e9d588e887846c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/network/awstats/doinst.sh b/network/awstats/doinst.sh
index 2c3bb10e67cd..261cfac12ddc 100644
--- a/network/awstats/doinst.sh
+++ b/network/awstats/doinst.sh
@@ -13,7 +13,7 @@ config() {
 
 # Keep same perms:
 if [ -e etc/httpd/extra/httpd-awstats.conf.new ]; then
-  cp -a etc/httpd/extra/httpd-awstats.conf.new etc/httpd/extra/httpd-awstats.conf.new.incoming
+  cp -a etc/httpd/extra/httpd-awstats.conf etc/httpd/extra/httpd-awstats.conf.new.incoming
   cat etc/httpd/extra/httpd-awstats.conf.new > etc/httpd/extra/httpd-awstats.conf.new.incoming
   mv etc/httpd/extra/httpd-awstats.conf.new.incoming etc/httpd/extra/httpd-awstats.conf.new
 fi
diff --git a/network/awstats/patches/awstats_configure.pl.patch b/network/awstats/patches/awstats_configure.pl.patch
index 2f1e51f5c328..3f8995ca5adc 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 8416e8642077..76a276f1aa6b 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>
diff --git a/network/awstats/slack-desc b/network/awstats/slack-desc
index b10bc54c6874..d2690e198f2b 100644
--- a/network/awstats/slack-desc
+++ b/network/awstats/slack-desc
@@ -1,9 +1,10 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
        |-----handy-ruler------------------------------------------------------|
 awstats: awstats (log analyzer)
 awstats:
@@ -15,4 +16,4 @@ awstats: It can analyze log files from all major server tools like Apache
 awstats: log files and a lot of other web, proxy, wap, streaming servers, 
 awstats: mail servers, and some ftp servers.
 awstats:
-awstats:
+awstats: Home Page: http://awstats.sourceforge.net/