Sun Feb 12 10:27:41 2017 UTC ()
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


(adam)
diff -r1.59 -r1.60 pkgsrc/www/awstats/Makefile
diff -r1.23 -r1.24 pkgsrc/www/awstats/PLIST
diff -r1.36 -r1.37 pkgsrc/www/awstats/distinfo
diff -r1.3 -r0 pkgsrc/www/awstats/options.mk
diff -r1.4 -r1.5 pkgsrc/www/awstats/patches/patch-ad
cvs diff -r1.59 -r1.60 pkgsrc/www/awstats/Makefile (expand / switch to unified diff)

--- pkgsrc/www/awstats/Makefile 2016/07/09 06:39:11 1.59
+++ pkgsrc/www/awstats/Makefile 2017/02/12 10:27:41 1.60
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: Makefile,v 1.59 2016/07/09 06:39:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.60 2017/02/12 10:27:41 adam Exp $
2 2
3DISTNAME= awstats-7.5 3DISTNAME= awstats-7.6
4PKGREVISION= 1 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= http://www.awstats.org/files/ 5MASTER_SITES= http://www.awstats.org/files/
7 6
8MAINTAINER= minskim@NetBSD.org 7MAINTAINER= minskim@NetBSD.org
9HOMEPAGE= http://www.awstats.org/ 8HOMEPAGE= http://www.awstats.org/
10COMMENT= Free real-time logfile analyzer to get advanced web statistics 9COMMENT= Free real-time logfile analyzer to get advanced web statistics
11LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
12 11
13NO_BUILD= yes 12DEPENDS+= p5-Geo-IPfree-[0-9]*:../../net/p5-Geo-IPfree
 13DEPENDS+= p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
 14DEPENDS+= p5-Net-XWhois-[0-9]*:../../net/p5-Net-XWhois
 15DEPENDS+= p5-Time-Local-[0-9]*:../../time/p5-Time-Local
14 16
 17NO_BUILD= yes
