Changes 7.1.1:

New features:
- Add windows 8 detection
- Add support of %time5 for iso date times.
- Fix problems with Perl 5.14

7 files changed, 29 insertions, 86 deletions

diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 03f070e3191..fb605879515 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2012/10/28 06:30:10 asau Exp $
+# $NetBSD: Makefile,v 1.51 2013/04/27 11:19:38 adam Exp $
 
-DISTNAME=	awstats-7.1
-PKGREVISION=	1
+DISTNAME=	awstats-7.1.1
 CATEGORIES=	www
 MASTER_SITES=	http://www.awstats.org/files/
 
@@ -10,8 +9,6 @@ HOMEPAGE=	http://www.awstats.org/
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 LICENSE=	gnu-gpl-v2
 
-DIST_SUBDIR=		${PKGNAME_NOREV}
-
 NO_BUILD=		yes
 
 USE_TOOLS+=		perl:run pax
diff --git a/www/awstats/PLIST b/www/awstats/PLIST
index 254c04a412b..4a857ecc534 100644
--- a/www/awstats/PLIST
+++ b/www/awstats/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2012/07/20 14:11:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2013/04/27 11:19:38 adam Exp $
 awstats/bin/awstats_buildstaticpages.pl
 awstats/bin/awstats_configure.pl
 awstats/bin/awstats_exportlib.pl
@@ -7,6 +7,7 @@ awstats/bin/geoip_generator.pl
 awstats/bin/logresolvemerge.pl
 awstats/bin/maillogconvert.pl
 awstats/bin/urlaliasbuilder.pl
+awstats/cgi-bin/awdownloadcsv.pl
 awstats/cgi-bin/awredir.pl
 awstats/cgi-bin/awstats.pl
 awstats/cgi-bin/lang/awstats-al.txt
@@ -290,6 +291,7 @@ awstats/icon/flags/as.png
 awstats/icon/flags/at.png
 awstats/icon/flags/au.png
 awstats/icon/flags/aw.png
+awstats/icon/flags/ax.png
 awstats/icon/flags/az.png
 awstats/icon/flags/ba.png
 awstats/icon/flags/bb.png
@@ -362,6 +364,7 @@ awstats/icon/flags/gb.png
 awstats/icon/flags/gd.png
 awstats/icon/flags/ge.png
 awstats/icon/flags/gf.png
+awstats/icon/flags/gg.png
 awstats/icon/flags/gh.png
 awstats/icon/flags/gi.png
 awstats/icon/flags/gl.png
@@ -425,6 +428,7 @@ awstats/icon/flags/ly.png
 awstats/icon/flags/ma.png
 awstats/icon/flags/mc.png
 awstats/icon/flags/md.png
+awstats/icon/flags/me.png
 awstats/icon/flags/mg.png
 awstats/icon/flags/mil.png
 awstats/icon/flags/mk.png
@@ -489,6 +493,7 @@ awstats/icon/flags/se.png
 awstats/icon/flags/sg.png
 awstats/icon/flags/si.png
 awstats/icon/flags/sk.png
+awstats/icon/flags/sl.png
 awstats/icon/flags/sm.png
 awstats/icon/flags/sn.png
 awstats/icon/flags/sr.png
@@ -627,6 +632,12 @@ awstats/icon/os/linuxzenwalk.png
 awstats/icon/os/mac.png
 awstats/icon/os/macintosh.png
 awstats/icon/os/macosx.png
+awstats/icon/os/macosx4.png
+awstats/icon/os/macosx5.png
+awstats/icon/os/macosx6.png
+awstats/icon/os/macosx7.png
+awstats/icon/os/macosx8.png
+awstats/icon/os/macosx9.png
 awstats/icon/os/netbsd.png
 awstats/icon/os/netware.png
 awstats/icon/os/next.png
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index 97cf8da9de4..37ddc5082f9 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.31 2012/07/20 14:11:04 adam Exp $
+$NetBSD: distinfo,v 1.32 2013/04/27 11:19:38 adam Exp $
 
-SHA1 (awstats-7.1/awstats-7.1.tar.gz) = edabc12bc44a701cd7bb0516002f9e016a5aaac0
-RMD160 (awstats-7.1/awstats-7.1.tar.gz) = bff81df6b8e54a77aacca03a74b7c4e3711e8663
-Size (awstats-7.1/awstats-7.1.tar.gz) = 1256030 bytes
-SHA1 (patch-aa) = fcbd1e95612891e31f996bbfc4ebb88ddb29eac7
-SHA1 (patch-ab) = 9ae474058a1803c1132b36448c1a6987c58e8823
-SHA1 (patch-ad) = 9c08fff3fcc3871a08c73c9509fbeb5baca06c09
-SHA1 (patch-wwwroot_cgi-bin_awredir.pl) = 3e3a41ab4bfbe633f78af182f5d2692bd678595d
+SHA1 (awstats-7.1.1.tar.gz) = 01acacae845e7b0a2cdc463c2b372111d0b48c7c
+RMD160 (awstats-7.1.1.tar.gz) = 81ae7375ba524c97319aa785d8e28bb74ec4ca86
+Size (awstats-7.1.1.tar.gz) = 1261038 bytes
+SHA1 (patch-aa) = dcd1f70c0196118c57daf22eb41663be675ae4ad
+SHA1 (patch-ab) = 5108717a44d993baea7a98e7c3e791e3be766c6c
+SHA1 (patch-ad) = 9d112a0a6f3805cdc261baa942187e8bd7664584
diff --git a/www/awstats/patches/patch-aa b/www/awstats/patches/patch-aa
index 76e0560e60b..19de55ad3e3 100644
--- a/www/awstats/patches/patch-aa
+++ b/www/awstats/patches/patch-aa
@@ -1,20 +1,10 @@
-$NetBSD: patch-aa,v 1.11 2012/02/13 22:34:38 gls Exp $
+$NetBSD: patch-aa,v 1.12 2013/04/27 11:19:38 adam Exp $
 
 Check for configdir.
