Changes 7.0:

New features/improvements:
- Detect Windows 7.
- Can format numbers according to language.
- More mime types.
- Added geoip_asn_maxmind plugin.
- Geoip Maxmind city plugin have now override file capabilities to complete
  missing entries in geoip maxmind database.
- Added graphgooglechartapi to use online Google chart api to build graph.
- Can show map of country to report countries when using graphgooglechartapi.
- Part of codes was change to use more functions and have a cleaner code.
- Added parameter to ignore missing log files when merging for a site on
  multiple servers where a single server may not have created a log for a given day.
- Update robots database.
- Added Download tracking where certain mime types are defined as downloads
  and HTTP status 206 is tracked as download continuation
- Can use wrapper with parameters in WrapperScript parameter.
- Change to allow usage of AWStats inside a plugin
  for Opensource Dolibarr ERP & CRM software (http://www.dolibarr.org).
Fixes:
- Webmin module works with new version of webmin.
- Security fix (Traverse directory of LoadPlugin)
- Security fix (Limit config to defined directory to avoid access to external
  config file via a nfs or webdav link).

4 files changed, 51 insertions, 18 deletions

diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 5eb438c2bec..fc68463ec25 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.42 2010/02/02 11:20:29 fhajny Exp $
+# $NetBSD: Makefile,v 1.43 2010/11/09 07:14:48 adam Exp $
 
-DISTNAME=	awstats-6.95
+DISTNAME=	awstats-7.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=awstats/}
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://awstats.sourceforge.net/
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/awstats/PLIST b/www/awstats/PLIST
index 9653563c116..6b712d29dc8 100644
--- a/www/awstats/PLIST
+++ b/www/awstats/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.16 2010/02/02 11:20:29 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.17 2010/11/09 07:14:48 adam Exp $
 awstats/bin/awstats_buildstaticpages.pl
 awstats/bin/awstats_configure.pl
 awstats/bin/awstats_exportlib.pl
 awstats/bin/awstats_updateall.pl
+awstats/bin/geoip_generator.pl
 awstats/bin/logresolvemerge.pl
 awstats/bin/maillogconvert.pl
 awstats/bin/urlaliasbuilder.pl
@@ -58,6 +59,7 @@ awstats/cgi-bin/lang/awstats-ua.txt
 awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt
 awstats/cgi-bin/lang/tooltips_f/awstats-tt-cz.txt
 awstats/cgi-bin/lang/tooltips_f/awstats-tt-en.txt
+awstats/cgi-bin/lang/tooltips_f/awstats-tt-gl.txt
 awstats/cgi-bin/lang/tooltips_f/awstats-tt-gr.txt
 awstats/cgi-bin/lang/tooltips_f/awstats-tt-is.txt
 awstats/cgi-bin/lang/tooltips_f/awstats-tt-it.txt
@@ -66,6 +68,7 @@ awstats/cgi-bin/lang/tooltips_m/awstats-tt-br.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-cz.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-en.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt
+awstats/cgi-bin/lang/tooltips_m/awstats-tt-gl.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-gr.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-is.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-it.txt
@@ -118,12 +121,14 @@ awstats/cgi-bin/plugins/clusterinfo.pm
 awstats/cgi-bin/plugins/decodeutfkeys.pm
 awstats/cgi-bin/plugins/export_to_csv.pm
 awstats/cgi-bin/plugins/geoip.pm
+awstats/cgi-bin/plugins/geoip_asn_maxmind.pm
 awstats/cgi-bin/plugins/geoip_city_maxmind.pm
 awstats/cgi-bin/plugins/geoip_isp_maxmind.pm
 awstats/cgi-bin/plugins/geoip_org_maxmind.pm
 awstats/cgi-bin/plugins/geoip_region_maxmind.pm
 awstats/cgi-bin/plugins/geoipfree.pm
 awstats/cgi-bin/plugins/graphapplet.pm
+awstats/cgi-bin/plugins/graphgooglechartapi.pm
 awstats/cgi-bin/plugins/hashfiles.pm
 awstats/cgi-bin/plugins/hostinfo.pm
 awstats/cgi-bin/plugins/ipv6.pm
@@ -533,17 +538,24 @@ awstats/icon/flags/zw.png
 awstats/icon/mime/ai.png
 awstats/icon/mime/archive.png
 awstats/icon/mime/audio.png
+awstats/icon/mime/crystal.png
 awstats/icon/mime/css.png
 awstats/icon/mime/doc.png
+awstats/icon/mime/dotnet.png
+awstats/icon/mime/encrypt.png
 awstats/icon/mime/flash.png
 awstats/icon/mime/glasses.png
 awstats/icon/mime/html.png
 awstats/icon/mime/image.png
 awstats/icon/mime/jnlp.png
 awstats/icon/mime/jscript.png
+awstats/icon/mime/library.png
 awstats/icon/mime/lit.png
+awstats/icon/mime/mdb.png
 awstats/icon/mime/notavailable.png
+awstats/icon/mime/ooffice.png
 awstats/icon/mime/other.png
+awstats/icon/mime/page.png
 awstats/icon/mime/pdf.png
 awstats/icon/mime/php.png
 awstats/icon/mime/phshop.png
@@ -551,7 +563,9 @@ awstats/icon/mime/pl.png
 awstats/icon/mime/ppt.png
 awstats/icon/mime/quicktime.png
 awstats/icon/mime/rar.png
+awstats/icon/mime/readme.txt
 awstats/icon/mime/real.png
+awstats/icon/mime/rss.png
 awstats/icon/mime/script.png
 awstats/icon/mime/svg.png
 awstats/icon/mime/text.png
@@ -569,8 +583,8 @@ awstats/icon/os/blackberry.png
 awstats/icon/os/bsd.png
 awstats/icon/os/bsddflybsd.png
 awstats/icon/os/bsdfreebsd.png
-awstats/icon/os/bsdkfreebsd.png
 awstats/icon/os/bsdi.png
+awstats/icon/os/bsdkfreebsd.png
 awstats/icon/os/bsdnetbsd.png
 awstats/icon/os/bsdopenbsd.png
 awstats/icon/os/commodore.png
@@ -585,6 +599,8 @@ awstats/icon/os/hpux.png
 awstats/icon/os/ibm.png
 awstats/icon/os/imode.png
 awstats/icon/os/inferno.png
+awstats/icon/os/ios.png
+awstats/icon/os/iphone.png
 awstats/icon/os/irix.png
 awstats/icon/os/j2me.png
 awstats/icon/os/java.png
@@ -630,6 +646,7 @@ awstats/icon/os/win16.png
 awstats/icon/os/win2000.png
 awstats/icon/os/win2003.png
 awstats/icon/os/win2008.png
+awstats/icon/os/win7.png
 awstats/icon/os/win95.png
 awstats/icon/os/win98.png
 awstats/icon/os/wince.png
@@ -674,6 +691,10 @@ share/doc/awstats/awstats_changelog.txt
 share/doc/awstats/awstats_compare.html
 share/doc/awstats/awstats_config.html
 share/doc/awstats/awstats_contrib.html
+share/doc/awstats/awstats_dev_plugins.html
+share/doc/awstats/awstats_dev_plugins_graphs.html
+share/doc/awstats/awstats_dev_plugins_hooks.html
+share/doc/awstats/awstats_dolibarr.html
 share/doc/awstats/awstats_extra.html
 share/doc/awstats/awstats_faq.html
 share/doc/awstats/awstats_glossary.html
@@ -713,8 +734,19 @@ share/doc/awstats/images/screen_shot_large_4.jpg
 share/doc/awstats/images/screen_shot_large_5.jpg
 share/doc/awstats/images/star.png
 share/doc/awstats/index.html
-share/doc/awstats/pad_awstats.htm
 share/doc/awstats/pad_awstats.xml
+share/doc/awstats/scripts/lang-apollo.js
+share/doc/awstats/scripts/lang-css.js
+share/doc/awstats/scripts/lang-hs.js
+share/doc/awstats/scripts/lang-lisp.js
+share/doc/awstats/scripts/lang-lua.js
+share/doc/awstats/scripts/lang-ml.js
+share/doc/awstats/scripts/lang-proto.js
+share/doc/awstats/scripts/lang-sql.js
+share/doc/awstats/scripts/lang-vb.js
+share/doc/awstats/scripts/lang-wiki.js
+share/doc/awstats/scripts/prettify.css
+share/doc/awstats/scripts/prettify.js
 share/doc/awstats/styles.css
 share/examples/awstats/awstats.conf
 share/examples/awstats/example.pm
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index 7f5c14b48c5..0095d7616b4 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2010/02/02 11:20:29 fhajny Exp $
+$NetBSD: distinfo,v 1.26 2010/11/09 07:14:48 adam Exp $
 
-SHA1 (awstats-6.95.tar.gz) = 0eba9c3f834b05dbfc3392ce443140008fa12525
-RMD160 (awstats-6.95.tar.gz) = 62394005828e49d714200f907adf44fbe5cb8834
-Size (awstats-6.95.tar.gz) = 1138306 bytes
-SHA1 (patch-aa) = 1897d739b38b9c830f9af2211aa9fcb5e15a6795
+SHA1 (awstats-7.0.tar.gz) = 92fa78f305af9a358c37266788708cd16e6e0c75
+RMD160 (awstats-7.0.tar.gz) = 64692af7d8f46eae7a0c2f56ee0a66f1e72e5603
+Size (awstats-7.0.tar.gz) = 1228274 bytes
+SHA1 (patch-aa) = 77505c9894b0be638d748c506feb93e065a3318f
 SHA1 (patch-ab) = 9ae474058a1803c1132b36448c1a6987c58e8823
 SHA1 (patch-ad) = 9c08fff3fcc3871a08c73c9509fbeb5baca06c09
diff --git a/www/awstats/patches/patch-aa b/www/awstats/patches/patch-aa
index 065ae3d21e3..319d1f9a1e8 100644
--- a/www/awstats/patches/patch-aa
+++ b/www/awstats/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.9 2009/01/15 12:12:04 adam Exp $
+$NetBSD: patch-aa,v 1.10 2010/11/09 07:14:48 adam Exp $
 
---- wwwroot/cgi-bin/awstats.pl.orig	2008-11-30 16:42:46.000000000 +0100
+--- wwwroot/cgi-bin/awstats.pl.orig	2010-08-18 10:47:10.000000000 +0000
 +++ wwwroot/cgi-bin/awstats.pl
-@@ -1627,7 +1627,7 @@ sub Read_Config {
- 	my $configdir         = shift;
- 	my @PossibleConfigDir = ();
+@@ -1717,7 +1717,7 @@ sub Read_Config {
+ 			"/etc/opt/awstats"
+ 		); 
  
 -	if ($configdir) {
 +	if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
- 
- # If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
- #if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+ 		# Check if configdir is outside default values.
+ 		my $outsidedefaultvalue=1;
+ 		foreach (@PossibleConfigDir) {