diff options
Diffstat (limited to 'network/awstats/patches')
| -rw-r--r-- | network/awstats/patches/awstats.pl.patch | 21 | ||||
| -rw-r--r-- | network/awstats/patches/awstats_configure.pl.patch | 15 | ||||
| -rw-r--r-- | network/awstats/patches/fixup-warnings-in-perl-522.patch | 22 | ||||
| -rw-r--r-- | network/awstats/patches/httpd-awstats.conf.patch | 10 |
4 files changed, 35 insertions, 33 deletions
diff --git a/network/awstats/patches/awstats.pl.patch b/network/awstats/patches/awstats.pl.patch new file mode 100644 index 0000000000..a749b988e2 --- /dev/null +++ b/network/awstats/patches/awstats.pl.patch @@ -0,0 +1,21 @@ +--- wwwroot/cgi-bin/awstats.pl.orig 2016-07-21 17:42:26.196363651 +0700 ++++ wwwroot/cgi-bin/awstats.pl 2016-07-21 17:44:55.882578219 +0700 +@@ -2223,7 +2223,7 @@ + # Check lib files in common possible directories : + # Windows and standard package: "$DIR/lib" (lib in same dir than awstats.pl) + # Debian package: "/usr/share/awstats/lib" +- my @PossibleLibDir = ( "$DIR/lib", "/usr/share/awstats/lib" ); ++ my @PossibleLibDir = ( "$DIR/lib", "/usr/share/awstats/lib", "@DOCROOT@/awstats/wwwroot/cgi-bin/lib" ); + my %FilePath = (); + my %DirAddedInINC = (); + my @FileListToLoad = (); +@@ -3114,7 +3114,8 @@ + my @PossiblePluginsDir = ( + "$DIR/plugins", + "/usr/local/awstats/wwwroot/cgi-bin/plugins", +- "/usr/share/awstats/plugins" ++ "/usr/share/awstats/plugins", ++ "@DOCROOT@/awstats/wwwroot/cgi-bin/plugins" + ); + my %DirAddedInINC = (); + diff --git a/network/awstats/patches/awstats_configure.pl.patch b/network/awstats/patches/awstats_configure.pl.patch index 67871229ac..20c4e127f7 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 2014-01-29 09:06:10.000000000 -0600 -+++ tools/awstats_configure.pl 2014-03-01 09:09:03.516604388 -0600 -@@ -27,11 +27,11 @@ +--- tools/awstats_configure.pl.orig 2016-05-13 15:17:18.396302299 -0500 ++++ tools/awstats_configure.pl 2016-05-13 16:09:13.880063387 -0500 +@@ -27,13 +27,13 @@ $AWSTATS_MODEL_CONFIG $AWSTATS_DIRDATA_PATH /; @@ -15,7 +15,10 @@ +$AWSTATS_CLASSES_PATH='$AWSTATS_PATH/wwwroot/classes'; +$AWSTATS_CGI_PATH='$AWSTATS_PATH/wwwroot/cgi-bin'; $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 +-$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux ++$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux + + @@ -305,7 +305,7 @@ print "\n-----> Running OS detected: $OSLib{$OS}\n"; @@ -31,13 +34,13 @@ if ($WebServerChanged) { if ($OS eq 'linux') { - if (-f "/etc/debian_version") { -+ if (-f "/etc/slackware-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 (-f "/etc/debian_version") { ++ } 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/fixup-warnings-in-perl-522.patch b/network/awstats/patches/fixup-warnings-in-perl-522.patch deleted file mode 100644 index 6adaba998d..0000000000 --- a/network/awstats/patches/fixup-warnings-in-perl-522.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur awstats-7.4.orig/wwwroot/cgi-bin/awstats.pl awstats-7.4/wwwroot/cgi-bin/awstats.pl ---- awstats-7.4.orig/wwwroot/cgi-bin/awstats.pl 2015-07-14 07:52:31.000000000 -0500 -+++ awstats-7.4/wwwroot/cgi-bin/awstats.pl 2016-02-17 16:51:41.341139338 -0600 -@@ -9040,12 +9040,12 @@ - $LogFormatString =~ s/%>s/%code/g; - $LogFormatString =~ s/%b(\s)/%bytesd$1/g; - $LogFormatString =~ s/%b$/%bytesd/g; -- $LogFormatString =~ s/\"%{Referer}i\"/%refererquot/g; -- $LogFormatString =~ s/\"%{User-Agent}i\"/%uaquot/g; -- $LogFormatString =~ s/%{mod_gzip_input_size}n/%gzipin/g; -- $LogFormatString =~ s/%{mod_gzip_output_size}n/%gzipout/g; -- $LogFormatString =~ s/%{mod_gzip_compression_ratio}n/%gzipratio/g; -- $LogFormatString =~ s/\(%{ratio}n\)/%deflateratio/g; -+ $LogFormatString =~ s/\"%\{Referer}i\"/%refererquot/g; -+ $LogFormatString =~ s/\"%\{User-Agent}i\"/%uaquot/g; -+ $LogFormatString =~ s/%\{mod_gzip_input_size}n/%gzipin/g; -+ $LogFormatString =~ s/%\{mod_gzip_output_size}n/%gzipout/g; -+ $LogFormatString =~ s/%\{mod_gzip_compression_ratio}n/%gzipratio/g; -+ $LogFormatString =~ s/\(%\{ratio}n\)/%deflateratio/g; - - # Replacement for a IIS and ISA format string - $LogFormatString =~ s/cs-uri-query/%query/g; # Must be before cs-uri diff --git a/network/awstats/patches/httpd-awstats.conf.patch b/network/awstats/patches/httpd-awstats.conf.patch index 082e5e9eee..e555bda027 100644 --- a/network/awstats/patches/httpd-awstats.conf.patch +++ b/network/awstats/patches/httpd-awstats.conf.patch @@ -1,5 +1,5 @@ ---- tools/httpd_conf.orig 2013-11-03 16:35:52.000000000 -0600 -+++ tools/httpd_conf 2014-03-01 08:58:34.894297509 -0600 +--- tools/httpd_conf.orig 2016-07-21 17:38:42.889026388 +0700 ++++ tools/httpd_conf 2016-07-21 17:38:44.177011033 +0700 @@ -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. @@ -19,13 +19,13 @@ # -<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 FollowSymLinks ExecCGI AllowOverride None - Order allow,deny - Allow from all ++ AddHandler cgi-script pl ++ DirectoryIndex awstats.pl ++ Require all granted + Require ip 127.0.0.1 </Directory> |