diff options
Diffstat (limited to 'network')
| -rw-r--r-- | network/awstats/awstats.SlackBuild | 17 | ||||
| -rw-r--r-- | network/awstats/awstats.info | 6 | ||||
| -rw-r--r-- | network/awstats/patches/awstats_configure.pl.patch | 26 | ||||
| -rw-r--r-- | network/awstats/patches/httpd-awstats.conf.patch | 8 |
4 files changed, 30 insertions, 27 deletions
diff --git a/network/awstats/awstats.SlackBuild b/network/awstats/awstats.SlackBuild index 0b1e06b999..63613e74cd 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-2013, Nishant Limbachia, Hoffman Estates, IL, USA +# Copyright (c) 2009-2014, Nishant Limbachia, Hoffman Estates, IL, USA # <nishant _AT_ mnspace _DOT_ net> # All rights reserved. # @@ -28,8 +28,9 @@ # Modified by the SlackBuilds.org project. PRGNAM="awstats" -VERSION=${VERSION:-7.2} -ARCH=noarch # hardcode ARCH +VERSION=${VERSION:-7.3} +# hardcode ARCH +ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -43,7 +44,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -eu +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -53,10 +54,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Patch httpd_conf file supplied by awstats to correct paths sed s:@DOCROOT@:$DOCROOT: $CWD/patches/httpd-awstats.conf.patch | patch -p0 diff --git a/network/awstats/awstats.info b/network/awstats/awstats.info index 08964f39c7..25e1832f68 100644 --- a/network/awstats/awstats.info +++ b/network/awstats/awstats.info @@ -1,8 +1,8 @@ PRGNAM="awstats" -VERSION="7.2" +VERSION="7.3" HOMEPAGE="http://awstats.sourceforge.net/" -DOWNLOAD="http://prdownloads.sourceforge.net/awstats/awstats-7.2.tar.gz" -MD5SUM="0608ee882bc4a7088e9d588e887846c5" +DOWNLOAD="http://prdownloads.sourceforge.net/awstats/awstats-7.3.tar.gz" +MD5SUM="a76bf324d8836a8ba97f13a3c20ec6bc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk" diff --git a/network/awstats/patches/awstats_configure.pl.patch b/network/awstats/patches/awstats_configure.pl.patch index 3f8995ca5a..67871229ac 100644 --- a/network/awstats/patches/awstats_configure.pl.patch +++ b/network/awstats/patches/awstats_configure.pl.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- tools/awstats_configure.pl.orig 2014-01-29 09:06:10.000000000 -0600 ++++ tools/awstats_configure.pl 2014-03-01 09:09:03.516604388 -0600 +@@ -27,11 +27,11 @@ $AWSTATS_MODEL_CONFIG $AWSTATS_DIRDATA_PATH /; @@ -17,7 +17,7 @@ $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 -@@ -306,7 +306,7 @@ +@@ -305,7 +305,7 @@ print "\n-----> Running OS detected: $OSLib{$OS}\n"; if ($OS eq 'linux') { @@ -26,16 +26,18 @@ $AWSTATS_PATH=~s/tools[\\\/]?$//; $AWSTATS_PATH=~s/[\\\/]$//; if ($AWSTATS_PATH ne '/usr/local/awstats') { -@@ -660,6 +660,12 @@ - print "\n-----> Restart Web server with '$command'\n"; - my $ret=`$command`; - print "$ret"; -+ } if (-f "/etc/slackware-version") { +@@ -653,7 +653,13 @@ + # ---------------------------------- + if ($WebServerChanged) { + if ($OS eq 'linux') { +- if (-f "/etc/debian_version") { ++ if (-f "/etc/slackware-version") { + # We are on Slackware :) + my $command="/etc/rc.d/rc.httpd restart"; + print "\n-----> Restart Web server with '$command'\n"; + my $ret=`$command`; + print "$ret"; - } elsif (-x "/sbin/service") { - # We are not on debian - my $command="/sbin/service httpd restart"; ++ } elsif (-f "/etc/debian_version") { + # We are on debian + my $command="/etc/init.d/apache restart"; + print "\n-----> Restart Web server with '$command'\n"; diff --git a/network/awstats/patches/httpd-awstats.conf.patch b/network/awstats/patches/httpd-awstats.conf.patch index 76a276f1aa..082e5e9eee 100644 --- a/network/awstats/patches/httpd-awstats.conf.patch +++ b/network/awstats/patches/httpd-awstats.conf.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- tools/httpd_conf.orig 2013-11-03 16:35:52.000000000 -0600 ++++ tools/httpd_conf 2014-03-01 08:58:34.894297509 -0600 +@@ -12,18 +12,20 @@ # 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. # @@ -8,12 +8,12 @@ -Alias /awstatscss "/usr/local/awstats/wwwroot/css/" -Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/" -ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/" -- +Alias /awstatsclasses "@DOCROOT@/awstats/wwwroot/classes/" +Alias /awstatscss "@DOCROOT@/awstats/wwwroot/css/" +Alias /awstatsicons "@DOCROOT@/awstats/wwwroot/icon/" +ScriptAlias /awstats/ "@DOCROOT@/awstats/wwwroot/cgi-bin/" + # # This is to permit URL access to scripts/files in AWStats directory. # |