[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/7.0_dfsg-3-7-gfa49e46

[Sergey B Kirpichev]

The following commit has been merged in the master branch:
commit fa49e4674d89483909c4ff33be624a37a5a75f08
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Fri Dec 2 18:18:08 2011 +0400

    Apply some compatibility fixes for perl 5.14: introduce 1018_perl5-14.patch (Closes: #650492, thanks to Atsuhito Kohda)

diff --git a/debian/patches/1018_perl5-14.patch b/debian/patches/1018_perl5-14.patch
new file mode 100644
index 0000000..75cce91
--- /dev/null
+++ b/debian/patches/1018_perl5-14.patch
@@ -0,0 +1,28 @@
+Description: Compatibility patch for perl5.14
+Origin: http://sourceforge.net/tracker/index.php?func=detail&aid=3311848&group_id=13764&atid=113764
+Debian-Bug: http://bugs.debian.org/650492
+
+---
+ wwwroot/cgi-bin/awstats.pl |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/wwwroot/cgi-bin/awstats.pl
++++ b/wwwroot/cgi-bin/awstats.pl
+@@ -1338,7 +1338,7 @@
+ sub OptimizeArray {
+ 	my $array = shift;
+ 	my @arrayunreg = map {
+-		if (/\(\?[-\w]*:(.*)\)/) { $1 }
++		if (/\(\?[-^\w]*:(.*)\)/) { $1 }
+ 	} @$array;
+ 	my $notcasesensitive = shift;
+ 	my $searchlist       = 0;
+@@ -7793,7 +7793,7 @@
+ # Return:		standardregex
+ #------------------------------------------------------------------------------
+ sub UnCompileRegex {
+-	shift =~ /\(\?[-\w]*:(.*)\)/;
++	shift =~ /\(\?[-^\w]*:(.*)\)/;
+ 	return $1;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b41a0c2..bd0723c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,5 +10,6 @@
 1015_awstats-tt-bg.txt.patch
 1016_downloads_list_page.patch
 1017_fix_html_output_markup.patch
+1018_perl5-14.patch
 2001_awstatsprog_path.patch
 2002_nboflastupdatelookuptosave.patch

-- 
awstats Debian packaging