From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 8 17:00:25 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C806716A41F for ; Sun, 8 Jan 2006 17:00:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A189043D4C for ; Sun, 8 Jan 2006 17:00:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k08H0N3Z084565 for ; Sun, 8 Jan 2006 17:00:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k08H0NAM084564; Sun, 8 Jan 2006 17:00:23 GMT (envelope-from gnats) Resent-Date: Sun, 8 Jan 2006 17:00:23 GMT Resent-Message-Id: <200601081700.k08H0NAM084564@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, dawnshade Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 427CA16A41F for ; Sun, 8 Jan 2006 16:58:34 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFA5C43D48 for ; Sun, 8 Jan 2006 16:58:33 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k08GwXkb054709 for ; Sun, 8 Jan 2006 16:58:33 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k08GwXQD054708; Sun, 8 Jan 2006 16:58:33 GMT (envelope-from nobody) Message-Id: <200601081658.k08GwXQD054708@www.freebsd.org> Date: Sun, 8 Jan 2006 16:58:33 GMT From: dawnshade To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/91517: [UPDATE] www/awstats to 6.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jan 2006 17:00:25 -0000 >Number: 91517 >Category: ports >Synopsis: [UPDATE] www/awstats to 6.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jan 08 17:00:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: dawnshade >Release: 5.4-RELEASE >Organization: - >Environment: FreeBSD serv.*.ru 5.4-RELEASE-p3 FreeBSD 5.4-RELEASE-p3 #0: Mon Jul 4 19:06:03 MSD 2005 root@serv.*.ru:/usr/obj/usr/src/sys/9 i386 >Description: Update port www/awstats from 6.4 to 6.5. Note that on sf.net 6.5 only beta, but on author site (http://awstats.sourceforge.net/) it's marked as stable. Also take a look that patch 'files/patch-awstats.pl' no more needed - source .pl already contain this fix. >How-To-Repeat: - >Fix: diff -ruN awstats awstats.orig diff -ruN awstats/Makefile awstats.orig/Makefile --- awstats/Makefile Sun Jan 8 19:45:02 2006 +++ awstats.orig/Makefile Sun Jan 8 19:22:26 2006 @@ -6,12 +6,12 @@ # PORTNAME= awstats -PORTVERSION= 6.5 -PORTREVISION= 0 +PORTVERSION= 6.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -EXTRACT_SUFX= .tar.gz +EXTRACT_SUFX= .tgz MAINTAINER= webmaster@lightningfire.net COMMENT= Free real-time logfile analyzer to get advanced web statistics @@ -65,7 +65,7 @@ ${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools - ${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.6.wbm ${PREFIX}/www/awstats/tools/webmin + ${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.5.wbm ${PREFIX}/www/awstats/tools/webmin ${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/awstats/cgi-bin ${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin diff -ruN awstats/distinfo awstats.orig/distinfo --- awstats/distinfo Sun Jan 8 19:29:12 2006 +++ awstats.orig/distinfo Sun Jan 8 19:22:26 2006 @@ -1,2 +1,2 @@ -MD5 (awstats-6.5.tar.gz) = aef00b2ff5c5413bd2a868299cabd69a -SIZE (awstats-6.5.tar.gz) = 1051780 +MD5 (awstats-6.4.tgz) = 056e6fb0c7351b17fe5bbbe0aa1297b1 +SIZE (awstats-6.4.tgz) = 918435 diff -ruN awstats/files/patch-awstats.model.conf awstats.orig/files/patch-awstats.model.conf --- awstats/files/patch-awstats.model.conf Sun Jan 8 19:35:26 2006 +++ awstats.orig/files/patch-awstats.model.conf Sun Jan 8 19:22:26 2006 @@ -1,6 +1,6 @@ --- wwwroot/cgi-bin/awstats.model.conf.orig Sat Dec 18 14:33:27 2004 +++ wwwroot/cgi-bin/awstats.model.conf Sat Dec 18 14:34:38 2004 -@@ -219,7 +219,7 @@ +@@ -208,7 +208,7 @@ # Example: "../icon" # Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon") # diff -ruN awstats/files/patch-awstats.pl awstats.orig/files/patch-awstats.pl --- awstats/files/patch-awstats.pl Thu Jan 1 03:00:00 1970 +++ awstats.orig/files/patch-awstats.pl Sun Jan 8 19:22:26 2006 @@ -0,0 +1,297 @@ +--- wwwroot/cgi-bin/awstats.pl.orig Thu Feb 24 23:02:23 2005 ++++ wwwroot/cgi-bin/awstats.pl Thu Aug 18 08:26:22 2005 +@@ -625,8 +625,8 @@ + EOF + # Call to plugins' function AddHTMLStyles + foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLStyles'}}) { +- my $function="AddHTMLStyles_$pluginname()"; +- eval("$function"); ++ my $function="AddHTMLStyles_$pluginname"; ++ &$function(); + } + + if ($BuildReportFormat eq 'xhtml' || $BuildReportFormat eq 'xml') { print ($ENV{'HTTP_USER_AGENT'}=~/Firebird/i?"//-->\n":"]]>\n"); } +@@ -660,8 +660,8 @@ + + # Call to plugins' function AddHTMLBodyFooter + foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyFooter'}}) { +- my $function="AddHTMLBodyFooter_$pluginname()"; +- eval("$function"); ++ my $function="AddHTMLBodyFooter_$pluginname"; ++ &$function(); + } + + if ($FrameName ne 'index' && $FrameName ne 'mainleft') { +@@ -3254,15 +3254,15 @@ + # The plugin for this section was loaded + $found=1; + my $issectiontoload=$SectionsToLoad{"plugin_$pluginname"}; +- my $function="SectionReadHistory_$pluginname(\$issectiontoload,\$readxml,\$xmleb,\$countlines)"; +- eval("$function"); ++ my $function="SectionReadHistory_$pluginname"; ++ &$function($issectiontoload,$readxml,$xmleb,$countlines); + delete $SectionsToLoad{"plugin_$pluginname"}; + if ($SectionsToSave{"plugin_$pluginname"}) { + Save_History("plugin_$pluginname",$year,$month); + delete $SectionsToSave{"plugin_$pluginname"}; + if ($withpurge) { +- my $function="SectionInitHashArray_$pluginname()"; +- eval("$function"); ++ my $function="SectionInitHashArray_$pluginname"; ++ &$function(); + } + } + last; +@@ -3977,8 +3977,8 @@ + if ($AtLeastOneSectionPlugin && $sectiontosave =~ /^plugin_(\w+)$/i) { + my $pluginname=$1; + if ($PluginsLoaded{'SectionInitHashArray'}{"$pluginname"}) { +- my $function="SectionWriteHistory_$pluginname(\$xml,\$xmlbb,\$xmlbs,\$xmlbe,\$xmlrb,\$xmlrs,\$xmlre,\$xmleb,\$xmlee)"; +- eval("$function"); ++ my $function="SectionWriteHistory_$pluginname"; ++ &$function($xml,$xmlbb,$xmlbs,$xmlbe,$xmlrb,$xmlrs,$xmlre,$xmleb,$xmlee); + } + } + +@@ -4203,8 +4203,8 @@ + %{'_section_' . $ix . '_l'} = %{'_section_' . $ix . '_p'} = (); + } + foreach my $pluginname (keys %{$PluginsLoaded{'SectionInitHashArray'}}) { +- my $function="SectionInitHashArray_$pluginname()"; +- eval("$function"); ++ my $function="SectionInitHashArray_$pluginname"; ++ &$function(); + } + } + +@@ -4788,8 +4788,8 @@ + my $user=shift; + # Call to plugins' function ShowInfoUser + foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoUser'}}) { +- my $function="ShowInfoUser_$pluginname('$user')"; +- eval("$function"); ++ my $function="ShowInfoUser_$pluginname"; ++ &$function($user); + } + } + +@@ -4804,8 +4804,8 @@ + my $user=shift; + # Call to plugins' function ShowInfoCluster + foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoCluster'}}) { +- my $function="ShowInfoCluster_$pluginname('$user')"; +- eval("$function"); ++ my $function="ShowInfoCluster_$pluginname"; ++ &$function($user); + } + } + +@@ -4820,8 +4820,8 @@ + my $host=shift; + # Call to plugins' function ShowInfoHost + foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoHost'}}) { +- my $function="ShowInfoHost_$pluginname('$host')"; +- eval("$function"); ++ my $function="ShowInfoHost_$pluginname"; ++ &$function($host); + } + } + +@@ -4838,8 +4838,8 @@ + + # Call to plugins' function ShowInfoURL + foreach my $pluginname (keys %{$PluginsLoaded{'ShowInfoURL'}}) { +- my $function="ShowInfoURL_$pluginname('$url')"; +- eval("$function"); ++ my $function="ShowInfoURL_$pluginname"; ++ &$function($url); + } + + if (length($nompage)>$MaxLengthOfShownURL) { $nompage=substr($nompage,0,$MaxLengthOfShownURL)."..."; } +@@ -5154,8 +5154,8 @@ + my $linetitle=0; + # Call to plugins' function AddHTMLMenuLink + foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuLink'}}) { +- my $function="AddHTMLMenuLink_$pluginname('$categ',\$menu,\$menulink,\$menutext)"; +- eval("$function"); ++ my $function="AddHTMLMenuLink_$pluginname"; ++ &$function($categ,$menu,$menulink,$menutext); + } + foreach my $key (%$menu) { if ($menu->{$key}>0) { $linetitle++; last; } } + if (! $linetitle) { return; } +@@ -5723,8 +5723,8 @@ + + # AWStats output is replaced by a plugin output + if ($PluginMode) { +- my $function="BuildFullHTMLOutput_$PluginMode()"; +- eval("$function"); ++ my $function="BuildFullHTMLOutput_$PluginMode"; ++ &$function(); + if ($? || $@) { error("$@"); } + &html_end(0); + exit 0; +@@ -6623,8 +6623,8 @@ + elsif ($PluginsLoaded{'GetCountryCodeByAddr'}{'geoip'}) { $Domain=GetCountryCodeByAddr_geoip($HostResolved); } + if ($AtLeastOneSectionPlugin) { + foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}}) { +- my $function="SectionProcessIp_$pluginname(\$HostResolved)"; +- eval("$function"); ++ my $function="SectionProcessIp_$pluginname"; ++ &$function($HostResolved); + } + } + } +@@ -6638,8 +6638,8 @@ + elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; } + if ($AtLeastOneSectionPlugin) { + foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}}) { +- my $function="SectionProcessIp_$pluginname(\$Host)"; +- eval("$function"); ++ my $function="SectionProcessIp_$pluginname"; ++ &$function($Host); + } + } + } +@@ -6649,8 +6649,8 @@ + elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; } + if ($AtLeastOneSectionPlugin) { + foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessHostname'}}) { +- my $function="SectionProcessHostname_$pluginname(\$HostResolved)"; +- eval("$function"); ++ my $function="SectionProcessHostname_$pluginname"; ++ &$function($HostResolved); + } + } + } +@@ -7319,8 +7319,8 @@ + + # Call to plugins' function AddHTMLBodyHeader + foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyHeader'}}) { +- my $function="AddHTMLBodyHeader_$pluginname()"; +- eval("$function"); ++ my $function="AddHTMLBodyHeader_$pluginname"; ++ &$function(); + } + + my $WIDTHMENU1=($FrameName eq 'mainleft'?$FRAMEWIDTH:150); +@@ -7462,8 +7462,8 @@ + + # Call to plugins' function AddHTMLMenuHeader + foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuHeader'}}) { +- my $function="AddHTMLMenuHeader_$pluginname()"; +- eval("$function"); ++ my $function="AddHTMLMenuHeader_$pluginname"; ++ &$function(); + } + + # MENU +@@ -7572,8 +7572,8 @@ + + # Call to plugins' function AddHTMLMenuFooter + foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuFooter'}}) { +- my $function="AddHTMLMenuFooter_$pluginname()"; +- eval("$function"); ++ my $function="AddHTMLMenuFooter_$pluginname"; ++ &$function(); + } + + # Exit if left frame +@@ -7666,8 +7666,8 @@ + + # Call to plugins' function AddHTMLContentHeader + foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLContentHeader'}}) { +- my $function="AddHTMLContentHeader_$pluginname()"; +- eval("$function"); ++ my $function="AddHTMLContentHeader_$pluginname"; ++ &$function(); + } + + # Output particular part +@@ -7946,8 +7946,8 @@ + if ($HTMLOutput{'urldetail'} || $HTMLOutput{'urlentry'} || $HTMLOutput{'urlexit'}) { + # Call to plugins' function ShowPagesFilter + foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesFilter'}}) { +- my $function="ShowPagesFilter_$pluginname()"; +- eval("$function"); ++ my $function="ShowPagesFilter_$pluginname"; ++ &$function(); + } + print "$Center 
\n"; + # Show filter form +@@ -7977,8 +7977,8 @@ + if ($ShowPagesStats =~ /X/i) { print "$Message[116]"; } + # Call to plugins' function ShowPagesAddField + foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { +- my $function="ShowPagesAddField_$pluginname('title')"; +- eval("$function"); ++ my $function="ShowPagesAddField_$pluginname()"; ++ &$function('title'); + } + print " \n"; + $total_p=$total_k=$total_e=$total_x=0; +@@ -8010,8 +8010,8 @@ + if ($ShowPagesStats =~ /X/i) { print "".($_url_x{$key}?$_url_x{$key}:" ").""; } + # Call to plugins' function ShowPagesAddField + foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { +- my $function="ShowPagesAddField_$pluginname('$key')"; +- eval("$function"); ++ my $function="ShowPagesAddField_$pluginname"; ++ &$function($key); + } + print ""; + # alt and title are not provided to reduce page size +@@ -8039,8 +8039,8 @@ + if ($ShowPagesStats =~ /X/i) { print "".($rest_x?$rest_x:" ").""; } + # Call to plugins' function ShowPagesAddField + foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { +- my $function="ShowPagesAddField_$pluginname('')"; +- eval("$function"); ++ my $function="ShowPagesAddField_$pluginname"; ++ &$function(''); + } + print " \n"; + } +@@ -8485,8 +8485,8 @@ + if ($htmloutput =~ /^plugin_(\w+)$/) { + my $pluginname=$1; + print "$Center 
"; +- my $function="AddHTMLGraph_$pluginname()"; +- eval("$function"); ++ my $function="AddHTMLGraph_$pluginname"; ++ &$function(); + &html_end(1); + } + } +@@ -9592,8 +9592,8 @@ + if ($ShowPagesStats =~ /X/i) { print "$Message[116]"; } + # Call to plugins' function ShowPagesAddField + foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { +- my $function="ShowPagesAddField_$pluginname('title')"; +- eval("$function"); ++ my $function="ShowPagesAddField_$pluginname"; ++ &$function('title'); + } + print " \n"; + $total_p=$total_e=$total_x=$total_k=0; +@@ -9624,8 +9624,8 @@ + if ($ShowPagesStats =~ /X/i) { print "".($_url_x{$key}?$_url_x{$key}:" ").""; } + # Call to plugins' function ShowPagesAddField + foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { +- my $function="ShowPagesAddField_$pluginname('$key')"; +- eval("$function"); ++ my $function="ShowPagesAddField_$pluginname"; ++ &$function($key); + } + print ""; + if ($ShowPagesStats =~ /P/i && $LogType ne 'F') { print "
"; } +@@ -9653,8 +9653,8 @@ + if ($ShowPagesStats =~ /X/i) { print "".($rest_x?$rest_x:" ").""; } + # Call to plugins' function ShowPagesAddField + foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { +- my $function="ShowPagesAddField_$pluginname('')"; +- eval("$function"); ++ my $function="ShowPagesAddField_$pluginname"; ++ &$function(''); + } + print " \n"; + } >Release-Note: >Audit-Trail: >Unformatted: