- Update to 6.95

PR:		140065
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com>
Approved by:	maintainer
This commit is contained in:
Martin Wilke 2009-10-30 09:51:20 +00:00
parent 1a7281b93e
commit bfe7de9e16
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=243536
5 changed files with 38 additions and 37 deletions

View file

@ -6,7 +6,7 @@
# #
PORTNAME= awstats PORTNAME= awstats
PORTVERSION= 6.9 PORTVERSION= 6.95
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/AWStats/${PORTVERSION} MASTER_SITES= SF/${PORTNAME}/AWStats/${PORTVERSION}
@ -76,9 +76,9 @@ do-install:
@${MKDIR} ${PREFIX}/www/awstats/tools/webmin @${MKDIR} ${PREFIX}/www/awstats/tools/webmin
@${MKDIR} ${PREFIX}/www/awstats/tools/xslt @${MKDIR} ${PREFIX}/www/awstats/tools/xslt
${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_buildstaticpages.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_buildstaticpages.pl ${PREFIX}/www/awstats/tools
${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_configure.pl ${PREFIX}/www/awstats/tools
${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_exportlib.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_exportlib.pl ${PREFIX}/www/awstats/tools
${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_updateall.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_updateall.pl ${PREFIX}/www/awstats/tools
${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_configure.pl ${PREFIX}/www/awstats/tools
${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools
${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools
${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools

View file

@ -1,3 +1,3 @@
MD5 (awstats-6.9.tar.gz) = fc19dbb8449eccf3300efb30ca3376cb MD5 (awstats-6.95.tar.gz) = 26a5b19fa9f395e9e7dafed37b795d7f
SHA256 (awstats-6.9.tar.gz) = c5e288d05c71c5692c59625aa4bcf4c9b41ee0c46cb9b83e7dcac6510bb8b04f SHA256 (awstats-6.95.tar.gz) = 7cda2f470abae83b10c819aec6511897034e75b73b36b706a98736b5d04d81d3
SIZE (awstats-6.9.tar.gz) = 1125906 SIZE (awstats-6.95.tar.gz) = 1138306

View file

@ -1,25 +0,0 @@
Fixes XSS in awstats.pl: CVE-2008-3714
Please, note that the upstream fix at r.1911 is incomplete and can be
easily curcumvented,
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5080
Obtained from: Upstream, http://awstats.cvs.sourceforge.net/viewvc/awstats/awstats/wwwroot/cgi-bin/awstats.pl?r1=1.925&r2=1.926
Debian, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=33;filename=awstats-6.7.dfsg-5_6.7.dfsg-5.1.patch;att=1;bug=495432
See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=495432
--- wwwroot/cgi-bin/awstats.pl.old 2009-01-04 13:50:42.000000000 +0800
+++ wwwroot/cgi-bin/awstats.pl 2009-01-04 13:52:43.000000000 +0800
@@ -7521,8 +7521,9 @@
sub DecodeEncodedString {
my $stringtodecode = shift;
$stringtodecode =~ tr/\+/ /s;
- $stringtodecode =~ s/%22//g;
$stringtodecode =~ s/%([A-F0-9][A-F0-9])/pack("C", hex($1))/ieg;
+ $stringtodecode =~ s/["']//g;
+
return $stringtodecode;
}

View file

@ -1,11 +1,11 @@
--- wwwroot/cgi-bin/awstats.pl.orig 2008-11-30 10:42:46.000000000 -0500 --- wwwroot/cgi-bin/awstats.pl.orig 2009-10-10 08:36:38.000000000 -0400
+++ wwwroot/cgi-bin/awstats.pl 2009-01-03 16:32:27.000000000 -0500 +++ wwwroot/cgi-bin/awstats.pl 2009-10-28 21:33:22.000000000 -0400
@@ -2925,7 +2925,7 @@ @@ -3040,7 +3040,7 @@
# Debian package : "/usr/share/awstats/plugins" # Debian package : "/usr/share/awstats/plugins"
my @PossiblePluginsDir = ( my @PossiblePluginsDir = (
"$DIR/plugins", "$DIR/plugins",
- "/usr/local/awstats/wwwroot/cgi-bin/plugins", - "/usr/local/awstats/wwwroot/cgi-bin/plugins",
+ "%%PREFIX%%/www/awstats/cgi-bin/plugins", + "%%PREFIX%%/www/awstats/cgi-bin/plugins",
"/usr/share/awstats/plugins" "/usr/share/awstats/plugins"
); );
my %DirAddedInINC = (); my %DirAddedInINC = ();

View file

@ -57,6 +57,7 @@ www/awstats/cgi-bin/lang/awstats-ba.txt
www/awstats/cgi-bin/lang/awstats-be.txt www/awstats/cgi-bin/lang/awstats-be.txt
www/awstats/cgi-bin/lang/awstats-bg.txt www/awstats/cgi-bin/lang/awstats-bg.txt
www/awstats/cgi-bin/lang/awstats-br.txt www/awstats/cgi-bin/lang/awstats-br.txt
www/awstats/cgi-bin/lang/awstats-bzg.txt
www/awstats/cgi-bin/lang/awstats-ca.txt www/awstats/cgi-bin/lang/awstats-ca.txt
www/awstats/cgi-bin/lang/awstats-cn.txt www/awstats/cgi-bin/lang/awstats-cn.txt
www/awstats/cgi-bin/lang/awstats-cy.txt www/awstats/cgi-bin/lang/awstats-cy.txt
@ -103,12 +104,15 @@ www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-en.txt
www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-gr.txt www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-gr.txt
www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-is.txt www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-is.txt
www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-it.txt www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-it.txt
www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-ru.txt
www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-br.txt www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-br.txt
www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-cz.txt
www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-en.txt www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-en.txt
www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt
www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-gr.txt www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-gr.txt
www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-is.txt www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-is.txt
www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-it.txt www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-it.txt
www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-ru.txt
www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-al.txt www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-al.txt
www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ba.txt www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ba.txt
www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt
@ -180,6 +184,7 @@ www/awstats/icons/browser/adobe.png
www/awstats/icons/browser/alcatel.png www/awstats/icons/browser/alcatel.png
www/awstats/icons/browser/amaya.png www/awstats/icons/browser/amaya.png
www/awstats/icons/browser/amigavoyager.png www/awstats/icons/browser/amigavoyager.png
www/awstats/icons/browser/android.png
www/awstats/icons/browser/apt.png www/awstats/icons/browser/apt.png
www/awstats/icons/browser/avant.png www/awstats/icons/browser/avant.png
www/awstats/icons/browser/aweb.png www/awstats/icons/browser/aweb.png
@ -198,6 +203,7 @@ www/awstats/icons/browser/ericsson.png
www/awstats/icons/browser/feeddemon.png www/awstats/icons/browser/feeddemon.png
www/awstats/icons/browser/feedreader.png www/awstats/icons/browser/feedreader.png
www/awstats/icons/browser/firefox.png www/awstats/icons/browser/firefox.png
www/awstats/icons/browser/flock.png
www/awstats/icons/browser/fpexpress.png www/awstats/icons/browser/fpexpress.png
www/awstats/icons/browser/fresco.png www/awstats/icons/browser/fresco.png
www/awstats/icons/browser/galeon.png www/awstats/icons/browser/galeon.png
@ -206,6 +212,8 @@ www/awstats/icons/browser/gozilla.png
www/awstats/icons/browser/hotjava.png www/awstats/icons/browser/hotjava.png
www/awstats/icons/browser/ibrowse.png www/awstats/icons/browser/ibrowse.png
www/awstats/icons/browser/icab.png www/awstats/icons/browser/icab.png
www/awstats/icons/browser/icecat.png
www/awstats/icons/browser/iceweasel.png
www/awstats/icons/browser/java.png www/awstats/icons/browser/java.png
www/awstats/icons/browser/jetbrains_omea.png www/awstats/icons/browser/jetbrains_omea.png
www/awstats/icons/browser/kmeleon.png www/awstats/icons/browser/kmeleon.png
@ -248,6 +256,7 @@ www/awstats/icons/browser/rssreader.png
www/awstats/icons/browser/safari.png www/awstats/icons/browser/safari.png
www/awstats/icons/browser/sagem.png www/awstats/icons/browser/sagem.png
www/awstats/icons/browser/samsung.png www/awstats/icons/browser/samsung.png
www/awstats/icons/browser/seamonkey.png
www/awstats/icons/browser/sharp.png www/awstats/icons/browser/sharp.png
www/awstats/icons/browser/sharpreader.png www/awstats/icons/browser/sharpreader.png
www/awstats/icons/browser/shrook.png www/awstats/icons/browser/shrook.png
@ -485,6 +494,7 @@ www/awstats/icons/flags/nl.png
www/awstats/icons/flags/nn.png www/awstats/icons/flags/nn.png
www/awstats/icons/flags/no.png www/awstats/icons/flags/no.png
www/awstats/icons/flags/np.png www/awstats/icons/flags/np.png
www/awstats/icons/flags/nr.png
www/awstats/icons/flags/nt.png www/awstats/icons/flags/nt.png
www/awstats/icons/flags/nu.png www/awstats/icons/flags/nu.png
www/awstats/icons/flags/nz.png www/awstats/icons/flags/nz.png
@ -570,6 +580,7 @@ www/awstats/icons/mime/doc.png
www/awstats/icons/mime/flash.png www/awstats/icons/mime/flash.png
www/awstats/icons/mime/html.png www/awstats/icons/mime/html.png
www/awstats/icons/mime/image.png www/awstats/icons/mime/image.png
www/awstats/icons/mime/jnlp.png
www/awstats/icons/mime/jscript.png www/awstats/icons/mime/jscript.png
www/awstats/icons/mime/lit.png www/awstats/icons/mime/lit.png
www/awstats/icons/mime/notavailable.png www/awstats/icons/mime/notavailable.png
@ -596,9 +607,12 @@ www/awstats/icons/os/amigaos.png
www/awstats/icons/os/apple.png www/awstats/icons/os/apple.png
www/awstats/icons/os/atari.png www/awstats/icons/os/atari.png
www/awstats/icons/os/beos.png www/awstats/icons/os/beos.png
www/awstats/icons/os/blackberry.png
www/awstats/icons/os/bsd.png www/awstats/icons/os/bsd.png
www/awstats/icons/os/bsddflybsd.png
www/awstats/icons/os/bsdfreebsd.png www/awstats/icons/os/bsdfreebsd.png
www/awstats/icons/os/bsdi.png www/awstats/icons/os/bsdi.png
www/awstats/icons/os/bsdkfreebsd.png
www/awstats/icons/os/bsdnetbsd.png www/awstats/icons/os/bsdnetbsd.png
www/awstats/icons/os/bsdopenbsd.png www/awstats/icons/os/bsdopenbsd.png
www/awstats/icons/os/cpm.png www/awstats/icons/os/cpm.png
@ -611,18 +625,25 @@ www/awstats/icons/os/gnu.png
www/awstats/icons/os/hpux.png www/awstats/icons/os/hpux.png
www/awstats/icons/os/ibm.png www/awstats/icons/os/ibm.png
www/awstats/icons/os/imode.png www/awstats/icons/os/imode.png
www/awstats/icons/os/inferno.png
www/awstats/icons/os/irix.png www/awstats/icons/os/irix.png
www/awstats/icons/os/j2me.png
www/awstats/icons/os/java.png www/awstats/icons/os/java.png
www/awstats/icons/os/kfreebsd.png www/awstats/icons/os/kfreebsd.png
www/awstats/icons/os/linux.png www/awstats/icons/os/linux.png
www/awstats/icons/os/linuxandroid.png
www/awstats/icons/os/linuxasplinux.png
www/awstats/icons/os/linuxcentos.png www/awstats/icons/os/linuxcentos.png
www/awstats/icons/os/linuxdebian.png www/awstats/icons/os/linuxdebian.png
www/awstats/icons/os/linuxfedora.png www/awstats/icons/os/linuxfedora.png
www/awstats/icons/os/linuxgentoo.png www/awstats/icons/os/linuxgentoo.png
www/awstats/icons/os/linuxmandr.png www/awstats/icons/os/linuxmandr.png
www/awstats/icons/os/linuxpclinuxos.png
www/awstats/icons/os/linuxredhat.png www/awstats/icons/os/linuxredhat.png
www/awstats/icons/os/linuxsuse.png www/awstats/icons/os/linuxsuse.png
www/awstats/icons/os/linuxubuntu.png www/awstats/icons/os/linuxubuntu.png
www/awstats/icons/os/linuxvine.png
www/awstats/icons/os/linuxzenwalk.png
www/awstats/icons/os/mac.png www/awstats/icons/os/mac.png
www/awstats/icons/os/macintosh.png www/awstats/icons/os/macintosh.png
www/awstats/icons/os/macosx.png www/awstats/icons/os/macosx.png
@ -632,19 +653,23 @@ www/awstats/icons/os/next.png
www/awstats/icons/os/openbsd.png www/awstats/icons/os/openbsd.png
www/awstats/icons/os/os2.png www/awstats/icons/os/os2.png
www/awstats/icons/os/osf.png www/awstats/icons/os/osf.png
www/awstats/icons/os/palmos.png
www/awstats/icons/os/qnx.png www/awstats/icons/os/qnx.png
www/awstats/icons/os/riscos.png www/awstats/icons/os/riscos.png
www/awstats/icons/os/sco.png www/awstats/icons/os/sco.png
www/awstats/icons/os/sunos.png www/awstats/icons/os/sunos.png
www/awstats/icons/os/syllable.png
www/awstats/icons/os/symbian.png www/awstats/icons/os/symbian.png
www/awstats/icons/os/unix.png www/awstats/icons/os/unix.png
www/awstats/icons/os/unknown.png www/awstats/icons/os/unknown.png
www/awstats/icons/os/vms.png www/awstats/icons/os/vms.png
www/awstats/icons/os/webtv.png www/awstats/icons/os/webtv.png
www/awstats/icons/os/wii.png
www/awstats/icons/os/win.png www/awstats/icons/os/win.png
www/awstats/icons/os/win16.png www/awstats/icons/os/win16.png
www/awstats/icons/os/win2000.png www/awstats/icons/os/win2000.png
www/awstats/icons/os/win2003.png www/awstats/icons/os/win2003.png
www/awstats/icons/os/win2008.png
www/awstats/icons/os/win95.png www/awstats/icons/os/win95.png
www/awstats/icons/os/win98.png www/awstats/icons/os/win98.png
www/awstats/icons/os/wince.png www/awstats/icons/os/wince.png
@ -652,6 +677,7 @@ www/awstats/icons/os/winlong.png
www/awstats/icons/os/winme.png www/awstats/icons/os/winme.png
www/awstats/icons/os/winnt.png www/awstats/icons/os/winnt.png
www/awstats/icons/os/winunknown.png www/awstats/icons/os/winunknown.png
www/awstats/icons/os/winvista.png
www/awstats/icons/os/winxp.png www/awstats/icons/os/winxp.png
www/awstats/icons/os/commodore.png www/awstats/icons/os/commodore.png
www/awstats/icons/os/psp.png www/awstats/icons/os/psp.png