15USE_TOOLS+= perl:run pax 18USE_TOOLS+= perl:run pax
16REPLACE_PERL+= tools/*.pl 19REPLACE_PERL+= tools/*.pl
17REPLACE_PERL+= wwwroot/cgi-bin/*.pl 20REPLACE_PERL+= wwwroot/cgi-bin/*.pl
18REPLACE_PERL+= wwwroot/cgi-bin/plugins/*.pm 21REPLACE_PERL+= wwwroot/cgi-bin/plugins/*.pm
19REPLACE_PERL+= wwwroot/classes/src/*.pl 22REPLACE_PERL+= wwwroot/classes/src/*.pl
20 23
21.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
22.include "options.mk" 
23 25
24APACHE_USER?= www 26APACHE_USER?= www
25APACHE_GROUP?= www 27APACHE_GROUP?= www
26 28
27PKG_GROUPS_VARS+= APACHE_GROUP 29PKG_GROUPS_VARS+= APACHE_GROUP
28PKG_USERS_VARS= APACHE_USER 30PKG_USERS_VARS= APACHE_USER
29BUILD_DEFS+= VARBASE 31BUILD_DEFS+= VARBASE
30 32
31#OWN_DIRS= ${VARBASE}/awstats 33#OWN_DIRS= ${VARBASE}/awstats
32OWN_DIRS_PERMS+= ${VARBASE}/awstats ${APACHE_USER} ${APACHE_GROUP} 0700 34OWN_DIRS_PERMS+= ${VARBASE}/awstats ${APACHE_USER} ${APACHE_GROUP} 0700
33PKG_SYSCONFSUBDIR= awstats 35PKG_SYSCONFSUBDIR= awstats
34 36
35SUBST_CLASSES+= conf 37SUBST_CLASSES+= conf
cvs diff -r1.23 -r1.24 pkgsrc/www/awstats/PLIST (expand / switch to unified diff)

--- pkgsrc/www/awstats/PLIST 2016/05/09 17:55:35 1.23
+++ pkgsrc/www/awstats/PLIST 2017/02/12 10:27:41 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.23 2016/05/09 17:55:35 adam Exp $ 1@comment $NetBSD: PLIST,v 1.24 2017/02/12 10:27:41 adam Exp $
2awstats/bin/awstats_buildstaticpages.pl 2awstats/bin/awstats_buildstaticpages.pl
3awstats/bin/awstats_configure.pl 3awstats/bin/awstats_configure.pl
4awstats/bin/awstats_exportlib.pl 4awstats/bin/awstats_exportlib.pl
5awstats/bin/awstats_updateall.pl 5awstats/bin/awstats_updateall.pl
6awstats/bin/geoip_generator.pl 6awstats/bin/geoip_generator.pl
7awstats/bin/logresolvemerge.pl 7awstats/bin/logresolvemerge.pl
8awstats/bin/maillogconvert.pl 8awstats/bin/maillogconvert.pl
9awstats/bin/urlaliasbuilder.pl 9awstats/bin/urlaliasbuilder.pl
10awstats/cgi-bin/awdownloadcsv.pl 10awstats/cgi-bin/awdownloadcsv.pl
11awstats/cgi-bin/awredir.pl 11awstats/cgi-bin/awredir.pl
12awstats/cgi-bin/awstats.pl 12awstats/cgi-bin/awstats.pl
13awstats/cgi-bin/lang/awstats-al.txt 13awstats/cgi-bin/lang/awstats-al.txt
14awstats/cgi-bin/lang/awstats-ar.txt 14awstats/cgi-bin/lang/awstats-ar.txt
@@ -337,26 +337,27 @@ awstats/icon/flags/cx.png @@ -337,26 +337,27 @@ awstats/icon/flags/cx.png
337awstats/icon/flags/cy.png 337awstats/icon/flags/cy.png
338awstats/icon/flags/cz.png 338awstats/icon/flags/cz.png
339awstats/icon/flags/de.png 339awstats/icon/flags/de.png
340awstats/icon/flags/dj.png 340awstats/icon/flags/dj.png
341awstats/icon/flags/dk.png 341awstats/icon/flags/dk.png
342awstats/icon/flags/dm.png 342awstats/icon/flags/dm.png
343awstats/icon/flags/do.png 343awstats/icon/flags/do.png
344awstats/icon/flags/dz.png 344awstats/icon/flags/dz.png
345awstats/icon/flags/ec.png 345awstats/icon/flags/ec.png
346awstats/icon/flags/edu.png 346awstats/icon/flags/edu.png
347awstats/icon/flags/ee.png 347awstats/icon/flags/ee.png
348awstats/icon/flags/eg.png 348awstats/icon/flags/eg.png
349awstats/icon/flags/eh.png 349awstats/icon/flags/eh.png
 350awstats/icon/flags/el.png
350awstats/icon/flags/en.png 351awstats/icon/flags/en.png
351awstats/icon/flags/er.png 352awstats/icon/flags/er.png
352awstats/icon/flags/es.png 353awstats/icon/flags/es.png
353awstats/icon/flags/es_cat.png 354awstats/icon/flags/es_cat.png
354awstats/icon/flags/es_eu.png 355awstats/icon/flags/es_eu.png
355awstats/icon/flags/et.png 356awstats/icon/flags/et.png
356awstats/icon/flags/eu.png 357awstats/icon/flags/eu.png
357awstats/icon/flags/fi.png 358awstats/icon/flags/fi.png
358awstats/icon/flags/fj.png 359awstats/icon/flags/fj.png
359awstats/icon/flags/fk.png 360awstats/icon/flags/fk.png
360awstats/icon/flags/fm.png 361awstats/icon/flags/fm.png
361awstats/icon/flags/fo.png 362awstats/icon/flags/fo.png
362awstats/icon/flags/fr.png 363awstats/icon/flags/fr.png
@@ -544,31 +545,34 @@ awstats/icon/flags/ze.png @@ -544,31 +545,34 @@ awstats/icon/flags/ze.png
544awstats/icon/flags/zm.png 545awstats/icon/flags/zm.png
545awstats/icon/flags/zw.png 546awstats/icon/flags/zw.png
546awstats/icon/mime/ai.png 547awstats/icon/mime/ai.png
547awstats/icon/mime/archive.png 548awstats/icon/mime/archive.png
548awstats/icon/mime/audio.png 549awstats/icon/mime/audio.png
549awstats/icon/mime/crystal.png 550awstats/icon/mime/crystal.png
550awstats/icon/mime/css.png 551awstats/icon/mime/css.png
551awstats/icon/mime/csv.png 552awstats/icon/mime/csv.png
552awstats/icon/mime/doc.png 553awstats/icon/mime/doc.png
553awstats/icon/mime/document.png 554awstats/icon/mime/document.png
554awstats/icon/mime/dotnet.png 555awstats/icon/mime/dotnet.png
555awstats/icon/mime/encrypt.png 556awstats/icon/mime/encrypt.png
556awstats/icon/mime/flash.png 557awstats/icon/mime/flash.png
 558awstats/icon/mime/fon.png
557awstats/icon/mime/glasses.png 559awstats/icon/mime/glasses.png
 560awstats/icon/mime/gpx.png
558awstats/icon/mime/html.png 561awstats/icon/mime/html.png
559awstats/icon/mime/image.png 562awstats/icon/mime/image.png
560awstats/icon/mime/jnlp.png 563awstats/icon/mime/jnlp.png
561awstats/icon/mime/jscript.png 564awstats/icon/mime/jscript.png
 565awstats/icon/mime/json.png
562awstats/icon/mime/library.png 566awstats/icon/mime/library.png
563awstats/icon/mime/lit.png 567awstats/icon/mime/lit.png
564awstats/icon/mime/mdb.png 568awstats/icon/mime/mdb.png
565awstats/icon/mime/notavailable.png 569awstats/icon/mime/notavailable.png
566awstats/icon/mime/ooffice.png 570awstats/icon/mime/ooffice.png
567awstats/icon/mime/other.png 571awstats/icon/mime/other.png
568awstats/icon/mime/package.png 572awstats/icon/mime/package.png
569awstats/icon/mime/page.png 573awstats/icon/mime/page.png
570awstats/icon/mime/pdf.png 574awstats/icon/mime/pdf.png
571awstats/icon/mime/php.png 575awstats/icon/mime/php.png
572awstats/icon/mime/phshop.png 576awstats/icon/mime/phshop.png
573awstats/icon/mime/pl.png 577awstats/icon/mime/pl.png
574awstats/icon/mime/ppt.png 578awstats/icon/mime/ppt.png
@@ -629,26 +633,27 @@ awstats/icon/os/linuxfedora.png @@ -629,26 +633,27 @@ awstats/icon/os/linuxfedora.png
629awstats/icon/os/linuxgentoo.png 633awstats/icon/os/linuxgentoo.png
630awstats/icon/os/linuxmandr.png 634awstats/icon/os/linuxmandr.png
631awstats/icon/os/linuxpclinuxos.png 635awstats/icon/os/linuxpclinuxos.png
632awstats/icon/os/linuxredhat.png 636awstats/icon/os/linuxredhat.png
633awstats/icon/os/linuxsuse.png 637awstats/icon/os/linuxsuse.png
634awstats/icon/os/linuxubuntu.png 638awstats/icon/os/linuxubuntu.png
635awstats/icon/os/linuxvine.png 639awstats/icon/os/linuxvine.png
636awstats/icon/os/linuxzenwalk.png 640awstats/icon/os/linuxzenwalk.png
637awstats/icon/os/mac.png 641awstats/icon/os/mac.png
638awstats/icon/os/macintosh.png 642awstats/icon/os/macintosh.png
639awstats/icon/os/macosx.png 643awstats/icon/os/macosx.png
640awstats/icon/os/macosx10.png 644awstats/icon/os/macosx10.png
641awstats/icon/os/macosx11.png 645awstats/icon/os/macosx11.png
 646awstats/icon/os/macosx12.png
642awstats/icon/os/macosx4.png 647awstats/icon/os/macosx4.png
643awstats/icon/os/macosx5.png 648awstats/icon/os/macosx5.png
644awstats/icon/os/macosx6.png 649awstats/icon/os/macosx6.png
645awstats/icon/os/macosx7.png 650awstats/icon/os/macosx7.png
646awstats/icon/os/macosx8.png 651awstats/icon/os/macosx8.png
647awstats/icon/os/macosx9.png 652awstats/icon/os/macosx9.png
648awstats/icon/os/netbsd.png 653awstats/icon/os/netbsd.png
649awstats/icon/os/netware.png 654awstats/icon/os/netware.png
650awstats/icon/os/next.png 655awstats/icon/os/next.png
651awstats/icon/os/openbsd.png 656awstats/icon/os/openbsd.png
652awstats/icon/os/os2.png 657awstats/icon/os/os2.png
653awstats/icon/os/osf.png 658awstats/icon/os/osf.png
654awstats/icon/os/palmos.png 659awstats/icon/os/palmos.png
cvs diff -r1.36 -r1.37 pkgsrc/www/awstats/distinfo (expand / switch to unified diff)

--- pkgsrc/www/awstats/distinfo 2016/05/09 17:55:35 1.36
+++ pkgsrc/www/awstats/distinfo 2017/02/12 10:27:41 1.37
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.36 2016/05/09 17:55:35 adam Exp $ 1$NetBSD: distinfo,v 1.37 2017/02/12 10:27:41 adam Exp $
2 2
3SHA1 (awstats-7.5.tar.gz) = ee1483ee76f7d54d75b575761969b4c2232bb098 3SHA1 (awstats-7.6.tar.gz) = de0f4842442cbbbfbff61301ff30ca7788dda8a1
4RMD160 (awstats-7.5.tar.gz) = c7367f3fb9f8dc9a6154240c93dc5cebceaacaf8 4RMD160 (awstats-7.6.tar.gz) = 62e7b046d1c9e40c91889a9109a59fbebb27a506
5SHA512 (awstats-7.5.tar.gz) = d69a66b5ef94d8a7378ece0453a3617f71ad030d81c45cff926fae1319eacdcdcbe2e68513153cd7444d77cbb950827964b0157ce74c04be76781c071f016a35 5SHA512 (awstats-7.6.tar.gz) = ebce29dcbdc1f0eef68f1faf6a511212daba3e3621db682dce692dffa584e0c456fb260b9f8e1b7ac25a2a7d5d2bea5034692d2395d4e56a16fa5a36844c79d5
6Size (awstats-7.5.tar.gz) = 2936644 bytes 6Size (awstats-7.6.tar.gz) = 2955876 bytes
7SHA1 (patch-aa) = dcd1f70c0196118c57daf22eb41663be675ae4ad 7SHA1 (patch-aa) = dcd1f70c0196118c57daf22eb41663be675ae4ad
8SHA1 (patch-ab) = 5108717a44d993baea7a98e7c3e791e3be766c6c 8SHA1 (patch-ab) = 5108717a44d993baea7a98e7c3e791e3be766c6c
9SHA1 (patch-ad) = bb6b1565c6426ff2a2e529c92aaa76fa0baaa1e3 9SHA1 (patch-ad) = f82ee8731bd15d3c956cca6437552df2036190f6
File Deleted: pkgsrc/www/awstats/Attic/options.mk
cvs diff -r1.4 -r1.5 pkgsrc/www/awstats/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/www/awstats/patches/Attic/patch-ad 2016/05/09 17:55:35 1.4
+++ pkgsrc/www/awstats/patches/Attic/patch-ad 2017/02/12 10:27:41 1.5
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ad,v 1.4 2016/05/09 17:55:35 adam Exp $ 1$NetBSD: patch-ad,v 1.5 2017/02/12 10:27:41 adam Exp $
2 2
3Fix ampersand encoding that breaks XHTML output, ID 1824230. 3Fix ampersand encoding that breaks XHTML output, ID 1824230.
4 4
5--- wwwroot/cgi-bin/lib/search_engines.pm.orig 2016-04-29 09:44:16.000000000 +0000 5--- wwwroot/cgi-bin/lib/search_engines.pm.orig 2016-09-22 19:07:19.000000000 +0000
6+++ wwwroot/cgi-bin/lib/search_engines.pm 6+++ wwwroot/cgi-bin/lib/search_engines.pm
7@@ -1264,7 +1264,7 @@ 7@@ -5084,7 +5084,7 @@
8 'excite','<a href="http://www.excite.com/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Excite</a>', 8 'atlanticbb','atlanticbb',
9 # Minor international search engines 9 'atlas','Atlas.cz',
10 'google4counter','<a href="http://www.4-counter.com/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">4-counter (Google)</a>', 10 'atomz','Atomz',
11-'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>', 11-'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>',
12+'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>', 12+'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>',
13 'bungeebonesdotcom','<a href="http://BungeeBones.com/search.php/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">BungeeBones</a>', 13 'auone','auone',
14 'go','Go.com', 14 'avantfind','<a href="http://www.avantfind.com/" title="Search Engine Home Page [new window]" rel="nofollow" target="_blank">Avantfind</a>',
15 'askde','<a href="http://de.ask.com/" rel="nofollow" title="Search Engine Home Page [new window]" target="_blank">Ask Deutschland</a>', 15 'avg','avg',