update to 6.6

PR:		ports/108228
Submitted by:	Alex Samorukov <samm@os2.kiev.ua> (maintainer)
Approved by:	itetcu (mentor)

4 files changed, 34 insertions, 98 deletions

diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 1f9af8d11c9d..aed192278c6a 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	awstats
-PORTVERSION=	6.5
-PORTREVISION=	2
+PORTVERSION=	6.6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -72,7 +71,7 @@ do-install:
 	${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.7.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
@@ -83,6 +82,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lib/* ${PREFIX}/www/awstats/cgi-bin/lib
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/*.pm ${PREFIX}/www/awstats/cgi-bin/plugins
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/example/* ${PREFIX}/www/awstats/cgi-bin/plugins/example
+	${INSTALL_DATA} ${WRKSRC}/wwwroot/classes/awgraphapplet.jar ${PREFIX}/www/awstats/classes/awgraphapplet.jar
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/css/* ${PREFIX}/www/awstats/css
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/browser/* ${PREFIX}/www/awstats/icons/browser
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/clock/* ${PREFIX}/www/awstats/icons/clock
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index 9414a5f36141..e43452be998c 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,3 +1,3 @@
-MD5 (awstats-6.5.tar.gz) = aef00b2ff5c5413bd2a868299cabd69a
-SHA256 (awstats-6.5.tar.gz) = 08a63a30c5be698a164c957b3d68e8bacafc0c86ab72458382584d9f8b45bd2c
-SIZE (awstats-6.5.tar.gz) = 1051780
+MD5 (awstats-6.6.tar.gz) = 3e6da58e0c479ae0de49ae3e6948576e
+SHA256 (awstats-6.6.tar.gz) = b5811694f14f74af706d73e4d580ccb63ea839ffeaa19912ea57d198bb6069eb
+SIZE (awstats-6.6.tar.gz) = 1079064
diff --git a/www/awstats/files/patch-awstats.pl-security b/www/awstats/files/patch-awstats.pl-security
deleted file mode 100644
index 668e4c06c701..000000000000
--- a/www/awstats/files/patch-awstats.pl-security
+++ /dev/null
@@ -1,91 +0,0 @@
---- wwwroot/cgi-bin/awstats.pl	Wed Oct 25 09:05:29 2006
-+++ wwwroot/cgi-bin/awstats.pl	Wed Oct 25 09:02:30 2006
-@@ -1131,7 +1131,18 @@
- 	my $configdir=shift;
- 	my @PossibleConfigDir=();
- 
--	if ($configdir) { @PossibleConfigDir=("$configdir"); }
-+	if ($configdir)
-+	{
-+		# If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
-+		#if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
-+		#{
-+		#	error("Sorry, to allow overwriting of configdir parameter from an AWStats CGI usage, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1");
-+		#}
-+		#else
-+		#{
-+			@PossibleConfigDir=("$configdir");
-+		#}
-+	}
- 	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
- 
- 	# Open config file
-@@ -4439,6 +4450,7 @@
- 	my $stringtoclean=shift;
- 	$stringtoclean =~ s/</&lt;/g;
- 	$stringtoclean =~ s/>/&gt;/g;
-+	$stringtoclean =~ s/|//g;
- 	return $stringtoclean;
- }
- 
-@@ -5534,7 +5546,7 @@
- 	    $QueryString =~ s/&/&amp;/g;
- 	}
- 
--	$QueryString = CleanFromCSSA($QueryString);
-+	$QueryString = CleanFromCSSA(&DecodeEncodedString($QueryString));
- 
-     # Security test
- 	if ($QueryString =~ /LogFile=([^&]+)/i)				{ error("Logfile parameter can't be overwritten when AWStats is used from a CGI"); }
-@@ -5542,26 +5554,26 @@
- 	# No update but report by default when run from a browser
- 	$UpdateStats=($QueryString=~/update=1/i?1:0);
- 
--	if ($QueryString =~ /config=([^&]+)/i)				{ $SiteConfig=&DecodeEncodedString("$1"); }
--	if ($QueryString =~ /diricons=([^&]+)/i)			{ $DirIcons=&DecodeEncodedString("$1"); }
--	if ($QueryString =~ /pluginmode=([^&]+)/i)			{ $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); }
--	if ($QueryString =~ /configdir=([^&]+)/i)			{ $DirConfig=&Sanitize(&DecodeEncodedString("$1")); }
--	# All filters
--	if ($QueryString =~ /hostfilter=([^&]+)/i)			{ $FilterIn{'host'}=&DecodeEncodedString("$1"); }			# Filter on host list can also be defined with hostfilter=filter
--	if ($QueryString =~ /hostfilterex=([^&]+)/i)		{ $FilterEx{'host'}=&DecodeEncodedString("$1"); }			#
--	if ($QueryString =~ /urlfilter=([^&]+)/i)			{ $FilterIn{'url'}=&DecodeEncodedString("$1"); }			# Filter on URL list can also be defined with urlfilter=filter
--	if ($QueryString =~ /urlfilterex=([^&]+)/i)			{ $FilterEx{'url'}=&DecodeEncodedString("$1"); }			#
--	if ($QueryString =~ /refererpagesfilter=([^&]+)/i)	{ $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); }	# Filter on referer list can also be defined with refererpagesfilter=filter
--	if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}=&DecodeEncodedString("$1"); }	#
-+	if ($QueryString =~ /config=([^&]+)/i)				{ $SiteConfig=&Sanitize("$1"); }
-+	if ($QueryString =~ /diricons=([^&]+)/i)			{ $DirIcons="$1"; }
-+	if ($QueryString =~ /pluginmode=([^&]+)/i)			{ $PluginMode=&Sanitize("$1",1); }
-+	if ($QueryString =~ /configdir=([^&]+)/i)			{ $DirConfig=&Sanitize("$1"); }	
-+ 	# All filters
-+	if ($QueryString =~ /hostfilter=([^&]+)/i)			{ $FilterIn{'host'}="$1"; }			# Filter on host list can also be defined with hostfilter=filter
-+	if ($QueryString =~ /hostfilterex=([^&]+)/i)		{ $FilterEx{'host'}="$1"; }			#
-+	if ($QueryString =~ /urlfilter=([^&]+)/i)			{ $FilterIn{'url'}="$1"; }			# Filter on URL list can also be defined with urlfilter=filter
-+	if ($QueryString =~ /urlfilterex=([^&]+)/i)			{ $FilterEx{'url'}="$1"; }			#
-+	if ($QueryString =~ /refererpagesfilter=([^&]+)/i)	{ $FilterIn{'refererpages'}="$1"; }	# Filter on referer list can also be defined with refererpagesfilter=filter
-+	if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}="$1"; }	#
- 	# All output
--	if ($QueryString =~ /output=allhosts:([^&]+)/i)		{ $FilterIn{'host'}=&DecodeEncodedString("$1"); }			# Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed
--	if ($QueryString =~ /output=lasthosts:([^&]+)/i)	{ $FilterIn{'host'}=&DecodeEncodedString("$1"); }			# Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed
--	if ($QueryString =~ /output=urldetail:([^&]+)/i)	{ $FilterIn{'url'}=&DecodeEncodedString("$1"); }			# Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed
--	if ($QueryString =~ /output=refererpages:([^&]+)/i)	{ $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); }	# Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed
-+	if ($QueryString =~ /output=allhosts:([^&]+)/i)		{ $FilterIn{'host'}="$1"; }			# Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed
-+	if ($QueryString =~ /output=lasthosts:([^&]+)/i)	{ $FilterIn{'host'}="$1"; }			# Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed
-+	if ($QueryString =~ /output=urldetail:([^&]+)/i)	{ $FilterIn{'url'}="$1"; }			# Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed
-+	if ($QueryString =~ /output=refererpages:([^&]+)/i)	{ $FilterIn{'refererpages'}="$1"; }	# Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed
- 
- 	# If migrate
- 	if ($QueryString =~ /(^|-|&|&amp;)migrate=([^&]+)/i)	{
--		$MigrateStats=&DecodeEncodedString("$2"); 
-+		$MigrateStats=&Sanitize("$2"); 
- 		$MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/;
- 		$SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//;		# SiteConfig is used to find config file
- 	}
-@@ -5625,8 +5637,6 @@
- if ($QueryString =~ /(^|&|&amp;)databasebreak=(\w+)/i)	{ $DatabaseBreak=$2; }
- if ($QueryString =~ /(^|&|&amp;)updatefor=(\d+)/i)		{ $UpdateFor=$2; }
- if ($QueryString =~ /(^|&|&amp;)noloadplugin=([^&]+)/i)	{ foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=1; } }
--#Removed for security reasons
--#if ($QueryString =~ /(^|&|&amp;)loadplugin=([^&]+)/i)		{ foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=-1; } }
- if ($QueryString =~ /(^|&|&amp;)limitflush=(\d+)/i)		{ $LIMITFLUSH=$2; }
- # Get/Define output
- if ($QueryString =~ /(^|&|&amp;)output(=[^&]*|)(.*)(&|&amp;)output(=[^&]*|)(&|$)/i) { error("Only 1 output option is allowed","","",1); }
diff --git a/www/awstats/pkg-plist b/www/awstats/pkg-plist
index 9df0cfb80999..3acaa97c8d98 100644
--- a/www/awstats/pkg-plist
+++ b/www/awstats/pkg-plist
@@ -42,6 +42,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/screen_shot_large_4.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/screen_shot_large_5.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/star.png
+%%PORTDOCS%%%%DOCSDIR%%/images/awstats.png
+%%PORTDOCS%%%%DOCSDIR%%/images/awstats.gif
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/pad_awstats.htm
 %%PORTDOCS%%%%DOCSDIR%%/pad_awstats.xml
@@ -93,14 +95,17 @@ www/awstats/cgi-bin/lang/awstats-th.txt
 www/awstats/cgi-bin/lang/awstats-tr.txt
 www/awstats/cgi-bin/lang/awstats-tw.txt
 www/awstats/cgi-bin/lang/awstats-ua.txt
+www/awstats/cgi-bin/lang/awstats-lt.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-cz.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-en.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-is.txt
+www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-it.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-br.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-en.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-is.txt
+www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-it.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-al.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ba.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt
@@ -162,6 +167,7 @@ www/awstats/cgi-bin/plugins/timezone.pm
 www/awstats/cgi-bin/plugins/tooltips.pm
 www/awstats/cgi-bin/plugins/urlalias.pm
 www/awstats/cgi-bin/plugins/userinfo.pm
+www/awstats/classes/awgraphapplet.jar
 www/awstats/css/awstats_bw.css
 www/awstats/css/awstats_default.css
 www/awstats/icons/browser/adobe.png
@@ -248,6 +254,23 @@ www/awstats/icons/browser/w3c.png
 www/awstats/icons/browser/webcopier.png
 www/awstats/icons/browser/webtv.png
 www/awstats/icons/browser/webzip.png
+www/awstats/icons/browser/abilon.png
+www/awstats/icons/browser/akregator.png
+www/awstats/icons/browser/analogx.png
+www/awstats/icons/browser/doris.png
+www/awstats/icons/browser/flashget.png
+www/awstats/icons/browser/freshdownload.png
+www/awstats/icons/browser/frontpage.png
+www/awstats/icons/browser/gnome.png
+www/awstats/icons/browser/gnus.png
+www/awstats/icons/browser/httrack.png
+www/awstats/icons/browser/leechget.png
+www/awstats/icons/browser/neon.png
+www/awstats/icons/browser/rssxpress.png
+www/awstats/icons/browser/subversion.png
+www/awstats/icons/browser/webreaper.png
+www/awstats/icons/browser/winxbox.png
+www/awstats/icons/browser/wizz.png
 www/awstats/icons/clock/hr1.png
 www/awstats/icons/clock/hr10.png
 www/awstats/icons/clock/hr11.png
@@ -557,6 +580,7 @@ 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/mime/glasses.png
 www/awstats/icons/os/aix.png
 www/awstats/icons/os/amigaos.png
 www/awstats/icons/os/apple.png
@@ -617,6 +641,9 @@ www/awstats/icons/os/winlong.png
 www/awstats/icons/os/winme.png
 www/awstats/icons/os/winnt.png
 www/awstats/icons/os/winxp.png
+www/awstats/icons/os/commodore.png
+www/awstats/icons/os/psp.png
+www/awstats/icons/os/winxbox.png
 www/awstats/icons/other/awstats_logo1.png
 www/awstats/icons/other/awstats_logo5.png
 www/awstats/icons/other/awstats_logo6.png
@@ -650,7 +677,7 @@ www/awstats/tools/awstats_updateall.pl
 www/awstats/tools/logresolvemerge.pl
 www/awstats/tools/maillogconvert.pl
 www/awstats/tools/urlaliasbuilder.pl
-www/awstats/tools/webmin/awstats-1.6.wbm
+www/awstats/tools/webmin/awstats-1.7.wbm
 @dirrm www/awstats/tools/webmin
 @dirrm www/awstats/tools
 @dirrm www/awstats/js