Changes 7.6:

- Security fix: "|" not allowed into DirLang parameter.
- Security fix: More restrictive rule for using AWSTATS_ENABLE_CONFIG_DIR.
- Update robots database.
- Fix OS database.
- Update/fix of documentation.
- Add missing country flag for "el".
- Add partial support for pure-ftpd stats format in method field.
- Add support for macOS Sierra.
- Add web fonts to default NotPageList, add support for GPX and JSON files

5 files changed, 30 insertions, 44 deletions

diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 049cdcc2f1d..4501dabdba8 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2016/07/09 06:39:11 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2017/02/12 10:27:41 adam Exp $
 
-DISTNAME=	awstats-7.5
-PKGREVISION=	1
+DISTNAME=	awstats-7.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.awstats.org/files/
 
@@ -10,8 +9,12 @@ HOMEPAGE=	http://www.awstats.org/
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 LICENSE=	gnu-gpl-v3
 
-NO_BUILD=		yes
+DEPENDS+=	p5-Geo-IPfree-[0-9]*:../../net/p5-Geo-IPfree
+DEPENDS+=	p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
+DEPENDS+=	p5-Net-XWhois-[0-9]*:../../net/p5-Net-XWhois
+DEPENDS+=	p5-Time-Local-[0-9]*:../../time/p5-Time-Local
 
