From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 13 12:50:24 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 CD73016A420 for ; Fri, 13 Jan 2006 12:50:24 +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 AFA3343D76 for ; Fri, 13 Jan 2006 12:50:07 +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 k0DCo6FU081744 for ; Fri, 13 Jan 2006 12:50:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0DCo6eC081743; Fri, 13 Jan 2006 12:50:06 GMT (envelope-from gnats) Resent-Date: Fri, 13 Jan 2006 12:50:06 GMT Resent-Message-Id: <200601131250.k0DCo6eC081743@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, Sunpoet Po-Chuan Hsieh Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 324BC16A41F for ; Fri, 13 Jan 2006 12:45:02 +0000 (GMT) (envelope-from sunpoet@sunpoet.net) Received: from sunpoet.net (sunpoet.net [203.204.205.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3487243D55 for ; Fri, 13 Jan 2006 12:45:01 +0000 (GMT) (envelope-from sunpoet@sunpoet.net) Received: by sunpoet.net (Postfix, from userid 1000) id 0BA9C1701D; Fri, 13 Jan 2006 20:45:00 +0800 (CST) Message-Id: <20060113124500.0BA9C1701D@sunpoet.net> Date: Fri, 13 Jan 2006 20:45:00 +0800 (CST) From: Sunpoet Po-Chuan Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/91751: [UPDATE] www/awstats from 6.4 to 6.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Sunpoet Po-Chuan Hsieh List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2006 12:50:25 -0000 >Number: 91751 >Category: ports >Synopsis: [UPDATE] www/awstats from 6.4 to 6.5 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jan 13 12:50:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 6.0-STABLE i386 >Organization: SUNPOET.net >Environment: System: FreeBSD IRIS.sunpoet.net 6.0-STABLE FreeBSD 6.0-STABLE #5: Sat Dec 31 08:36:20 CST 2005 sunpoet@IRIS.sunpoet.net:/usr/obj/usr/src/sys/sunpoet i386 >Description: Update awstats from 6.4 to 6.5, including: * Add SHA256 checksum * Add installion of plugins (clusterinfo.pm & geoip_*.pm) >How-To-Repeat: >Fix: Apply the following patch. diff -ruN awstats.orig/Makefile awstats/Makefile --- awstats.orig/Makefile Thu Nov 17 19:58:12 2005 +++ awstats/Makefile Fri Jan 13 20:25:40 2006 @@ -6,12 +6,12 @@ # PORTNAME= awstats -PORTVERSION= 6.4 -PORTREVISION= 1 +PORTVERSION= 6.5 +PORTREVISION= 0 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -EXTRACT_SUFX= .tgz +EXTRACT_SUFX= .tar.gz 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.5.wbm ${PREFIX}/www/awstats/tools/webmin + ${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.6.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 @@ -74,8 +74,13 @@ ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_w/*.txt ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_w ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/*.txt ${PREFIX}/www/awstats/cgi-bin/lang ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lib/* ${PREFIX}/www/awstats/cgi-bin/lib + ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/clusterinfo.pm ${PREFIX}/www/awstats/cgi-bin/plugins ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/decodeutfkeys.pm ${PREFIX}/www/awstats/cgi-bin/plugins ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/geoip.pm ${PREFIX}/www/awstats/cgi-bin/plugins + ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm ${PREFIX}/www/awstats/cgi-bin/plugins + ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm ${PREFIX}/www/awstats/cgi-bin/plugins + ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm ${PREFIX}/www/awstats/cgi-bin/plugins + ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm ${PREFIX}/www/awstats/cgi-bin/plugins ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/geoipfree.pm ${PREFIX}/www/awstats/cgi-bin/plugins ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/graphapplet.pm ${PREFIX}/www/awstats/cgi-bin/plugins ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/hashfiles.pm ${PREFIX}/www/awstats/cgi-bin/plugins diff -ruN awstats.orig/distinfo awstats/distinfo --- awstats.orig/distinfo Sat Mar 12 17:47:08 2005 +++ awstats/distinfo Fri Jan 13 19:41:33 2006 @@ -1,2 +1,3 @@ -MD5 (awstats-6.4.tgz) = 056e6fb0c7351b17fe5bbbe0aa1297b1 -SIZE (awstats-6.4.tgz) = 918435 +MD5 (awstats-6.5.tar.gz) = aef00b2ff5c5413bd2a868299cabd69a +SHA256 (awstats-6.5.tar.gz) = 08a63a30c5be698a164c957b3d68e8bacafc0c86ab72458382584d9f8b45bd2c +SIZE (awstats-6.5.tar.gz) = 1051780 diff -ruN awstats.orig/files/patch-awstats.model.conf awstats/files/patch-awstats.model.conf --- awstats.orig/files/patch-awstats.model.conf Tue Mar 8 16:40:04 2005 +++ awstats/files/patch-awstats.model.conf Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- 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 -@@ -208,7 +208,7 @@ - # Example: "../icon" - # Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon") - # --DirIcons="/icon" -+DirIcons="/awstatsicons" - - - # When this parameter is set to 1, AWStats add a button on report page to diff -ruN awstats.orig/files/patch-awstats.pl awstats/files/patch-awstats.pl --- awstats.orig/files/patch-awstats.pl Wed Aug 24 04:20:34 2005 +++ awstats/files/patch-awstats.pl Thu Jan 1 08:00:00 1970 @@ -1,297 +0,0 @@ ---- 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"; - } diff -ruN awstats.orig/files/patch-tools-awstats_buildstaticpages.pl awstats/files/patch-tools-awstats_buildstaticpages.pl --- awstats.orig/files/patch-tools-awstats_buildstaticpages.pl Wed Oct 26 08:30:46 2005 +++ awstats/files/patch-tools-awstats_buildstaticpages.pl Fri Jan 13 19:54:28 2006 @@ -1,5 +1,5 @@ ---- tools/awstats_buildstaticpages.pl.orig Sun Feb 20 11:11:06 2005 -+++ tools/awstats_buildstaticpages.pl Thu Sep 22 20:33:32 2005 +--- tools/awstats_buildstaticpages.pl.orig Wed Aug 24 03:56:35 2005 ++++ tools/awstats_buildstaticpages.pl Fri Jan 13 19:53:56 2006 @@ -293,8 +293,8 @@ # Check if AWSTATS prog is found my $AwstatsFound=0; diff -ruN awstats.orig/files/patch-tools-awstats_configure.pl awstats/files/patch-tools-awstats_configure.pl --- awstats.orig/files/patch-tools-awstats_configure.pl Wed Oct 26 08:30:46 2005 +++ awstats/files/patch-tools-awstats_configure.pl Fri Jan 13 19:56:29 2006 @@ -1,5 +1,5 @@ ---- tools/awstats_configure.pl.orig Sat Jan 15 17:42:58 2005 -+++ tools/awstats_configure.pl Thu Sep 22 20:34:07 2005 +--- tools/awstats_configure.pl.orig Sat Apr 23 01:34:05 2005 ++++ tools/awstats_configure.pl Fri Jan 13 19:55:54 2006 @@ -29,10 +29,10 @@ $AWSTATS_DIRDATA_PATH /; @@ -14,4 +14,4 @@ +$AWSTATS_CGI_PATH='%%PREFIX%%/www/awstats/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 - + diff -ruN awstats.orig/files/patch-tools-awstats_updateall.pl awstats/files/patch-tools-awstats_updateall.pl --- awstats.orig/files/patch-tools-awstats_updateall.pl Wed Oct 26 08:30:46 2005 +++ awstats/files/patch-tools-awstats_updateall.pl Fri Jan 13 19:57:47 2006 @@ -1,5 +1,5 @@ ---- tools/awstats_updateall.pl.orig Mon Jun 7 08:27:26 2004 -+++ tools/awstats_updateall.pl Thu Sep 22 01:30:15 2005 +--- tools/awstats_updateall.pl.orig Sat Apr 23 01:34:05 2005 ++++ tools/awstats_updateall.pl Fri Jan 13 19:57:28 2006 @@ -121,8 +121,8 @@ # Check if AWSTATS prog is found my $AwstatsFound=0; diff -ruN awstats.orig/files/patch-wwwroot-cgi-bin-awstats.pl awstats/files/patch-wwwroot-cgi-bin-awstats.pl --- awstats.orig/files/patch-wwwroot-cgi-bin-awstats.pl Wed Oct 26 08:30:46 2005 +++ awstats/files/patch-wwwroot-cgi-bin-awstats.pl Fri Jan 13 19:51:45 2006 @@ -1,11 +1,11 @@ ---- wwwroot/cgi-bin/awstats.pl.orig Thu Feb 24 16:02:23 2005 -+++ wwwroot/cgi-bin/awstats.pl Thu Sep 22 20:33:18 2005 -@@ -1835,7 +1835,7 @@ +--- wwwroot/cgi-bin/awstats.pl.orig Fri Nov 25 04:11:19 2005 ++++ wwwroot/cgi-bin/awstats.pl Fri Jan 13 19:51:12 2006 +@@ -1911,7 +1911,7 @@ # Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl) # Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins" # Debian package : "/usr/share/awstats/plugins" - my @PossiblePluginsDir=("$DIR/plugins","/usr/local/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins"); + my @PossiblePluginsDir=("$DIR/plugins","%%PREFIX%%/www/awstats/cgi-bin/plugins","/usr/share/awstats/plugins"); my %DirAddedInINC=(); - + #Removed for security reason diff -ruN awstats.orig/pkg-plist awstats/pkg-plist --- awstats.orig/pkg-plist Sat Mar 12 17:47:08 2005 +++ awstats/pkg-plist Fri Jan 13 20:21:26 2006 @@ -69,13 +69,15 @@ www/awstats/cgi-bin/lang/awstats-gl.txt www/awstats/cgi-bin/lang/awstats-gr.txt www/awstats/cgi-bin/lang/awstats-he.txt +www/awstats/cgi-bin/lang/awstats-hr.txt www/awstats/cgi-bin/lang/awstats-hu.txt www/awstats/cgi-bin/lang/awstats-id.txt www/awstats/cgi-bin/lang/awstats-is.txt www/awstats/cgi-bin/lang/awstats-it.txt www/awstats/cgi-bin/lang/awstats-jp.txt -www/awstats/cgi-bin/lang/awstats-kr.txt +www/awstats/cgi-bin/lang/awstats-ko.txt www/awstats/cgi-bin/lang/awstats-lv.txt +www/awstats/cgi-bin/lang/awstats-mk.txt www/awstats/cgi-bin/lang/awstats-nb.txt www/awstats/cgi-bin/lang/awstats-nl.txt www/awstats/cgi-bin/lang/awstats-nn.txt @@ -89,7 +91,6 @@ www/awstats/cgi-bin/lang/awstats-sr.txt www/awstats/cgi-bin/lang/awstats-th.txt www/awstats/cgi-bin/lang/awstats-tr.txt -www/awstats/cgi-bin/lang/awstats-tt-br.txt www/awstats/cgi-bin/lang/awstats-tw.txt www/awstats/cgi-bin/lang/awstats-ua.txt www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt @@ -131,19 +132,25 @@ www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-tr.txt www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-tw.txt www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ua.txt +www/awstats/cgi-bin/lib/blacklist.txt www/awstats/cgi-bin/lib/browsers.pm +www/awstats/cgi-bin/lib/browsers_phone.pm www/awstats/cgi-bin/lib/domains.pm www/awstats/cgi-bin/lib/mime.pm www/awstats/cgi-bin/lib/operating_systems.pm -www/awstats/cgi-bin/lib/referer_spam.pm www/awstats/cgi-bin/lib/robots.pm www/awstats/cgi-bin/lib/search_engines.pm www/awstats/cgi-bin/lib/status_http.pm www/awstats/cgi-bin/lib/status_smtp.pm www/awstats/cgi-bin/lib/worms.pm +www/awstats/cgi-bin/plugins/clusterinfo.pm www/awstats/cgi-bin/plugins/decodeutfkeys.pm www/awstats/cgi-bin/plugins/example/example.pm www/awstats/cgi-bin/plugins/geoip.pm +www/awstats/cgi-bin/plugins/geoip_city_maxmind.pm +www/awstats/cgi-bin/plugins/geoip_isp_maxmind.pm +www/awstats/cgi-bin/plugins/geoip_org_maxmind.pm +www/awstats/cgi-bin/plugins/geoip_region_maxmind.pm www/awstats/cgi-bin/plugins/geoipfree.pm www/awstats/cgi-bin/plugins/graphapplet.pm www/awstats/cgi-bin/plugins/hashfiles.pm @@ -158,12 +165,14 @@ www/awstats/css/awstats_bw.css www/awstats/css/awstats_default.css www/awstats/icons/browser/adobe.png +www/awstats/icons/browser/alcatel.png www/awstats/icons/browser/amaya.png www/awstats/icons/browser/amigavoyager.png www/awstats/icons/browser/apt.png www/awstats/icons/browser/avant.png www/awstats/icons/browser/aweb.png www/awstats/icons/browser/bpftp.png +www/awstats/icons/browser/bytel.png www/awstats/icons/browser/chimera.png www/awstats/icons/browser/cyberdog.png www/awstats/icons/browser/da.png @@ -171,8 +180,13 @@ www/awstats/icons/browser/dreamcast.png www/awstats/icons/browser/ecatch.png www/awstats/icons/browser/encompass.png +www/awstats/icons/browser/epiphany.png +www/awstats/icons/browser/ericsson.png +www/awstats/icons/browser/feeddemon.png +www/awstats/icons/browser/feedreader.png www/awstats/icons/browser/firefox.png www/awstats/icons/browser/fpexpress.png +www/awstats/icons/browser/lg.png www/awstats/icons/browser/fresco.png www/awstats/icons/browser/galeon.png www/awstats/icons/browser/getright.png @@ -180,29 +194,57 @@ www/awstats/icons/browser/hotjava.png www/awstats/icons/browser/ibrowse.png www/awstats/icons/browser/icab.png +www/awstats/icons/browser/java.png +www/awstats/icons/browser/jetbrains_omea.png www/awstats/icons/browser/kmeleon.png www/awstats/icons/browser/konqueror.png www/awstats/icons/browser/lotusnotes.png www/awstats/icons/browser/lynx.png www/awstats/icons/browser/macweb.png www/awstats/icons/browser/mediaplayer.png +www/awstats/icons/browser/motorola.png www/awstats/icons/browser/mozilla.png +www/awstats/icons/browser/mplayer.png www/awstats/icons/browser/msie.png www/awstats/icons/browser/msie_large.png www/awstats/icons/browser/multizilla.png www/awstats/icons/browser/ncsa_mosaic.png +www/awstats/icons/browser/netnewswire.png www/awstats/icons/browser/netpositive.png www/awstats/icons/browser/netscape.png www/awstats/icons/browser/netscape_large.png +www/awstats/icons/browser/netshow.png +www/awstats/icons/browser/newsfire.png +www/awstats/icons/browser/newsgator.png +www/awstats/icons/browser/newzcrawler.png +www/awstats/icons/browser/nokia.png www/awstats/icons/browser/notavailable.png www/awstats/icons/browser/omniweb.png www/awstats/icons/browser/opera.png +www/awstats/icons/browser/panasonic.png www/awstats/icons/browser/pdaphone.png +www/awstats/icons/browser/philips.png www/awstats/icons/browser/phoenix.png +www/awstats/icons/browser/pluck.png +www/awstats/icons/browser/pulpfiction.png +www/awstats/icons/browser/real.png +www/awstats/icons/browser/rss.png +www/awstats/icons/browser/rssbandit.png +www/awstats/icons/browser/rssowl.png +www/awstats/icons/browser/rssreader.png www/awstats/icons/browser/safari.png +www/awstats/icons/browser/sagem.png +www/awstats/icons/browser/samsung.png +www/awstats/icons/browser/sharp.png +www/awstats/icons/browser/sharpreader.png +www/awstats/icons/browser/shrook.png +www/awstats/icons/browser/siemens.png +www/awstats/icons/browser/sony.png www/awstats/icons/browser/staroffice.png www/awstats/icons/browser/teleport.png +www/awstats/icons/browser/trium.png www/awstats/icons/browser/unknown.png +www/awstats/icons/browser/w3c.png www/awstats/icons/browser/webcopier.png www/awstats/icons/browser/webtv.png www/awstats/icons/browser/webzip.png @@ -396,6 +438,7 @@ www/awstats/icons/flags/mu.png www/awstats/icons/flags/museum.png www/awstats/icons/flags/mv.png +www/awstats/icons/flags/mw.png www/awstats/icons/flags/mx.png www/awstats/icons/flags/my.png www/awstats/icons/flags/mz.png @@ -488,24 +531,42 @@ www/awstats/icons/flags/ze.png www/awstats/icons/flags/zm.png www/awstats/icons/flags/zw.png +www/awstats/icons/mime/ai.png www/awstats/icons/mime/archive.png www/awstats/icons/mime/audio.png www/awstats/icons/mime/doc.png +www/awstats/icons/mime/flash.png www/awstats/icons/mime/html.png www/awstats/icons/mime/image.png +www/awstats/icons/mime/jscript.png +www/awstats/icons/mime/lit.png www/awstats/icons/mime/notavailable.png www/awstats/icons/mime/other.png www/awstats/icons/mime/pdf.png +www/awstats/icons/mime/php.png +www/awstats/icons/mime/phshop.png +www/awstats/icons/mime/pl.png +www/awstats/icons/mime/ppt.png +www/awstats/icons/mime/quicktime.png +www/awstats/icons/mime/rar.png +www/awstats/icons/mime/real.png www/awstats/icons/mime/script.png +www/awstats/icons/mime/svg.png www/awstats/icons/mime/text.png +www/awstats/icons/mime/ttf.png www/awstats/icons/mime/unknown.png www/awstats/icons/mime/video.png +www/awstats/icons/mime/wmv.png www/awstats/icons/os/aix.png www/awstats/icons/os/amigaos.png www/awstats/icons/os/apple.png www/awstats/icons/os/atari.png www/awstats/icons/os/beos.png +www/awstats/icons/os/bsd.png +www/awstats/icons/os/bsdfreebsd.png www/awstats/icons/os/bsdi.png +www/awstats/icons/os/bsdnetbsd.png +www/awstats/icons/os/bsdopenbsd.png www/awstats/icons/os/cpm.png www/awstats/icons/os/debian.png www/awstats/icons/os/digital.png @@ -518,7 +579,15 @@ www/awstats/icons/os/imode.png www/awstats/icons/os/irix.png www/awstats/icons/os/java.png +www/awstats/icons/os/kfreebsd.png www/awstats/icons/os/linux.png +www/awstats/icons/os/linuxcentos.png +www/awstats/icons/os/linuxdebian.png +www/awstats/icons/os/linuxfedora.png +www/awstats/icons/os/linuxmandr.png +www/awstats/icons/os/linuxredhat.png +www/awstats/icons/os/linuxsuse.png +www/awstats/icons/os/linuxubuntu.png www/awstats/icons/os/mac.png www/awstats/icons/os/macintosh.png www/awstats/icons/os/macosx.png @@ -581,7 +650,7 @@ www/awstats/tools/logresolvemerge.pl www/awstats/tools/maillogconvert.pl www/awstats/tools/urlaliasbuilder.pl -www/awstats/tools/webmin/awstats-1.5.wbm +www/awstats/tools/webmin/awstats-1.6.wbm @dirrm www/awstats/tools/webmin @dirrm www/awstats/tools @dirrm www/awstats/js >Release-Note: >Audit-Trail: >Unformatted: