- Update released by AWStats fixing current command injection

  vulnerability.
  http://awstats.sourceforge.net/awstats_security_news.php

PR:		ports/97364
Submitted by:	Greg Armer <wiqd@codelounge.co.za>,
		Matthew Seaman <m.seaman@infracaninophile.co.uk>
Approved by:	maintainer-timeout

6 files changed, 70 insertions, 22 deletions

diff --git a/www/awstats-devel/Makefile b/www/awstats-devel/Makefile
index 6fcf93c35cc4..7f0636c6f7dc 100644
--- a/www/awstats-devel/Makefile
+++ b/www/awstats-devel/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	awstats
-PORTVERSION=	6.5
-PORTREVISION=	1
+PORTVERSION=	6.6
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://awstats.sourceforge.net/files/ \
+		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	webmaster@shopcusa.com
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
-FORBIDDEN=	Command Injection Vulnerability
-
 RUN_DEPENDS=	${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
 
 NO_BUILD=	yes
@@ -73,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
diff --git a/www/awstats-devel/distinfo b/www/awstats-devel/distinfo
index 9414a5f36141..5d89dd91eb80 100644
--- a/www/awstats-devel/distinfo
+++ b/www/awstats-devel/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) = c9b65c5a58011fdb4ec611feec17eee4
+SHA256 (awstats-6.6.tar.gz) = 34776a2f487049e2909a399fb03b79ca10e720623fc24ec9051904315efad8ca
+SIZE (awstats-6.6.tar.gz) = 1059148
diff --git a/www/awstats-devel/pkg-plist b/www/awstats-devel/pkg-plist
index 9df0cfb80999..35cabfc515c4 100644
--- a/www/awstats-devel/pkg-plist
+++ b/www/awstats-devel/pkg-plist
@@ -76,6 +76,7 @@ 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-ko.txt
+www/awstats/cgi-bin/lang/awstats-lt.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
@@ -97,10 +98,12 @@ 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
@@ -164,10 +167,13 @@ www/awstats/cgi-bin/plugins/urlalias.pm
 www/awstats/cgi-bin/plugins/userinfo.pm
 www/awstats/css/awstats_bw.css
 www/awstats/css/awstats_default.css
+www/awstats/icons/browser/abilon.png
 www/awstats/icons/browser/adobe.png
+www/awstats/icons/browser/akregator.png
 www/awstats/icons/browser/alcatel.png
 www/awstats/icons/browser/amaya.png
 www/awstats/icons/browser/amigavoyager.png
+www/awstats/icons/browser/analogx.png
 www/awstats/icons/browser/apt.png
 www/awstats/icons/browser/avant.png
 www/awstats/icons/browser/aweb.png
@@ -177,6 +183,7 @@ www/awstats/icons/browser/chimera.png
 www/awstats/icons/browser/cyberdog.png
 www/awstats/icons/browser/da.png
 www/awstats/icons/browser/dillo.png
+www/awstats/icons/browser/doris.png
 www/awstats/icons/browser/dreamcast.png
 www/awstats/icons/browser/ecatch.png
 www/awstats/icons/browser/encompass.png
@@ -185,30 +192,38 @@ 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/flashget.png
 www/awstats/icons/browser/fpexpress.png
 www/awstats/icons/browser/fresco.png
+www/awstats/icons/browser/freshdownload.png
+www/awstats/icons/browser/frontpage.png
 www/awstats/icons/browser/galeon.png
 www/awstats/icons/browser/getright.png
+www/awstats/icons/browser/gnome.png
+www/awstats/icons/browser/gnus.png
 www/awstats/icons/browser/gozilla.png
 www/awstats/icons/browser/hotjava.png
+www/awstats/icons/browser/httrack.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/leechget.png
 www/awstats/icons/browser/lg.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/mozilla.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/neon.png
 www/awstats/icons/browser/netnewswire.png
 www/awstats/icons/browser/netpositive.png
 www/awstats/icons/browser/netscape.png
@@ -232,6 +247,7 @@ 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/rssxpress.png
 www/awstats/icons/browser/safari.png
 www/awstats/icons/browser/sagem.png
 www/awstats/icons/browser/samsung.png
@@ -241,13 +257,17 @@ 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/subversion.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/webreaper.png
 www/awstats/icons/browser/webtv.png
 www/awstats/icons/browser/webzip.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
@@ -536,6 +556,7 @@ 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/glasses.png
 www/awstats/icons/mime/html.png
 www/awstats/icons/mime/image.png
 www/awstats/icons/mime/jscript.png
@@ -567,6 +588,7 @@ 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/commodore.png
 www/awstats/icons/os/cpm.png
 www/awstats/icons/os/debian.png
 www/awstats/icons/os/digital.png
@@ -597,6 +619,7 @@ www/awstats/icons/os/next.png
 www/awstats/icons/os/openbsd.png
 www/awstats/icons/os/os2.png
 www/awstats/icons/os/osf.png
+www/awstats/icons/os/psp.png
 www/awstats/icons/os/qnx.png
 www/awstats/icons/os/riscos.png
 www/awstats/icons/os/sco.png
@@ -616,6 +639,7 @@ www/awstats/icons/os/wince.png
 www/awstats/icons/os/winlong.png
 www/awstats/icons/os/winme.png
 www/awstats/icons/os/winnt.png
+www/awstats/icons/os/winxbox.png
 www/awstats/icons/os/winxp.png
 www/awstats/icons/other/awstats_logo1.png
 www/awstats/icons/other/awstats_logo5.png
