From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 23 11:00:37 2007 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5303416A408 for ; Tue, 23 Jan 2007 11:00:37 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 2F5AE13C4A6 for ; Tue, 23 Jan 2007 11:00:37 +0000 (UTC) (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 l0NB0bI4042992 for ; Tue, 23 Jan 2007 11:00:37 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l0NB0bLD042991; Tue, 23 Jan 2007 11:00:37 GMT (envelope-from gnats) Resent-Date: Tue, 23 Jan 2007 11:00:37 GMT Resent-Message-Id: <200701231100.l0NB0bLD042991@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, Alex Samorukov Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3FC1716A402 for ; Tue, 23 Jan 2007 11:00:09 +0000 (UTC) (envelope-from samm@os2.kiev.ua) Received: from em.volia.net (em.volia.net [82.144.192.9]) by mx1.freebsd.org (Postfix) with ESMTP id 7984C13C4C1 for ; Tue, 23 Jan 2007 11:00:08 +0000 (UTC) (envelope-from samm@os2.kiev.ua) Received: from graduately-missile.volia.net ([77.122.233.137] helo=localhost.local) by em.volia.net with esmtp (Exim 4.63 (FreeBSD)) (envelope-from ) id 1H96md-000IOE-9D; Mon, 22 Jan 2007 23:32:55 +0200 Received: from localhost.local (localhost.local [127.0.0.1]) by localhost.local (8.13.8/8.13.8) with ESMTP id l0MLWtie004205; Mon, 22 Jan 2007 23:32:55 +0200 (EET) (envelope-from samm@localhost.local) Received: (from samm@localhost) by localhost.local (8.13.8/8.13.8/Submit) id l0MLWsGP004204; Mon, 22 Jan 2007 23:32:54 +0200 (EET) (envelope-from samm) Message-Id: <200701222132.l0MLWsGP004204@localhost.local> Date: Mon, 22 Jan 2007 23:32:54 +0200 (EET) From: Alex Samorukov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Alex Samorukov Subject: ports/108240: [MAINTAINER] www/awstats: update to 6.6 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: Tue, 23 Jan 2007 11:00:37 -0000 >Number: 108240 >Category: ports >Synopsis: [MAINTAINER] www/awstats: update to 6.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jan 23 11:00:36 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Alex Samorukov >Release: FreeBSD 6.2-RELEASE i386 >Organization: >Environment: System: FreeBSD samm.local 6.2-RELEASE FreeBSD 6.2-RELEASE #1: Tue Jan 16 00:17:50 EET 2007 >Description: - Update to 6.6 Removed file(s): - files/patch-awstats.pl-security Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- awstats-6.6,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/awstats/Makefile /usr/home/samm/src/ports/awstats/Makefile --- /usr/ports/www/awstats/Makefile Thu Nov 2 21:57:52 2006 +++ /usr/home/samm/src/ports/awstats/Makefile Sun Jan 21 23:00:26 2007 @@ -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 @@ ${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 @@ ${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 -ruN --exclude=CVS /usr/ports/www/awstats/distinfo /usr/home/samm/src/ports/awstats/distinfo --- /usr/ports/www/awstats/distinfo Wed Jun 7 08:44:44 2006 +++ /usr/home/samm/src/ports/awstats/distinfo Sun Jan 21 22:51:59 2007 @@ -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 -ruN --exclude=CVS /usr/ports/www/awstats/files/patch-awstats.pl-security /usr/home/samm/src/ports/awstats/files/patch-awstats.pl-security --- /usr/ports/www/awstats/files/patch-awstats.pl-security Thu Nov 2 11:22:26 2006 +++ /usr/home/samm/src/ports/awstats/files/patch-awstats.pl-security Thu Jan 1 03:00:00 1970 @@ -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//>/g; -+ $stringtoclean =~ s/|//g; - return $stringtoclean; - } - -@@ -5534,7 +5546,7 @@ - $QueryString =~ s/&/&/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 =~ /(^|-|&|&)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 =~ /(^|&|&)databasebreak=(\w+)/i) { $DatabaseBreak=$2; } - if ($QueryString =~ /(^|&|&)updatefor=(\d+)/i) { $UpdateFor=$2; } - if ($QueryString =~ /(^|&|&)noloadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=1; } } --#Removed for security reasons --#if ($QueryString =~ /(^|&|&)loadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=-1; } } - if ($QueryString =~ /(^|&|&)limitflush=(\d+)/i) { $LIMITFLUSH=$2; } - # Get/Define output - if ($QueryString =~ /(^|&|&)output(=[^&]*|)(.*)(&|&)output(=[^&]*|)(&|$)/i) { error("Only 1 output option is allowed","","",1); } diff -ruN --exclude=CVS /usr/ports/www/awstats/pkg-plist /usr/home/samm/src/ports/awstats/pkg-plist --- /usr/ports/www/awstats/pkg-plist Wed Jun 7 08:44:44 2006 +++ /usr/home/samm/src/ports/awstats/pkg-plist Sun Jan 21 23:08:03 2007 @@ -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-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/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/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/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/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/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 --- awstats-6.6,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: