Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6EA337A25E for ; Sun, 12 Feb 2017 10:27:43 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 1EE9A85589; Sun, 12 Feb 2017 10:27:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A37B28557B for ; Sun, 12 Feb 2017 10:27:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id rptXOVFPYrbO for ; Sun, 12 Feb 2017 10:27:42 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E7A0284CDF for ; Sun, 12 Feb 2017 10:27:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E6195FBE3; Sun, 12 Feb 2017 10:27:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148689526122950" MIME-Version: 1.0 Date: Sun, 12 Feb 2017 10:27:41 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/www/awstats To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20170212102741.E6195FBE3@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148689526122950 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sun Feb 12 10:27:41 UTC 2017 Modified Files: pkgsrc/www/awstats: Makefile PLIST distinfo pkgsrc/www/awstats/patches: patch-ad Removed Files: pkgsrc/www/awstats: options.mk Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/awstats/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/awstats/PLIST cvs rdiff -u -r1.36 -r1.37 pkgsrc/www/awstats/distinfo cvs rdiff -u -r1.3 -r0 pkgsrc/www/awstats/options.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/awstats/patches/patch-ad Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148689526122950 Content-Disposition: inline Content-Length: 6147 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/awstats/Makefile diff -u pkgsrc/www/awstats/Makefile:1.59 pkgsrc/www/awstats/Makefile:1.60 --- pkgsrc/www/awstats/Makefile:1.59 Sat Jul 9 06:39:11 2016 +++ pkgsrc/www/awstats/Makefile Sun Feb 12 10:27:41 2017 @@ -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/ REPLACE_PERL+= wwwroot/classes/src/*.pl .include "../../mk/bsd.prefs.mk" -.include "options.mk" APACHE_USER?= www APACHE_GROUP?= www Index: pkgsrc/www/awstats/PLIST diff -u pkgsrc/www/awstats/PLIST:1.23 pkgsrc/www/awstats/PLIST:1.24 --- pkgsrc/www/awstats/PLIST:1.23 Mon May 9 17:55:35 2016 +++ pkgsrc/www/awstats/PLIST Sun Feb 12 10:27:41 2017 @@ -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 Index: pkgsrc/www/awstats/distinfo diff -u pkgsrc/www/awstats/distinfo:1.36 pkgsrc/www/awstats/distinfo:1.37 --- pkgsrc/www/awstats/distinfo:1.36 Mon May 9 17:55:35 2016 +++ pkgsrc/www/awstats/distinfo Sun Feb 12 10:27:41 2017 @@ -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 Index: pkgsrc/www/awstats/patches/patch-ad diff -u pkgsrc/www/awstats/patches/patch-ad:1.4 pkgsrc/www/awstats/patches/patch-ad:1.5 --- pkgsrc/www/awstats/patches/patch-ad:1.4 Mon May 9 17:55:35 2016 +++ pkgsrc/www/awstats/patches/patch-ad Sun Feb 12 10:27:41 2017 @@ -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','Excite', - # Minor international search engines - 'google4counter','4-counter (Google)', --'att','AT&T search (powered by Google)', -+'att','AT&T search (powered by Google)', - 'bungeebonesdotcom','BungeeBones', - 'go','Go.com', - 'askde','Ask Deutschland', +@@ -5084,7 +5084,7 @@ + 'atlanticbb','atlanticbb', + 'atlas','Atlas.cz', + 'atomz','Atomz', +-'att','AT&T search (powered by Google)', ++'att','AT&T search (powered by Google)', + 'auone','auone', + 'avantfind','Avantfind', + 'avg','avg', --_----------=_148689526122950--