@@ -650,7 +674,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
@@ -673,5 +697,7 @@ www/awstats/tools/webmin/awstats-1.6.wbm
 @dirrm www/awstats/cgi-bin/lang
 @dirrm www/awstats/cgi-bin
 @dirrm www/awstats
+@dirrm share/nls/en_US.US-ASCII
+@dirrm share/nls/POSIX
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 6fcf93c35cc4..7f0636c6f7dc 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	awstats
-PORTVERSION=	6.5
-PORTREVISION=	1
+PORTVERSION=	6.6
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://awstats.sourceforge.net/files/ \
+		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	webmaster@shopcusa.com
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
-FORBIDDEN=	Command Injection Vulnerability
-
 RUN_DEPENDS=	${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
 
 NO_BUILD=	yes
@@ -73,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
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index 9414a5f36141..5d89dd91eb80 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) = c9b65c5a58011fdb4ec611feec17eee4
+SHA256 (awstats-6.6.tar.gz) = 34776a2f487049e2909a399fb03b79ca10e720623fc24ec9051904315efad8ca
+SIZE (awstats-6.6.tar.gz) = 1059148
diff --git a/www/awstats/pkg-plist b/www/awstats/pkg-plist
index 9df0cfb80999..35cabfc515c4 100644
--- a/www/awstats/pkg-plist
+++ b/www/awstats/pkg-plist
@@ -76,6 +76,7 @@ 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-ko.txt
+www/awstats/cgi-bin/lang/awstats-lt.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
@@ -97,10 +98,12 @@ 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
@@ -164,10 +167,13 @@ www/awstats/cgi-bin/plugins/urlalias.pm
 www/awstats/cgi-bin/plugins/userinfo.pm
 www/awstats/css/awstats_bw.css
 www/awstats/css/awstats_default.css
+www/awstats/icons/browser/abilon.png
 www/awstats/icons/browser/adobe.png
+www/awstats/icons/browser/akregator.png
 www/awstats/icons/browser/alcatel.png
 www/awstats/icons/browser/amaya.png
 www/awstats/icons/browser/amigavoyager.png
+www/awstats/icons/browser/analogx.png
 www/awstats/icons/browser/apt.png
 www/awstats/icons/browser/avant.png
 www/awstats/icons/browser/aweb.png
@@ -177,6 +183,7 @@ www/awstats/icons/browser/chimera.png
 www/awstats/icons/browser/cyberdog.png
 www/awstats/icons/browser/da.png
 www/awstats/icons/browser/dillo.png
+www/awstats/icons/browser/doris.png
 www/awstats/icons/browser/dreamcast.png
 www/awstats/icons/browser/ecatch.png
 www/awstats/icons/browser/encompass.png
@@ -185,30 +192,38 @@ 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/flashget.png
 www/awstats/icons/browser/fpexpress.png
 www/awstats/icons/browser/fresco.png
+www/awstats/icons/browser/freshdownload.png
+www/awstats/icons/browser/frontpage.png
 www/awstats/icons/browser/galeon.png
 www/awstats/icons/browser/getright.png
+www/awstats/icons/browser/gnome.png
+www/awstats/icons/browser/gnus.png
 www/awstats/icons/browser/gozilla.png
 www/awstats/icons/browser/hotjava.png
+www/awstats/icons/browser/httrack.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/leechget.png
 www/awstats/icons/browser/lg.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/mozilla.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/neon.png
 www/awstats/icons/browser/netnewswire.png
 www/awstats/icons/browser/netpositive.png
 www/awstats/icons/browser/netscape.png
@@ -232,6 +247,7 @@ 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/rssxpress.png
 www/awstats/icons/browser/safari.png
 www/awstats/icons/browser/sagem.png
 www/awstats/icons/browser/samsung.png
@@ -241,13 +257,17 @@ 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/subversion.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/webreaper.png
 www/awstats/icons/browser/webtv.png
 www/awstats/icons/browser/webzip.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
@@ -536,6 +556,7 @@ 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/glasses.png
 www/awstats/icons/mime/html.png
 www/awstats/icons/mime/image.png
 www/awstats/icons/mime/jscript.png
@@ -567,6 +588,7 @@ 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/commodore.png
 www/awstats/icons/os/cpm.png
 www/awstats/icons/os/debian.png
 www/awstats/icons/os/digital.png
@@ -597,6 +619,7 @@ www/awstats/icons/os/next.png
 www/awstats/icons/os/openbsd.png
 www/awstats/icons/os/os2.png
 www/awstats/icons/os/osf.png
+www/awstats/icons/os/psp.png
 www/awstats/icons/os/qnx.png
 www/awstats/icons/os/riscos.png
 www/awstats/icons/os/sco.png
@@ -616,6 +639,7 @@ www/awstats/icons/os/wince.png
 www/awstats/icons/os/winlong.png
 www/awstats/icons/os/winme.png
 www/awstats/icons/os/winnt.png
+www/awstats/icons/os/winxbox.png
 www/awstats/icons/os/winxp.png
 www/awstats/icons/other/awstats_logo1.png
 www/awstats/icons/other/awstats_logo5.png
@@ -650,7 +674,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
@@ -673,5 +697,7 @@ www/awstats/tools/webmin/awstats-1.6.wbm
 @dirrm www/awstats/cgi-bin/lang
 @dirrm www/awstats/cgi-bin
 @dirrm www/awstats
+@dirrm share/nls/en_US.US-ASCII
+@dirrm share/nls/POSIX
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%