-Fix behavior with perl 5.14: http://sourceforge.net/tracker/index.php?func=detail&aid=3311848&group_id=13764&atid=113764
 
---- wwwroot/cgi-bin/awstats.pl.orig	2010-10-16 17:24:03.000000000 +0000
+--- wwwroot/cgi-bin/awstats.pl.orig	2013-03-08 20:16:52.000000000 +0000
 +++ wwwroot/cgi-bin/awstats.pl
-@@ -1354,7 +1354,7 @@ sub debug {
- sub OptimizeArray {
- 	my $array = shift;
- 	my @arrayunreg = map {
--		if (/\(\?[-\w]*:(.*)\)/) { $1 }
-+		if (/\(\?[-^\w]*:(.*)\)/) { $1 }
- 	} @$array;
- 	my $notcasesensitive = shift;
- 	my $searchlist       = 0;
-@@ -1717,7 +1717,7 @@ sub Read_Config {
+@@ -1713,7 +1713,7 @@ sub Read_Config {
  			"/etc/opt/awstats"
  		); 
  
@@ -23,12 +13,3 @@ Fix behavior with perl 5.14: http://sourceforge.net/tracker/index.php?func=detai
  		# Check if configdir is outside default values.
  		my $outsidedefaultvalue=1;
  		foreach (@PossibleConfigDir) {
-@@ -7809,7 +7809,7 @@ sub DecodeEncodedString {
- # Return:		standardregex
- #------------------------------------------------------------------------------
- sub UnCompileRegex {
--	shift =~ /\(\?[-\w]*:(.*)\)/;
-+	shift =~ /\(\?[-^\w]*:(.*)\)/;
- 	return $1;
- }
- 
diff --git a/www/awstats/patches/patch-ab b/www/awstats/patches/patch-ab
index cb09992b048..76a44240612 100644
--- a/www/awstats/patches/patch-ab
+++ b/www/awstats/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2009/01/15 12:12:04 adam Exp $
+$NetBSD: patch-ab,v 1.7 2013/04/27 11:19:39 adam Exp $
+
+Fix paths.
 
 --- tools/awstats_configure.pl.orig	2008-04-06 15:45:24.000000000 +0200
 +++ tools/awstats_configure.pl
diff --git a/www/awstats/patches/patch-ad b/www/awstats/patches/patch-ad
index f192a117937..931e5f0ff54 100644
--- a/www/awstats/patches/patch-ad
+++ b/www/awstats/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.1 2010/02/02 11:20:29 fhajny Exp $
+$NetBSD: patch-ad,v 1.2 2013/04/27 11:19:39 adam Exp $
 
 Fix ampersand encoding that breaks XHTML output, ID 1824230.
 
 --- wwwroot/cgi-bin/lib/search_engines.pm.orig	2008-11-15 14:58:02.000000000 +0000
 +++ wwwroot/cgi-bin/lib/search_engines.pm
-@@ -904,7 +904,7 @@
+@@ -914,7 +914,7 @@
  'excite','<a href="http://www.excite.com/" title="Search Engine Home Page [new window]" target="_blank">Excite</a>',
  # Minor international search engines
  'google4counter','<a href="http://www.4-counter.com/" title="Search Engine Home Page [new window]" target="_blank">4-counter (Google)</a>',
diff --git a/www/awstats/patches/patch-wwwroot_cgi-bin_awredir.pl b/www/awstats/patches/patch-wwwroot_cgi-bin_awredir.pl
deleted file mode 100644
index 0ada11d3fd8..00000000000
--- a/www/awstats/patches/patch-wwwroot_cgi-bin_awredir.pl
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-wwwroot_cgi-bin_awredir.pl,v 1.1 2012/02/05 23:58:07 minskim Exp $
-
-Security fix for http://secunia.com/advisories/46160/
-
---- wwwroot/cgi-bin/awredir.pl.orig	2009-01-03 10:42:04.000000000 +0000
-+++ wwwroot/cgi-bin/awredir.pl
-@@ -73,6 +73,27 @@ sub DecodeEncodedString {
- 	return $stringtodecode;
- }
- 
-+#------------------------------------------------------------------------------
-+# Function:     Clean a string of HTML tags to avoid 'Cross Site Scripting attacks'
-+#               and clean | char.
-+# Parameters:   stringtoclean
-+# Input:        None
-+# Output:       None
-+# Return:		cleanedstring
-+#------------------------------------------------------------------------------
-+sub CleanXSS {
-+	my $stringtoclean = shift;
-+
-+	# To avoid html tags and javascript
-+	$stringtoclean =~ s/</&lt;/g;
-+	$stringtoclean =~ s/>/&gt;/g;
-+	$stringtoclean =~ s/|//g;
-+
-+	# To avoid onload="
-+	$stringtoclean =~ s/onload//g;
-+	return $stringtoclean;
-+}
-+
- 
- #-------------------------------------------------------
- # MAIN
-@@ -124,6 +145,12 @@ elsif ($Url =~ /url=(.+)$/) { $Url=$1; }
- $Url = DecodeEncodedString($Url);
- $UrlParam=$Url;
- 
-+# Sanitize parameters
-+$Tag=CleanXSS($Tag);
-+$Key=CleanXSS($Key);
-+$UrlParam=CleanXSS($UrlParam);
-+
-+
- if (! $UrlParam) {
-         error("Error: Bad use of $PROG. To redirect an URL with $PROG, use the following syntax:<br><i>/cgi-bin/$PROG.pl?url=http://urltogo</i>");
- }