diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2016-02-17 16:56:44 -0600 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-02-20 13:56:13 +0700 |
| commit | a7d1cd4d86757b21c13586dbc25feb858ce30a46 (patch) | |
| tree | 269d7fefbd12f05acd582fe77cf7c9a1e0ef62dc | |
| parent | 51529df47416681bd2356853b4b75108a2b27fbb (diff) | |
network/awstats: Fixup for perl-5.22
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | network/awstats/awstats.SlackBuild | 3 | ||||
| -rw-r--r-- | network/awstats/patches/fixup-warnings-in-perl-522.patch | 22 |
2 files changed, 25 insertions, 0 deletions
diff --git a/network/awstats/awstats.SlackBuild b/network/awstats/awstats.SlackBuild index 0d11cd6e0c619..c09e88d0ed639 100644 --- a/network/awstats/awstats.SlackBuild +++ b/network/awstats/awstats.SlackBuild @@ -59,6 +59,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# https://sourceforge.net/p/awstats/bugs/943/ +patch -p1 < $CWD/patches/fixup-warnings-in-perl-522.patch + # Patch httpd_conf file supplied by awstats to correct paths sed s:@DOCROOT@:$DOCROOT: $CWD/patches/httpd-awstats.conf.patch | patch -p0 # Patch awstats_configure.pl file -- see patch header for details diff --git a/network/awstats/patches/fixup-warnings-in-perl-522.patch b/network/awstats/patches/fixup-warnings-in-perl-522.patch new file mode 100644 index 0000000000000..6adaba998de0b --- /dev/null +++ b/network/awstats/patches/fixup-warnings-in-perl-522.patch @@ -0,0 +1,22 @@ +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 |