pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: [pkgsrc-2019Q4] pkgsrc/www/awstats
Module Name: pkgsrc
Committed By: bsiegert
Date: Mon Jan 27 12:48:57 UTC 2020
Modified Files:
pkgsrc/www/awstats [pkgsrc-2019Q4]: Makefile distinfo
Added Files:
pkgsrc/www/awstats/patches [pkgsrc-2019Q4]:
patch-tools_awstats__configure.pl patch-wwwroot_cgi-bin_awstats.pl
patch-wwwroot_cgi-bin_lib_search__engines.pm
Removed Files:
pkgsrc/www/awstats/patches [pkgsrc-2019Q4]: patch-aa patch-ab patch-ad
Log Message:
Pullup ticket #6126 - requested by taca
www/awstats: security fix
Revisions pulled up:
- www/awstats/Makefile 1.64
- www/awstats/distinfo 1.38
- www/awstats/patches/patch-aa deleted
- www/awstats/patches/patch-ab deleted
- www/awstats/patches/patch-ad deleted
- www/awstats/patches/patch-tools_awstats__configure.pl 1.1
- www/awstats/patches/patch-wwwroot_cgi-bin_awstats.pl 1.1
- www/awstats/patches/patch-wwwroot_cgi-bin_lib_search__engines.pm 1.1
---
Module Name: pkgsrc
Committed By: adam
Date: Tue Jan 7 18:21:02 UTC 2020
Modified Files:
pkgsrc/www/awstats: Makefile distinfo
Added Files:
pkgsrc/www/awstats/patches: patch-tools_awstats__configure.pl
patch-wwwroot_cgi-bin_awstats.pl
patch-wwwroot_cgi-bin_lib_search__engines.pm
Removed Files:
pkgsrc/www/awstats/patches: patch-aa patch-ab patch-ad
Log Message:
awstats: updated to 7.7
7.7:
Security fix: CVE-2017-1000501
Security fix: Missing sanitizing of parameters
Fix LogFormat=4 with url containing spaces.
Fix to window.opener vulnerability in external referral site links.
Add methodurlprot in key to define log format.
Add Dynamic DNS Lookup.
Fix edge support.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.6.1 pkgsrc/www/awstats/Makefile
cvs rdiff -u -r1.37 -r1.37.28.1 pkgsrc/www/awstats/distinfo
cvs rdiff -u -r1.12 -r0 pkgsrc/www/awstats/patches/patch-aa
cvs rdiff -u -r1.7 -r0 pkgsrc/www/awstats/patches/patch-ab
cvs rdiff -u -r1.5 -r0 pkgsrc/www/awstats/patches/patch-ad
cvs rdiff -u -r0 -r1.1.2.2 \
pkgsrc/www/awstats/patches/patch-tools_awstats__configure.pl \
pkgsrc/www/awstats/patches/patch-wwwroot_cgi-bin_awstats.pl \
pkgsrc/www/awstats/patches/patch-wwwroot_cgi-bin_lib_search__engines.pm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/awstats/Makefile
diff -u pkgsrc/www/awstats/Makefile:1.63 pkgsrc/www/awstats/Makefile:1.63.6.1
--- pkgsrc/www/awstats/Makefile:1.63 Sun Aug 11 13:24:16 2019
+++ pkgsrc/www/awstats/Makefile Mon Jan 27 12:48:57 2020
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.63 2019/08/11 13:24:16 wiz Exp $
+# $NetBSD: Makefile,v 1.63.6.1 2020/01/27 12:48:57 bsiegert Exp $
-DISTNAME= awstats-7.6
-PKGREVISION= 2
+DISTNAME= awstats-7.7
CATEGORIES= www
-MASTER_SITES= http://www.awstats.org/files/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=awstats/}
MAINTAINER= minskim%NetBSD.org@localhost
-HOMEPAGE= http://www.awstats.org/
+HOMEPAGE= https://awstats.sourceforge.io/
COMMENT= Free real-time logfile analyzer to get advanced web statistics
LICENSE= gnu-gpl-v3
@@ -60,9 +59,6 @@ INSTALLATION_DIRS+= awstats/cgi-bin/plug
INSTALLATION_DIRS+= share/doc/awstats
INSTALLATION_DIRS+= share/examples/awstats
-post-extract:
- find ${WRKSRC} -name .cvsignore -exec rm {} \;
-
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/tools/*.pl ${DESTDIR}${PREFIX}/awstats/bin
${FIND} ${WRKSRC}/wwwroot/cgi-bin -name \*.orig -exec ${RM} {} \;
@@ -76,26 +72,20 @@ do-install:
${DESTDIR}${PREFIX}/awstats/cgi-bin/plugins
.for d in lang lib
cd ${WRKSRC}/wwwroot/cgi-bin \
- && pax -rwpppm ${d} ${DESTDIR}${PREFIX}/awstats/cgi-bin/
+ && ${PAX} -rwpppm ${d} ${DESTDIR}${PREFIX}/awstats/cgi-bin/
chown -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/awstats/cgi-bin/${d}
- find ${DESTDIR}${PREFIX}/awstats/cgi-bin/${d} -type d -print \
- | xargs chmod ${PKGDIRMODE}
- find ${DESTDIR}${PREFIX}/awstats/cgi-bin/${d} -type f -print \
- | xargs chmod ${SHAREMODE}
+ ${FIND} ${DESTDIR}${PREFIX}/awstats/cgi-bin/${d} -type d -exec ${CHMOD} ${PKGDIRMODE} {} +
+ ${FIND} ${DESTDIR}${PREFIX}/awstats/cgi-bin/${d} -type f -exec ${CHMOD} ${SHAREMODE} {} +
.endfor
.for d in classes css icon js
- cd ${WRKSRC}/wwwroot && pax -rwpppm ${d} ${DESTDIR}${PREFIX}/awstats/
- chown -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/awstats/${d}
- find ${DESTDIR}${PREFIX}/awstats/${d} -type d -print \
- | xargs chmod ${PKGDIRMODE}
- find ${DESTDIR}${PREFIX}/awstats/${d} -type f -print \
- | xargs chmod ${SHAREMODE}
+ cd ${WRKSRC}/wwwroot && ${PAX} -rwpppm ${d} ${DESTDIR}${PREFIX}/awstats/
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/awstats/${d}
+ ${FIND} ${DESTDIR}${PREFIX}/awstats/${d} -type d -exec ${CHMOD} ${PKGDIRMODE} {} +
+ ${FIND} ${DESTDIR}${PREFIX}/awstats/${d} -type f -exec ${CHMOD} ${SHAREMODE} {} +
.endfor
- cd ${WRKSRC}/docs && pax -rwpppm . ${DESTDIR}${PREFIX}/share/doc/awstats/
- chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/awstats/
- find ${DESTDIR}${PREFIX}/share/doc/awstats/ -type d -print \
- | xargs chmod ${PKGDIRMODE}
- find ${DESTDIR}${PREFIX}/share/doc/awstats/ -type f -print \
- | xargs chmod ${DOCMODE}
+ cd ${WRKSRC}/docs && ${PAX} -rwpppm . ${DESTDIR}${PREFIX}/share/doc/awstats/
+ ${CHOWN} -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/awstats/
+ ${FIND} ${DESTDIR}${PREFIX}/share/doc/awstats/ -type d -exec ${CHMOD} ${PKGDIRMODE} {} +
+ ${FIND} ${DESTDIR}${PREFIX}/share/doc/awstats/ -type f -exec ${CHMOD} ${DOCMODE} {} +
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/awstats/distinfo
diff -u pkgsrc/www/awstats/distinfo:1.37 pkgsrc/www/awstats/distinfo:1.37.28.1
--- pkgsrc/www/awstats/distinfo:1.37 Sun Feb 12 10:27:41 2017
+++ pkgsrc/www/awstats/distinfo Mon Jan 27 12:48:57 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2017/02/12 10:27:41 adam Exp $
+$NetBSD: distinfo,v 1.37.28.1 2020/01/27 12:48:57 bsiegert Exp $
-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) = f82ee8731bd15d3c956cca6437552df2036190f6
+SHA1 (awstats-7.7.tar.gz) = da00ffc51ec2c4c1a6c4727d4e0ba3be652f1d17
+RMD160 (awstats-7.7.tar.gz) = 361ad5383670bed8a7e343d64d96f6de8b2f800a
+SHA512 (awstats-7.7.tar.gz) = 8bf32b0650ef0cc900a16eead866da3847d81c2696e7a90fb49833679c958768833d781e5b4becd9b4f6748c7266e2887ff7ff33d98293ce3a0296a810fbe899
+Size (awstats-7.7.tar.gz) = 2956851 bytes
+SHA1 (patch-tools_awstats__configure.pl) = bb098d890e1ee6a0a354dd9036e57f6eb42d3945
+SHA1 (patch-wwwroot_cgi-bin_awstats.pl) = edb1fa423ae1a0608e2226b55a8cded7c0c6292f
+SHA1 (patch-wwwroot_cgi-bin_lib_search__engines.pm) = 7f9a3c1d38b8ee47d41fcb72e3aa0c172cd9ac69
Added files:
Index: pkgsrc/www/awstats/patches/patch-tools_awstats__configure.pl
diff -u /dev/null pkgsrc/www/awstats/patches/patch-tools_awstats__configure.pl:1.1.2.2
--- /dev/null Mon Jan 27 12:48:57 2020
+++ pkgsrc/www/awstats/patches/patch-tools_awstats__configure.pl Mon Jan 27 12:48:57 2020
@@ -0,0 +1,138 @@
+$NetBSD: patch-tools_awstats__configure.pl,v 1.1.2.2 2020/01/27 12:48:57 bsiegert Exp $
+
+Fix paths.
+
+--- tools/awstats_configure.pl.orig 2016-08-27 18:59:01.000000000 +0000
++++ tools/awstats_configure.pl
+@@ -28,12 +28,12 @@ $AWSTATS_MODEL_CONFIG
+ $AWSTATS_DIRDATA_PATH
+ /;
+ $AWSTATS_PATH='';
+-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
+-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
+-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
+-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin';
+-$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux
+-$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux
++$AWSTATS_ICON_PATH='@PREFIX@/awstats/icon';
++$AWSTATS_CSS_PATH='@PREFIX@/awstats/css';
++$AWSTATS_CLASSES_PATH='@PREFIX@/awstats/classes';
++$AWSTATS_CGI_PATH='@PREFIX@/awstats/cgi-bin';
++$AWSTATS_MODEL_CONFIG='@PKG_SYSCONFDIR@/awstats.model.conf'; # Used only when configure ran on linux
++$AWSTATS_DIRDATA_PATH='@VARBASE@/awstats'; # Used only when configure ran on linux
+
+
+
+@@ -63,6 +63,7 @@ use vars qw/
+ '/etc/httpd/httpd.conf',
+ '/usr/local/apache/conf/httpd.conf',
+ '/usr/local/apache2/conf/httpd.conf',
++'@PREFIX@/etc/httpd/httpd.conf',
+ );
+
+ use vars qw/
+@@ -308,13 +309,13 @@ if ($OS eq 'linux') {
+ $AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//;
+ $AWSTATS_PATH=~s/tools[\\\/]?$//;
+ $AWSTATS_PATH=~s/[\\\/]$//;
+- if ($AWSTATS_PATH ne '/usr/local/awstats') {
+- print "Warning: AWStats standard directory on Linux OS is '/usr/local/awstats'.\n";
++ if ($AWSTATS_PATH ne '@PREFIX@/awstats') {
++ print "Warning: AWStats standard directory on Linux OS is '@PREFIX@/awstats'.\n";
+ print "If you want to use standard directory, you should first move all content\n";
+ print "of AWStats distribution from current directory:\n";
+ print "$AWSTATS_PATH\n";
+ print "to standard directory:\n";
+- print "/usr/local/awstats\n";
++ print "@PREFIX@/awstats\n";
+ print "And then, run configure.pl from this location.\n";
+ print "Do you want to continue setup from this NON standard directory [yN] ? ";
+ my $bidon='';
+@@ -323,23 +324,23 @@ if ($OS eq 'linux') {
+ print "configure.pl aborted.\n";
+ exit 1;
+ }
+- $AWSTATS_ICON_PATH="$AWSTATS_PATH/wwwroot/icon";
+- $AWSTATS_CSS_PATH="$AWSTATS_PATH/wwwroot/css";
+- $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/wwwroot/classes";
+- $AWSTATS_CGI_PATH="$AWSTATS_PATH/wwwroot/cgi-bin";
++ $AWSTATS_ICON_PATH="$AWSTATS_PATH/icon";
++ $AWSTATS_CSS_PATH="$AWSTATS_PATH/css";
++ $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/classes";
++ $AWSTATS_CGI_PATH="$AWSTATS_PATH/cgi-bin";
+ }
+ }
+ elsif ($OS eq 'macosx') {
+ $AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//;
+ $AWSTATS_PATH=~s/tools[\\\/]?$//;
+ $AWSTATS_PATH=~s/[\\\/]$//;
+- if ($AWSTATS_PATH ne '/Library/WebServer/awstats') {
+- print "Warning: AWStats standard directory on Mac OS X is '/Library/WebServer/awstats'.\n";
++ if ($AWSTATS_PATH ne '@PREFIX@/awstats') {
++ print "Warning: AWStats standard directory on Mac OS X is '@PREFIX@/awstats'.\n";
+ print "If you want to use standard directory, you should first move all content\n";
+ print "of AWStats distribution from current directory:\n";
+ print "$AWSTATS_PATH\n";
+ print "to standard directory:\n";
+- print "/Library/WebServer/awstats\n";
++ print "@PREFIX@/awstats\n";
+ print "And then, run configure.pl from this location.\n";
+ print "Do you want to continue setup from this NON standard directory [yN] ? ";
+ my $bidon='';
+@@ -348,10 +349,10 @@ elsif ($OS eq 'macosx') {
+ print "configure.pl aborted.\n";
+ exit 1;
+ }
+- $AWSTATS_ICON_PATH="$AWSTATS_PATH/wwwroot/icon";
+- $AWSTATS_CSS_PATH="$AWSTATS_PATH/wwwroot/css";
+- $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/wwwroot/classes";
+- $AWSTATS_CGI_PATH="$AWSTATS_PATH/wwwroot/cgi-bin";
++ $AWSTATS_ICON_PATH="$AWSTATS_PATH/icon";
++ $AWSTATS_CSS_PATH="$AWSTATS_PATH/css";
++ $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/classes";
++ $AWSTATS_CGI_PATH="$AWSTATS_PATH/cgi-bin";
+ }
+ }
+ elsif ($OS eq 'windows') {
+@@ -420,6 +421,7 @@ if (! scalar keys %ApacheConfPath) {
+ print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n";
+ print "Example: /etc/httpd/httpd.conf\n";
+ print "Example: /usr/local/apache2/conf/httpd.conf\n";
++ print "Example: @PREFIX@/etc/httpd/httpd.conf\n";
+ print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n";
+ $bidon='';
+ while ($bidon ne 'none' && ! -f "$bidon") {
+@@ -545,8 +547,8 @@ EOF
+ # -----------------------------
+ my $modelfile='';
+ if ($OS eq 'linux') {
+- if (-f "$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf") {
+- $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf";
++ if (-f "@PKG_SYSCONFDIR@/awstats.model.conf") {
++ $modelfile="@PKG_SYSCONFDIR@/awstats.model.conf";
+ }
+ else {
+ $modelfile="$AWSTATS_MODEL_CONFIG";
+@@ -554,7 +556,7 @@ if ($OS eq 'linux') {
+ }
+ }
+ elsif ($OS eq "macosx") {
+- $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf";
++ $modelfile="@PKG_SYSCONFDIR@/awstats.model.conf";
+ }
+ elsif ($OS eq 'windows') { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; }
+ else { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; }
+@@ -606,11 +608,11 @@ if ($bidon =~ /^y/i) {
+ if ($OS eq 'linux') {
+ print "\n-----> Define config file path\n";
+ print "In which directory do you plan to store your config file(s) ?\n";
+- print "Default: /etc/awstats\n";
++ print "Default: @PKG_SYSCONFDIR@\n";
+ my $bidon='';
+ print "Directory path to store config file(s) (Enter for default):\n> ";
+ $bidon=<STDIN>; chomp $bidon;
+- if (! $bidon) { $bidon = "/etc/awstats"; }
++ if (! $bidon) { $bidon = "@PKG_SYSCONFDIR@"; }
+ my $configdir=$bidon;
+ if (! -d $configdir) {
+ # Create the directory for config files
Index: pkgsrc/www/awstats/patches/patch-wwwroot_cgi-bin_awstats.pl
diff -u /dev/null pkgsrc/www/awstats/patches/patch-wwwroot_cgi-bin_awstats.pl:1.1.2.2
--- /dev/null Mon Jan 27 12:48:57 2020
+++ pkgsrc/www/awstats/patches/patch-wwwroot_cgi-bin_awstats.pl Mon Jan 27 12:48:57 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-wwwroot_cgi-bin_awstats.pl,v 1.1.2.2 2020/01/27 12:48:57 bsiegert Exp $
+
+Check for configdir.
+
+--- wwwroot/cgi-bin/awstats.pl.orig 2018-01-07 14:36:46.000000000 +0000
++++ wwwroot/cgi-bin/awstats.pl
+@@ -1723,7 +1723,7 @@ sub Read_Config {
+ "/etc/opt/awstats"
+ );
+
+- if ($configdir) {
++ if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
+ # Check if configdir is outside default values.
+ my $outsidedefaultvalue=1;
+ foreach (@PossibleConfigDir) {
Index: pkgsrc/www/awstats/patches/patch-wwwroot_cgi-bin_lib_search__engines.pm
diff -u /dev/null pkgsrc/www/awstats/patches/patch-wwwroot_cgi-bin_lib_search__engines.pm:1.1.2.2
--- /dev/null Mon Jan 27 12:48:57 2020
+++ pkgsrc/www/awstats/patches/patch-wwwroot_cgi-bin_lib_search__engines.pm Mon Jan 27 12:48:57 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-wwwroot_cgi-bin_lib_search__engines.pm,v 1.1.2.2 2020/01/27 12:48:57 bsiegert Exp $
+
+Fix ampersand encoding that breaks XHTML output, ID 1824230.
+
+--- wwwroot/cgi-bin/lib/search_engines.pm.orig 2017-02-20 23:35:50.000000000 +0000
++++ wwwroot/cgi-bin/lib/search_engines.pm
+@@ -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 noopener noreferrer" 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 noopener noreferrer" target="_blank">AT&T search (powered by Google)</a>',
+ 'auone','auone',
+ 'avantfind','<a href="http://www.avantfind.com/"; title="Search Engine Home Page [new window]" rel="nofollow noopener noreferrer" target="_blank">Avantfind</a>',
+ 'avg','avg',
Home |
Main Index |
Thread Index |
Old Index