ports/158837: [PATCH] www/awstats: fix breakage under perl5.14

Jase Thew freebsd at beardz.net
Tue Jul 12 15:10:11 UTC 2011


>Number:         158837
>Category:       ports
>Synopsis:       [PATCH] www/awstats: fix breakage under perl5.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 12 15:10:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jase Thew
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD jail-ports.localdomain 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Apr  2 19:17:15 BST
>Description:
Perl 5.14 changes format of compiled regexps. This patch amends the pattern awstats uses to parse
compiled regexps to cater for the new 5.14 format.

The patch was taken from the upstream bug tracker:
http://sourceforge.net/tracker/?func=detail&aid=3311848&group_id=13764&atid=113764

I've smoke tested this and it resolves the issue.

Port maintainer (samm at os2.kiev.ua) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- awstats-7.0_2,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/awstats.orig/Makefile /usr/ports/www/awstats/Makefile
--- /usr/ports/www/awstats.orig/Makefile	2011-02-06 04:11:17.000000000 +0000
+++ /usr/ports/www/awstats/Makefile	2011-07-12 15:52:32.262443624 +0100
@@ -7,7 +7,7 @@
 
 PORTNAME=	awstats
 PORTVERSION=	7.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/AWStats/${PORTVERSION}
diff -ruN --exclude=CVS /usr/ports/www/awstats.orig/files/patch-wwwroot-cgi-bin-awstats.pl /usr/ports/www/awstats/files/patch-wwwroot-cgi-bin-awstats.pl
--- /usr/ports/www/awstats.orig/files/patch-wwwroot-cgi-bin-awstats.pl	2009-10-30 09:51:20.000000000 +0000
+++ /usr/ports/www/awstats/files/patch-wwwroot-cgi-bin-awstats.pl	2011-07-12 15:56:34.502216155 +0100
@@ -1,6 +1,17 @@
---- wwwroot/cgi-bin/awstats.pl.orig	2009-10-10 08:36:38.000000000 -0400
-+++ wwwroot/cgi-bin/awstats.pl	2009-10-28 21:33:22.000000000 -0400
-@@ -3040,7 +3040,7 @@
+--- wwwroot/cgi-bin/awstats.pl.orig	2011-07-06 08:11:37.000000000 +0100
++++ wwwroot/cgi-bin/awstats.pl	2011-07-06 08:16:32.000000000 +0100
+@@ -1353,9 +1353,7 @@
+ #------------------------------------------------------------------------------
+ sub OptimizeArray {
+ 	my $array = shift;
+-	my @arrayunreg = map {
+-		if (/\(\?[-\w]*:(.*)\)/) { $1 }
+-	} @$array;
++	my @arrayunreg = map { UnCompileRegex($_) } @$array;
+ 	my $notcasesensitive = shift;
+ 	my $searchlist       = 0;
+ 	if ($Debug) {
+@@ -3049,7 +3047,7 @@
  # Debian package :                    		"/usr/share/awstats/plugins"
  	my @PossiblePluginsDir = (
  		"$DIR/plugins",
@@ -9,3 +20,12 @@
  		"/usr/share/awstats/plugins"
  	);
  	my %DirAddedInINC = ();
+@@ -7809,7 +7807,7 @@
+ # Return:		standardregex
+ #------------------------------------------------------------------------------
+ sub UnCompileRegex {
+-	shift =~ /\(\?[-\w]*:(.*)\)/;
++	shift =~ /\(\?[-^\w]*:(.*)\)/;
+ 	return $1;
+ }
+ 
--- awstats-7.0_2,1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list