+NO_BUILD=		yes
 USE_TOOLS+=		perl:run pax
 REPLACE_PERL+=		tools/*.pl
 REPLACE_PERL+=		wwwroot/cgi-bin/*.pl
@@ -19,7 +22,6 @@ REPLACE_PERL+=		wwwroot/cgi-bin/plugins/*.pm
 REPLACE_PERL+=		wwwroot/classes/src/*.pl
 
 .include "../../mk/bsd.prefs.mk"
-.include "options.mk"
 
 APACHE_USER?=	www
 APACHE_GROUP?=	www
diff --git a/www/awstats/PLIST b/www/awstats/PLIST
index 3f6a1d40192..8f411471b8a 100644
--- a/www/awstats/PLIST
+++ b/www/awstats/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2016/05/09 17:55:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2017/02/12 10:27:41 adam Exp $
 awstats/bin/awstats_buildstaticpages.pl
 awstats/bin/awstats_configure.pl
 awstats/bin/awstats_exportlib.pl
@@ -347,6 +347,7 @@ awstats/icon/flags/edu.png
 awstats/icon/flags/ee.png
 awstats/icon/flags/eg.png
 awstats/icon/flags/eh.png
+awstats/icon/flags/el.png
 awstats/icon/flags/en.png
 awstats/icon/flags/er.png
 awstats/icon/flags/es.png
@@ -554,11 +555,14 @@ awstats/icon/mime/document.png
 awstats/icon/mime/dotnet.png
 awstats/icon/mime/encrypt.png
 awstats/icon/mime/flash.png
+awstats/icon/mime/fon.png
 awstats/icon/mime/glasses.png
+awstats/icon/mime/gpx.png
 awstats/icon/mime/html.png
 awstats/icon/mime/image.png
 awstats/icon/mime/jnlp.png
 awstats/icon/mime/jscript.png
+awstats/icon/mime/json.png
 awstats/icon/mime/library.png
 awstats/icon/mime/lit.png
 awstats/icon/mime/mdb.png
@@ -639,6 +643,7 @@ awstats/icon/os/macintosh.png
 awstats/icon/os/macosx.png
 awstats/icon/os/macosx10.png
 awstats/icon/os/macosx11.png
+awstats/icon/os/macosx12.png
 awstats/icon/os/macosx4.png
 awstats/icon/os/macosx5.png
 awstats/icon/os/macosx6.png
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index 7531c806586..3301bcaa69c 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.36 2016/05/09 17:55:35 adam Exp $
+$NetBSD: distinfo,v 1.37 2017/02/12 10:27:41 adam Exp $
 
-SHA1 (awstats-7.5.tar.gz) = ee1483ee76f7d54d75b575761969b4c2232bb098
-RMD160 (awstats-7.5.tar.gz) = c7367f3fb9f8dc9a6154240c93dc5cebceaacaf8
-SHA512 (awstats-7.5.tar.gz) = d69a66b5ef94d8a7378ece0453a3617f71ad030d81c45cff926fae1319eacdcdcbe2e68513153cd7444d77cbb950827964b0157ce74c04be76781c071f016a35
-Size (awstats-7.5.tar.gz) = 2936644 bytes
+SHA1 (awstats-7.6.tar.gz) = de0f4842442cbbbfbff61301ff30ca7788dda8a1
+RMD160 (awstats-7.6.tar.gz) = 62e7b046d1c9e40c91889a9109a59fbebb27a506
+SHA512 (awstats-7.6.tar.gz) = ebce29dcbdc1f0eef68f1faf6a511212daba3e3621db682dce692dffa584e0c456fb260b9f8e1b7ac25a2a7d5d2bea5034692d2395d4e56a16fa5a36844c79d5
+Size (awstats-7.6.tar.gz) = 2955876 bytes
 SHA1 (patch-aa) = dcd1f70c0196118c57daf22eb41663be675ae4ad
 SHA1 (patch-ab) = 5108717a44d993baea7a98e7c3e791e3be766c6c
-SHA1 (patch-ad) = bb6b1565c6426ff2a2e529c92aaa76fa0baaa1e3
+SHA1 (patch-ad) = f82ee8731bd15d3c956cca6437552df2036190f6
diff --git a/www/awstats/options.mk b/www/awstats/options.mk
deleted file mode 100644
index 96b406d1956..00000000000
--- a/www/awstats/options.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2017/01/27 12:11:13 roy Exp $
-
-PKG_OPTIONS_VAR=        PKG_OPTIONS.awstats
-
-PKG_SUPPORTED_OPTIONS=  geoip whois
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Use the Geo IP Free module
-###
-.if !empty(PKG_OPTIONS:Mgeoip)
-DEPENDS+=       p5-Geo-IPfree-[0-9]*:../../net/p5-Geo-IPfree
-.endif
-
-###
-### Optional Whois support
-###
-.if !empty(PKG_OPTIONS:Mwhois)
-DEPENDS+=       p5-Net-XWhois-[0-9]*:../../net/p5-Net-XWhois
-.endif
diff --git a/www/awstats/patches/patch-ad b/www/awstats/patches/patch-ad
index 5035186a851..82e72a766e5 100644
--- a/www/awstats/patches/patch-ad
+++ b/www/awstats/patches/patch-ad
@@ -1,15 +1,15 @@
-$NetBSD: patch-ad,v 1.4 2016/05/09 17:55:35 adam Exp $
+$NetBSD: patch-ad,v 1.5 2017/02/12 10:27:41 adam Exp $
 
 Fix ampersand encoding that breaks XHTML output, ID 1824230.
 
---- wwwroot/cgi-bin/lib/search_engines.pm.orig	2016-04-29 09:44:16.000000000 +0000
+--- wwwroot/cgi-bin/lib/search_engines.pm.orig	2016-09-22 19:07:19.000000000 +0000
 +++ wwwroot/cgi-bin/lib/search_engines.pm
-@@ -1264,7 +1264,7 @@
- 'excite','<a href="http://www.excite.com/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Excite</a>',
- # Minor international search engines
- 'google4counter','<a href="http://www.4-counter.com/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">4-counter (Google)</a>',
--'att','<a href="http://www.att.net/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">AT&T search (powered by Google)</a>',
-+'att','<a href="http://www.att.net/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">AT&amp;T search (powered by Google)</a>',
- 'bungeebonesdotcom','<a href="http://BungeeBones.com/search.php/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">BungeeBones</a>',
- 'go','Go.com',
- 'askde','<a href="http://de.ask.com/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Ask Deutschland</a>',
+@@ -5084,7 +5084,7 @@
+ 'atlanticbb','atlanticbb',

+ 'atlas','Atlas.cz',

+ 'atomz','Atomz',

+-'att','<a href="http://www.att.net/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">AT&T search (powered by Google)</a>',

++'att','<a href="http://www.att.net/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">AT&amp;T search (powered by Google)</a>',

+ 'auone','auone',

+ 'avantfind','<a href="http://www.avantfind.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Avantfind</a>',

+ 'avg','avg',