From 7bde24015c76d442ed6ff041d0eefde7f2513e2c Mon Sep 17 00:00:00 2001 From: salo Date: Wed, 17 May 2006 21:26:40 +0000 Subject: Pullup ticket 1596 - requested by minskim security update for awstats Revisions pulled up: - pkgsrc/www/awstats/MESSAGE 1.6 - pkgsrc/www/awstats/Makefile 1.25 - pkgsrc/www/awstats/PLIST 1.9, 1.10 - pkgsrc/www/awstats/distinfo 1.14 - pkgsrc/www/awstats/patches/patch-aa removed - pkgsrc/www/awstats/patches/patch-ab 1.4 Module Name: pkgsrc Committed By: minskim Date: Tue May 16 18:13:55 UTC 2006 Modified Files: pkgsrc/www/awstats: MESSAGE Makefile PLIST distinfo pkgsrc/www/awstats/patches: patch-ab Removed Files: pkgsrc/www/awstats/patches: patch-aa Log Message: Update awstats to 6.6. Major changes since 6.4: - Fixed CVE-2006-2237. - All geoip plugins support the PurePerl version. - Possible use of vhost in extra section. - Support IPv6 in AllowAccessFromWebToFollowingIPAddresses parameter. - Added svn family to browsers detection. - RSS catcher/readers in robot database. - LogFormat=3D2 can now change its value dynamically if logformat change. - More new features and bug fixes. --- Module Name: pkgsrc Committed By: minskim Date: Wed May 17 16:39:47 UTC 2006 Modified Files: pkgsrc/www/awstats: PLIST Log Message: Correct file names. Reported by Yoshito Komatsu in PR pkg/33501. --- www/awstats/MESSAGE | 4 +- www/awstats/Makefile | 29 ++-- www/awstats/PLIST | 197 +++++++++++++++++------- www/awstats/distinfo | 11 +- www/awstats/patches/patch-aa | 353 ------------------------------------------- www/awstats/patches/patch-ab | 20 +-- 6 files changed, 173 insertions(+), 441 deletions(-) delete mode 100644 www/awstats/patches/patch-aa diff --git a/www/awstats/MESSAGE b/www/awstats/MESSAGE index 3154f5e8d3b..7e854101660 100644 --- a/www/awstats/MESSAGE +++ b/www/awstats/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.5 2005/09/28 12:11:29 rillig Exp $ +$NetBSD: MESSAGE,v 1.5.4.1 2006/05/17 21:26:40 salo Exp $ An example file has been installed as ${PREFIX}/share/examples/awstats/awstats.conf. After adjusting it to @@ -10,6 +10,6 @@ configuration files. You may need to adjust the cgi-bin path of your webserver -- for details, refer to the documentation in - ${PREFIX}/share/doc/html/awstats + ${PREFIX}/share/doc/awstats =========================================================================== diff --git a/www/awstats/Makefile b/www/awstats/Makefile index 0efe81bd2af..59f536741a0 100644 --- a/www/awstats/Makefile +++ b/www/awstats/Makefile @@ -1,21 +1,18 @@ -# $NetBSD: Makefile,v 1.23 2005/12/29 06:22:21 jlam Exp $ +# $NetBSD: Makefile,v 1.23.2.1 2006/05/17 21:26:40 salo Exp $ # -DISTNAME= awstats-6.4 -PKGREVISION= 2 +DISTNAME= awstats-6.6 CATEGORIES= www MASTER_SITES= http://awstats.sourceforge.net/files/ -EXTRACT_SUFX= .tgz MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://awstats.sourceforge.net/ COMMENT= Free real-time logfile analyzer to get advanced web statistics -DIST_SUBDIR= ${PKGNAME_NOREV}nb2 NO_BUILD= YES USE_TOOLS+= perl:run -REPLACE_PERL= tools/*.pl \ +REPLACE_PERL+= tools/*.pl \ wwwroot/cgi-bin/*.pl APACHE_USER?= www @@ -30,11 +27,11 @@ SUBST_STAGE.conf= post-patch SUBST_FILES.conf= tools/awstats_configure.pl \ wwwroot/cgi-bin/awstats.model.conf \ wwwroot/cgi-bin/awstats.pl -SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g" \ - -e "s|@VARBASE@|${VARBASE}|g" \ - -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \ - -e "s|/var/log/httpd/mylog.log|${VARBASE}/log/httpd/access_log|g" \ - -e "s|\"/etc/opt/awstats\"|\"/etc/opt/awstats\",\"${PKG_SYSCONFDIR}\"|g" +SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_SED.conf+= -e "s|@VARBASE@|${VARBASE}|g" +SUBST_SED.conf+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_SED.conf+= -e "s|/var/log/httpd/mylog.log|${VARBASE}/log/httpd/access_log|g" +SUBST_SED.conf+= -e "s|\"/etc/opt/awstats\"|\"/etc/opt/awstats\",\"${PKG_SYSCONFDIR}\"|g" SUBST_MESSAGE.conf= "Fixing configuration files and scripts." CONF_FILES+= ${PREFIX}/share/examples/awstats/awstats.conf \ @@ -45,7 +42,7 @@ do-install: ${INSTALL_SCRIPT_DIR} ${PREFIX}/awstats/bin ${INSTALL_SCRIPT_DIR} ${PREFIX}/awstats/cgi-bin ${INSTALL_DATA_DIR} ${PREFIX}/awstats/cgi-bin/plugins - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/awstats + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/awstats ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/awstats ${INSTALL_SCRIPT} ${WRKSRC}/tools/*.pl ${PREFIX}/awstats/bin ${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/*.pl \ @@ -73,11 +70,11 @@ do-install: ${FIND} ${PREFIX}/awstats/${d} -type f -print \ | ${XARGS} ${CHMOD} ${SHAREMODE} .endfor - cd ${WRKSRC}/docs && ${PAX} -rwpppm . ${PREFIX}/share/doc/html/awstats/ - ${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/doc/html/awstats/ - ${FIND} ${PREFIX}/share/doc/html/awstats/ -type d -print \ + cd ${WRKSRC}/docs && ${PAX} -rwpppm . ${PREFIX}/share/doc/awstats/ + ${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/doc/awstats/ + ${FIND} ${PREFIX}/share/doc/awstats/ -type d -print \ | ${XARGS} ${CHMOD} ${PKGDIRMODE} - ${FIND} ${PREFIX}/share/doc/html/awstats/ -type f -print \ + ${FIND} ${PREFIX}/share/doc/awstats/ -type f -print \ | ${XARGS} ${CHMOD} ${DOCMODE} .include "../../mk/bsd.pkg.mk" diff --git a/www/awstats/PLIST b/www/awstats/PLIST index c29ee31ca7e..7aa2d3edc59 100644 --- a/www/awstats/PLIST +++ b/www/awstats/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2005/01/19 12:49:33 minskim Exp $ +@comment $NetBSD: PLIST,v 1.8.10.1 2006/05/17 21:26:40 salo Exp $ awstats/bin/awstats_buildstaticpages.pl awstats/bin/awstats_configure.pl awstats/bin/awstats_exportlib.pl @@ -28,13 +28,16 @@ awstats/cgi-bin/lang/awstats-fr.txt awstats/cgi-bin/lang/awstats-gl.txt awstats/cgi-bin/lang/awstats-gr.txt awstats/cgi-bin/lang/awstats-he.txt +awstats/cgi-bin/lang/awstats-hr.txt awstats/cgi-bin/lang/awstats-hu.txt awstats/cgi-bin/lang/awstats-id.txt awstats/cgi-bin/lang/awstats-is.txt awstats/cgi-bin/lang/awstats-it.txt awstats/cgi-bin/lang/awstats-jp.txt -awstats/cgi-bin/lang/awstats-kr.txt +awstats/cgi-bin/lang/awstats-ko.txt +awstats/cgi-bin/lang/awstats-lt.txt awstats/cgi-bin/lang/awstats-lv.txt +awstats/cgi-bin/lang/awstats-mk.txt awstats/cgi-bin/lang/awstats-nb.txt awstats/cgi-bin/lang/awstats-nl.txt awstats/cgi-bin/lang/awstats-nn.txt @@ -48,17 +51,18 @@ awstats/cgi-bin/lang/awstats-sk.txt awstats/cgi-bin/lang/awstats-sr.txt awstats/cgi-bin/lang/awstats-th.txt awstats/cgi-bin/lang/awstats-tr.txt -awstats/cgi-bin/lang/awstats-tt-br.txt awstats/cgi-bin/lang/awstats-tw.txt awstats/cgi-bin/lang/awstats-ua.txt awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt awstats/cgi-bin/lang/tooltips_f/awstats-tt-cz.txt awstats/cgi-bin/lang/tooltips_f/awstats-tt-en.txt awstats/cgi-bin/lang/tooltips_f/awstats-tt-is.txt +awstats/cgi-bin/lang/tooltips_f/awstats-tt-it.txt awstats/cgi-bin/lang/tooltips_m/awstats-tt-br.txt awstats/cgi-bin/lang/tooltips_m/awstats-tt-en.txt awstats/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt awstats/cgi-bin/lang/tooltips_m/awstats-tt-is.txt +awstats/cgi-bin/lang/tooltips_m/awstats-tt-it.txt awstats/cgi-bin/lang/tooltips_w/awstats-tt-al.txt awstats/cgi-bin/lang/tooltips_w/awstats-tt-ba.txt awstats/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt @@ -90,11 +94,12 @@ awstats/cgi-bin/lang/tooltips_w/awstats-tt-sr.txt awstats/cgi-bin/lang/tooltips_w/awstats-tt-tr.txt awstats/cgi-bin/lang/tooltips_w/awstats-tt-tw.txt awstats/cgi-bin/lang/tooltips_w/awstats-tt-ua.txt +awstats/cgi-bin/lib/blacklist.txt awstats/cgi-bin/lib/browsers.pm +awstats/cgi-bin/lib/browsers_phone.pm awstats/cgi-bin/lib/domains.pm awstats/cgi-bin/lib/mime.pm awstats/cgi-bin/lib/operating_systems.pm -awstats/cgi-bin/lib/referer_spam.pm awstats/cgi-bin/lib/robots.pm awstats/cgi-bin/lib/search_engines.pm awstats/cgi-bin/lib/status_http.pm @@ -123,55 +128,107 @@ awstats/classes/src/AWGraphApplet.java awstats/classes/src/Makefile.pl awstats/css/awstats_bw.css awstats/css/awstats_default.css +awstats/icon/browser/abilon.png awstats/icon/browser/adobe.png +awstats/icon/browser/akregator.png +awstats/icon/browser/alcatel.png awstats/icon/browser/amaya.png awstats/icon/browser/amigavoyager.png +awstats/icon/browser/analogx.png awstats/icon/browser/apt.png awstats/icon/browser/avant.png awstats/icon/browser/aweb.png awstats/icon/browser/bpftp.png +awstats/icon/browser/bytel.png awstats/icon/browser/chimera.png awstats/icon/browser/cyberdog.png awstats/icon/browser/da.png awstats/icon/browser/dillo.png +awstats/icon/browser/doris.png awstats/icon/browser/dreamcast.png awstats/icon/browser/ecatch.png awstats/icon/browser/encompass.png +awstats/icon/browser/epiphany.png +awstats/icon/browser/ericsson.png +awstats/icon/browser/feeddemon.png +awstats/icon/browser/feedreader.png awstats/icon/browser/firefox.png +awstats/icon/browser/flashget.png awstats/icon/browser/fpexpress.png awstats/icon/browser/fresco.png +awstats/icon/browser/freshdownload.png +awstats/icon/browser/frontpage.png awstats/icon/browser/galeon.png awstats/icon/browser/getright.png +awstats/icon/browser/gnome.png +awstats/icon/browser/gnus.png awstats/icon/browser/gozilla.png awstats/icon/browser/hotjava.png +awstats/icon/browser/httrack.png awstats/icon/browser/ibrowse.png awstats/icon/browser/icab.png +awstats/icon/browser/java.png +awstats/icon/browser/jetbrains_omea.png awstats/icon/browser/kmeleon.png awstats/icon/browser/konqueror.png +awstats/icon/browser/leechget.png +awstats/icon/browser/lg.png awstats/icon/browser/lotusnotes.png awstats/icon/browser/lynx.png awstats/icon/browser/macweb.png awstats/icon/browser/mediaplayer.png +awstats/icon/browser/motorola.png awstats/icon/browser/mozilla.png +awstats/icon/browser/mplayer.png awstats/icon/browser/msie.png awstats/icon/browser/msie_large.png awstats/icon/browser/multizilla.png awstats/icon/browser/ncsa_mosaic.png +awstats/icon/browser/neon.png +awstats/icon/browser/netnewswire.png awstats/icon/browser/netpositive.png awstats/icon/browser/netscape.png awstats/icon/browser/netscape_large.png +awstats/icon/browser/netshow.png +awstats/icon/browser/newsfire.png +awstats/icon/browser/newsgator.png +awstats/icon/browser/newzcrawler.png +awstats/icon/browser/nokia.png awstats/icon/browser/notavailable.png awstats/icon/browser/omniweb.png awstats/icon/browser/opera.png +awstats/icon/browser/panasonic.png awstats/icon/browser/pdaphone.png +awstats/icon/browser/philips.png awstats/icon/browser/phoenix.png +awstats/icon/browser/pluck.png +awstats/icon/browser/pulpfiction.png +awstats/icon/browser/real.png +awstats/icon/browser/rss.png +awstats/icon/browser/rssbandit.png +awstats/icon/browser/rssowl.png +awstats/icon/browser/rssreader.png +awstats/icon/browser/rssxpress.png awstats/icon/browser/safari.png +awstats/icon/browser/sagem.png +awstats/icon/browser/samsung.png +awstats/icon/browser/sharp.png +awstats/icon/browser/sharpreader.png +awstats/icon/browser/shrook.png +awstats/icon/browser/siemens.png +awstats/icon/browser/sony.png awstats/icon/browser/staroffice.png +awstats/icon/browser/subversion.png awstats/icon/browser/teleport.png +awstats/icon/browser/trium.png awstats/icon/browser/unknown.png +awstats/icon/browser/w3c.png awstats/icon/browser/webcopier.png +awstats/icon/browser/webreaper.png awstats/icon/browser/webtv.png awstats/icon/browser/webzip.png +awstats/icon/browser/winxbox.png +awstats/icon/browser/wizz.png awstats/icon/clock/hr1.png awstats/icon/clock/hr10.png awstats/icon/clock/hr11.png @@ -362,6 +419,7 @@ awstats/icon/flags/mt.png awstats/icon/flags/mu.png awstats/icon/flags/museum.png awstats/icon/flags/mv.png +awstats/icon/flags/mw.png awstats/icon/flags/mx.png awstats/icon/flags/my.png awstats/icon/flags/mz.png @@ -454,24 +512,45 @@ awstats/icon/flags/za.png awstats/icon/flags/ze.png awstats/icon/flags/zm.png awstats/icon/flags/zw.png +awstats/icon/mime/ai.png awstats/icon/mime/archive.png awstats/icon/mime/audio.png awstats/icon/mime/doc.png +awstats/icon/mime/flash.png +awstats/icon/mime/glasses.png awstats/icon/mime/html.png awstats/icon/mime/image.png +awstats/icon/mime/jscript.png +awstats/icon/mime/lit.png awstats/icon/mime/notavailable.png awstats/icon/mime/other.png awstats/icon/mime/pdf.png +awstats/icon/mime/php.png +awstats/icon/mime/phshop.png +awstats/icon/mime/pl.png +awstats/icon/mime/ppt.png +awstats/icon/mime/quicktime.png +awstats/icon/mime/rar.png +awstats/icon/mime/real.png awstats/icon/mime/script.png +awstats/icon/mime/svg.png awstats/icon/mime/text.png +awstats/icon/mime/ttf.png awstats/icon/mime/unknown.png awstats/icon/mime/video.png +awstats/icon/mime/wmv.png +awstats/icon/os/.cvsignore awstats/icon/os/aix.png awstats/icon/os/amigaos.png awstats/icon/os/apple.png awstats/icon/os/atari.png awstats/icon/os/beos.png +awstats/icon/os/bsd.png +awstats/icon/os/bsdfreebsd.png awstats/icon/os/bsdi.png +awstats/icon/os/bsdnetbsd.png +awstats/icon/os/bsdopenbsd.png +awstats/icon/os/commodore.png awstats/icon/os/cpm.png awstats/icon/os/debian.png awstats/icon/os/digital.png @@ -484,7 +563,15 @@ awstats/icon/os/ibm.png awstats/icon/os/imode.png awstats/icon/os/irix.png awstats/icon/os/java.png +awstats/icon/os/kfreebsd.png awstats/icon/os/linux.png +awstats/icon/os/linuxcentos.png +awstats/icon/os/linuxdebian.png +awstats/icon/os/linuxfedora.png +awstats/icon/os/linuxmandr.png +awstats/icon/os/linuxredhat.png +awstats/icon/os/linuxsuse.png +awstats/icon/os/linuxubuntu.png awstats/icon/os/mac.png awstats/icon/os/macintosh.png awstats/icon/os/macosx.png @@ -494,6 +581,7 @@ awstats/icon/os/next.png awstats/icon/os/openbsd.png awstats/icon/os/os2.png awstats/icon/os/osf.png +awstats/icon/os/psp.png awstats/icon/os/qnx.png awstats/icon/os/riscos.png awstats/icon/os/sco.png @@ -513,6 +601,7 @@ awstats/icon/os/wince.png awstats/icon/os/winlong.png awstats/icon/os/winme.png awstats/icon/os/winnt.png +awstats/icon/os/winxbox.png awstats/icon/os/winxp.png awstats/icon/other/awstats_logo1.png awstats/icon/other/awstats_logo5.png @@ -540,59 +629,59 @@ awstats/icon/other/vp.png awstats/icon/other/vu.png awstats/icon/other/vv.png awstats/js/awstats_misc_tracker.js -share/doc/html/awstats/COPYING.TXT -share/doc/html/awstats/LICENSE.TXT -share/doc/html/awstats/awstats.pdf -share/doc/html/awstats/awstats_benchmark.html -share/doc/html/awstats/awstats_changelog.txt -share/doc/html/awstats/awstats_compare.html -share/doc/html/awstats/awstats_config.html -share/doc/html/awstats/awstats_contrib.html -share/doc/html/awstats/awstats_extra.html -share/doc/html/awstats/awstats_faq.html -share/doc/html/awstats/awstats_glossary.html -share/doc/html/awstats/awstats_license.html -share/doc/html/awstats/awstats_security.html -share/doc/html/awstats/awstats_setup.html -share/doc/html/awstats/awstats_tools.html -share/doc/html/awstats/awstats_upgrade.html -share/doc/html/awstats/awstats_webmin.html -share/doc/html/awstats/awstats_what.html -share/doc/html/awstats/images/awstats.ico -share/doc/html/awstats/images/awstats_logo1.gif -share/doc/html/awstats/images/awstats_logo1.png -share/doc/html/awstats/images/awstats_logo2.gif -share/doc/html/awstats/images/awstats_logo2.png -share/doc/html/awstats/images/awstats_logo3.gif -share/doc/html/awstats/images/awstats_logo3.png -share/doc/html/awstats/images/awstats_logo4.gif -share/doc/html/awstats/images/awstats_logo4.png -share/doc/html/awstats/images/awstats_logo5.gif -share/doc/html/awstats/images/awstats_logo5.png -share/doc/html/awstats/images/awstats_logo6.png -share/doc/html/awstats/images/license_chart.png -share/doc/html/awstats/images/screen_shot_1.gif -share/doc/html/awstats/images/screen_shot_1.jpg -share/doc/html/awstats/images/screen_shot_1.png -share/doc/html/awstats/images/screen_shot_2.png -share/doc/html/awstats/images/screen_shot_3.png -share/doc/html/awstats/images/screen_shot_4.png -share/doc/html/awstats/images/screen_shot_5.png -share/doc/html/awstats/images/screen_shot_large_1.jpg -share/doc/html/awstats/images/screen_shot_large_2.jpg -share/doc/html/awstats/images/screen_shot_large_3.jpg -share/doc/html/awstats/images/screen_shot_large_4.jpg -share/doc/html/awstats/images/screen_shot_large_5.jpg -share/doc/html/awstats/images/star.png -share/doc/html/awstats/index.html -share/doc/html/awstats/pad_awstats.htm -share/doc/html/awstats/pad_awstats.xml -share/doc/html/awstats/styles.css +share/doc/awstats/COPYING.TXT +share/doc/awstats/LICENSE.TXT +share/doc/awstats/awstats.pdf +share/doc/awstats/awstats_benchmark.html +share/doc/awstats/awstats_changelog.txt +share/doc/awstats/awstats_compare.html +share/doc/awstats/awstats_config.html +share/doc/awstats/awstats_contrib.html +share/doc/awstats/awstats_extra.html +share/doc/awstats/awstats_faq.html +share/doc/awstats/awstats_glossary.html +share/doc/awstats/awstats_license.html +share/doc/awstats/awstats_security.html +share/doc/awstats/awstats_setup.html +share/doc/awstats/awstats_tools.html +share/doc/awstats/awstats_upgrade.html +share/doc/awstats/awstats_webmin.html +share/doc/awstats/awstats_what.html +share/doc/awstats/images/awstats.ico +share/doc/awstats/images/awstats_logo1.gif +share/doc/awstats/images/awstats_logo1.png +share/doc/awstats/images/awstats_logo2.gif +share/doc/awstats/images/awstats_logo2.png +share/doc/awstats/images/awstats_logo3.gif +share/doc/awstats/images/awstats_logo3.png +share/doc/awstats/images/awstats_logo4.gif +share/doc/awstats/images/awstats_logo4.png +share/doc/awstats/images/awstats_logo5.gif +share/doc/awstats/images/awstats_logo5.png +share/doc/awstats/images/awstats_logo6.png +share/doc/awstats/images/license_chart.png +share/doc/awstats/images/screen_shot_1.gif +share/doc/awstats/images/screen_shot_1.jpg +share/doc/awstats/images/screen_shot_1.png +share/doc/awstats/images/screen_shot_2.png +share/doc/awstats/images/screen_shot_3.png +share/doc/awstats/images/screen_shot_4.png +share/doc/awstats/images/screen_shot_5.png +share/doc/awstats/images/screen_shot_large_1.jpg +share/doc/awstats/images/screen_shot_large_2.jpg +share/doc/awstats/images/screen_shot_large_3.jpg +share/doc/awstats/images/screen_shot_large_4.jpg +share/doc/awstats/images/screen_shot_large_5.jpg +share/doc/awstats/images/star.png +share/doc/awstats/index.html +share/doc/awstats/pad_awstats.htm +share/doc/awstats/pad_awstats.xml +share/doc/awstats/styles.css share/examples/awstats/awstats.conf share/examples/awstats/example.pm @dirrm share/examples/awstats -@dirrm share/doc/html/awstats/images -@dirrm share/doc/html/awstats +@dirrm share/doc/awstats/images +@dirrm share/doc/awstats @dirrm awstats/js @dirrm awstats/icon/other @dirrm awstats/icon/os diff --git a/www/awstats/distinfo b/www/awstats/distinfo index 86f3e474c0f..de5789e4766 100644 --- a/www/awstats/distinfo +++ b/www/awstats/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.13 2005/08/26 20:22:56 adrianp Exp $ +$NetBSD: distinfo,v 1.13.6.1 2006/05/17 21:26:40 salo Exp $ -SHA1 (awstats-6.4nb2/awstats-6.4.tgz) = e58671499006881516406e9fa704b0ef34b94971 -RMD160 (awstats-6.4nb2/awstats-6.4.tgz) = 318b34afcb7f7e8a4d26d46344e37bcbe3a8460a -Size (awstats-6.4nb2/awstats-6.4.tgz) = 918435 bytes -SHA1 (patch-aa) = a28254829dc3a025648ead708c932d432a69ed59 -SHA1 (patch-ab) = e39f2eae584597879428b02315e08067432f7d88 +SHA1 (awstats-6.6.tar.gz) = bc873ca91ee82905fdb37e83349e4007f1042c81 +RMD160 (awstats-6.6.tar.gz) = 0b5e4e2ff718943065cdff81577ae9ca4f50a74d +Size (awstats-6.6.tar.gz) = 1059148 bytes +SHA1 (patch-ab) = e740af99580d2cb5d68e99ca4f8e08e71a46d9d9 diff --git a/www/awstats/patches/patch-aa b/www/awstats/patches/patch-aa deleted file mode 100644 index 0363c241a83..00000000000 --- a/www/awstats/patches/patch-aa +++ /dev/null @@ -1,353 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2005/08/20 14:28:03 adrianp Exp $ - ---- wwwroot/cgi-bin/awstats.pl.orig 2005-02-24 21:02:23.000000000 +0000 -+++ wwwroot/cgi-bin/awstats.pl -@@ -625,8 +625,10 @@ a:hover { color: #$color_hover; text-d - EOF - # Call to plugins' function AddHTMLStyles - foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLStyles'}}) { -- my $function="AddHTMLStyles_$pluginname()"; -- eval("$function"); -+# my $function="AddHTMLStyles_$pluginname()"; -+# eval("$function"); -+ my $function="AddHTMLStyles_$pluginname"; -+ &$function(); - } - - if ($BuildReportFormat eq 'xhtml' || $BuildReportFormat eq 'xml') { print ($ENV{'HTTP_USER_AGENT'}=~/Firebird/i?"//-->\n":"]]>\n"); } -@@ -660,8 +662,10 @@ sub html_end { - - # Call to plugins' function AddHTMLBodyFooter - foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyFooter'}}) { -- my $function="AddHTMLBodyFooter_$pluginname()"; -- eval("$function"); -+# my $function="AddHTMLBodyFooter_$pluginname()"; -+# eval("$function"); -+ my $function="AddHTMLBodyFooter_$pluginname"; -+ &$function(); - } - - if ($FrameName ne 'index' && $FrameName ne 'mainleft') { -@@ -3254,15 +3258,19 @@ sub Read_History_With_TmpUpdate { - # The plugin for this section was loaded - $found=1; - my $issectiontoload=$SectionsToLoad{"plugin_$pluginname"}; -- my $function="SectionReadHistory_$pluginname(\$issectiontoload,\$readxml,\$xmleb,\$countlines)"; -- eval("$function"); -+# my $function="SectionReadHistory_$pluginname(\$issectiontoload,\$readxml,\$xmleb,\$countlines)"; -+# eval("$function"); -+ my $function="SectionReadHistory_$pluginname"; -+ &$function($issectiontoload,$readxml,$xmleb,$countlines); - delete $SectionsToLoad{"plugin_$pluginname"}; - if ($SectionsToSave{"plugin_$pluginname"}) { - Save_History("plugin_$pluginname",$year,$month); - delete $SectionsToSave{"plugin_$pluginname"}; - if ($withpurge) { -- my $function="SectionInitHashArray_$pluginname()"; -- eval("$function"); -+# my $function="SectionInitHashArray_$pluginname()"; -+# eval("$function"); -+ my $function="SectionInitHashArray_$pluginname"; -+ &$function(); - } - } - last; -@@ -3977,8 +3985,10 @@ sub Save_History { - if ($AtLeastOneSectionPlugin && $sectiontosave =~ /^plugin_(\w+)$/i) { - my $pluginname=$1; - if ($PluginsLoaded{'SectionInitHashArray'}{"$pluginname"}) { -- my $function="SectionWriteHistory_$pluginname(\$xml,\$xmlbb,\$xmlbs,\$xmlbe,\$xmlrb,\$xmlrs,\$xmlre,\$xmleb,\$xmlee)"; -- eval("$function"); -+# my $function="SectionWriteHistory_$pluginname(\$xml,\$xmlbb,\$xmlbs,\$xmlbe,\$xmlrb,\$xmlrs,\$xmlre,\$xmleb,\$xmlee)"; -+# eval("$function"); -+ my $function="SectionWriteHistory_$pluginname"; -+ &$function($xml,$xmlbb,$xmlbs,$xmlbe,$xmlrb,$xmlrs,$xmlre,$xmleb,$xmlee); - } - } - -@@ -4203,8 +4213,10 @@ sub Init_HashArray { - %{'_section_' . $ix . '_l'} = %{'_section_' . $ix . '_p'} = (); - } - foreach my $pluginname (keys %{$PluginsLoaded{'SectionInitHashArray'}}) { -- my $function="SectionInitHashArray_$pluginname()"; -- eval("$function"); -+# my $function="SectionInitHashArray_$pluginname()"; -+# eval("$function"); -+ my $function="SectionInitHashArray_$pluginname"; -+ &$function(); - } - } - -@@ -4788,8 +4800,10 @@ sub ShowUserInfo { - my $user=shift; - # Call to plugins' function ShowInfoUser - foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoUser'}}) { -- my $function="ShowInfoUser_$pluginname('$user')"; -- eval("$function"); -+# my $function="ShowInfoUser_$pluginname('$user')"; -+# eval("$function"); -+ my $function="ShowInfoUser_$pluginname"; -+ &$function($user); - } - } - -@@ -4804,8 +4818,10 @@ sub ShowClusterInfo { - my $user=shift; - # Call to plugins' function ShowInfoCluster - foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoCluster'}}) { -- my $function="ShowInfoCluster_$pluginname('$user')"; -- eval("$function"); -+# my $function="ShowInfoCluster_$pluginname('$user')"; -+# eval("$function"); -+ my $function="ShowInfoCluster_$pluginname"; -+ &$function($user); - } - } - -@@ -4820,8 +4836,10 @@ sub ShowHostInfo { - my $host=shift; - # Call to plugins' function ShowInfoHost - foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoHost'}}) { -- my $function="ShowInfoHost_$pluginname('$host')"; -- eval("$function"); -+# my $function="ShowInfoHost_$pluginname('$host')"; -+# eval("$function"); -+ my $function="ShowInfoHost_$pluginname"; -+ &$function($host); - } - } - -@@ -4838,8 +4856,10 @@ sub ShowURLInfo { - - # Call to plugins' function ShowInfoURL - foreach my $pluginname (keys %{$PluginsLoaded{'ShowInfoURL'}}) { -- my $function="ShowInfoURL_$pluginname('$url')"; -- eval("$function"); -+# my $function="ShowInfoURL_$pluginname('$url')"; -+# eval("$function"); -+ my $function="ShowInfoURL_$pluginname"; -+ &$function($url); - } - - if (length($nompage)>$MaxLengthOfShownURL) { $nompage=substr($nompage,0,$MaxLengthOfShownURL)."..."; } -@@ -5154,8 +5174,10 @@ sub ShowMenuCateg { - my $linetitle=0; - # Call to plugins' function AddHTMLMenuLink - foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuLink'}}) { -- my $function="AddHTMLMenuLink_$pluginname('$categ',\$menu,\$menulink,\$menutext)"; -- eval("$function"); -+# my $function="AddHTMLMenuLink_$pluginname('$categ',\$menu,\$menulink,\$menutext)"; -+# eval("$function"); -+ my $function="AddHTMLMenuLink_$pluginname"; -+ &$function($categ,$menu,$menulink,$menutext); - } - foreach my $key (%$menu) { if ($menu->{$key}>0) { $linetitle++; last; } } - if (! $linetitle) { return; } -@@ -5723,8 +5745,10 @@ if (! $HeaderHTMLSent) { &html_head; } - - # AWStats output is replaced by a plugin output - if ($PluginMode) { -- my $function="BuildFullHTMLOutput_$PluginMode()"; -- eval("$function"); -+# my $function="BuildFullHTMLOutput_$PluginMode()"; -+# eval("$function"); -+ my $function="BuildFullHTMLOutput_$PluginMode"; -+ &$function(); - if ($? || $@) { error("$@"); } - &html_end(0); - exit 0; -@@ -6623,8 +6647,10 @@ if ($UpdateStats && $FrameName ne 'index - elsif ($PluginsLoaded{'GetCountryCodeByAddr'}{'geoip'}) { $Domain=GetCountryCodeByAddr_geoip($HostResolved); } - if ($AtLeastOneSectionPlugin) { - foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}}) { -- my $function="SectionProcessIp_$pluginname(\$HostResolved)"; -- eval("$function"); -+# my $function="SectionProcessIp_$pluginname(\$HostResolved)"; -+# eval("$function"); -+ my $function="SectionProcessIp_$pluginname"; -+ &$function($HostResolved); - } - } - } -@@ -6638,8 +6664,10 @@ if ($UpdateStats && $FrameName ne 'index - elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; } - if ($AtLeastOneSectionPlugin) { - foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}}) { -- my $function="SectionProcessIp_$pluginname(\$Host)"; -- eval("$function"); -+# my $function="SectionProcessIp_$pluginname(\$Host)"; -+# eval("$function"); -+ my $function="SectionProcessIp_$pluginname"; -+ &$function($Host); - } - } - } -@@ -6649,8 +6677,10 @@ if ($UpdateStats && $FrameName ne 'index - elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; } - if ($AtLeastOneSectionPlugin) { - foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessHostname'}}) { -- my $function="SectionProcessHostname_$pluginname(\$HostResolved)"; -- eval("$function"); -+# my $function="SectionProcessHostname_$pluginname(\$HostResolved)"; -+# eval("$function"); -+ my $function="SectionProcessHostname_$pluginname"; -+ &$function($HostResolved); - } - } - } -@@ -7319,8 +7349,10 @@ if (scalar keys %HTMLOutput) { - - # Call to plugins' function AddHTMLBodyHeader - foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyHeader'}}) { -- my $function="AddHTMLBodyHeader_$pluginname()"; -- eval("$function"); -+# my $function="AddHTMLBodyHeader_$pluginname()"; -+# eval("$function"); -+ my $function="AddHTMLBodyHeader_$pluginname"; -+ &$function(); - } - - my $WIDTHMENU1=($FrameName eq 'mainleft'?$FRAMEWIDTH:150); -@@ -7462,8 +7494,10 @@ if (scalar keys %HTMLOutput) { - - # Call to plugins' function AddHTMLMenuHeader - foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuHeader'}}) { -- my $function="AddHTMLMenuHeader_$pluginname()"; -- eval("$function"); -+# my $function="AddHTMLMenuHeader_$pluginname()"; -+# eval("$function"); -+ my $function="AddHTMLMenuHeader_$pluginname"; -+ &$function(); - } - - # MENU -@@ -7572,8 +7606,10 @@ if (scalar keys %HTMLOutput) { - - # Call to plugins' function AddHTMLMenuFooter - foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuFooter'}}) { -- my $function="AddHTMLMenuFooter_$pluginname()"; -- eval("$function"); -+# my $function="AddHTMLMenuFooter_$pluginname()"; -+# eval("$function"); -+ my $function="AddHTMLMenuFooter_$pluginname"; -+ &$function(); - } - - # Exit if left frame -@@ -7666,8 +7702,10 @@ if (scalar keys %HTMLOutput) { - - # Call to plugins' function AddHTMLContentHeader - foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLContentHeader'}}) { -- my $function="AddHTMLContentHeader_$pluginname()"; -- eval("$function"); -+# my $function="AddHTMLContentHeader_$pluginname()"; -+# eval("$function"); -+ my $function="AddHTMLContentHeader_$pluginname"; -+ &$function(); - } - - # Output particular part -@@ -7946,8 +7984,10 @@ if (scalar keys %HTMLOutput) { - if ($HTMLOutput{'urldetail'} || $HTMLOutput{'urlentry'} || $HTMLOutput{'urlexit'}) { - # Call to plugins' function ShowPagesFilter - foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesFilter'}}) { -- my $function="ShowPagesFilter_$pluginname()"; -- eval("$function"); -+# my $function="ShowPagesFilter_$pluginname()"; -+# eval("$function"); -+ my $function="ShowPagesFilter_$pluginname"; -+ &$function(); - } - print "$Center 
\n"; - # Show filter form -@@ -7977,8 +8017,10 @@ if (scalar keys %HTMLOutput) { - if ($ShowPagesStats =~ /X/i) { print "$Message[116]"; } - # Call to plugins' function ShowPagesAddField - foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { -- my $function="ShowPagesAddField_$pluginname('title')"; -- eval("$function"); -+# my $function="ShowPagesAddField_$pluginname('title')"; -+# eval("$function"); -+ my $function="ShowPagesAddField_$pluginname()"; -+ &$function('title'); - } - print " \n"; - $total_p=$total_k=$total_e=$total_x=0; -@@ -8010,8 +8052,10 @@ if (scalar keys %HTMLOutput) { - if ($ShowPagesStats =~ /X/i) { print "".($_url_x{$key}?$_url_x{$key}:" ").""; } - # Call to plugins' function ShowPagesAddField - foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { -- my $function="ShowPagesAddField_$pluginname('$key')"; -- eval("$function"); -+# my $function="ShowPagesAddField_$pluginname('$key')"; -+# eval("$function"); -+ my $function="ShowPagesAddField_$pluginname"; -+ &$function($key); - } - print ""; - # alt and title are not provided to reduce page size -@@ -8039,8 +8083,10 @@ if (scalar keys %HTMLOutput) { - if ($ShowPagesStats =~ /X/i) { print "".($rest_x?$rest_x:" ").""; } - # Call to plugins' function ShowPagesAddField - foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { -- my $function="ShowPagesAddField_$pluginname('')"; -- eval("$function"); -+# my $function="ShowPagesAddField_$pluginname('')"; -+# eval("$function"); -+ my $function="ShowPagesAddField_$pluginname"; -+ &$function(''); - } - print " \n"; - } -@@ -8485,8 +8531,10 @@ if (scalar keys %HTMLOutput) { - if ($htmloutput =~ /^plugin_(\w+)$/) { - my $pluginname=$1; - print "$Center 
"; -- my $function="AddHTMLGraph_$pluginname()"; -- eval("$function"); -+# my $function="AddHTMLGraph_$pluginname()"; -+# eval("$function"); -+ my $function="AddHTMLGraph_$pluginname"; -+ &$function(); - &html_end(1); - } - } -@@ -9592,8 +9640,10 @@ if (scalar keys %HTMLOutput) { - if ($ShowPagesStats =~ /X/i) { print "$Message[116]"; } - # Call to plugins' function ShowPagesAddField - foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { -- my $function="ShowPagesAddField_$pluginname('title')"; -- eval("$function"); -+# my $function="ShowPagesAddField_$pluginname('title')"; -+# eval("$function"); -+ my $function="ShowPagesAddField_$pluginname"; -+ &$function('title'); - } - print " \n"; - $total_p=$total_e=$total_x=$total_k=0; -@@ -9624,8 +9674,10 @@ if (scalar keys %HTMLOutput) { - if ($ShowPagesStats =~ /X/i) { print "".($_url_x{$key}?$_url_x{$key}:" ").""; } - # Call to plugins' function ShowPagesAddField - foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { -- my $function="ShowPagesAddField_$pluginname('$key')"; -- eval("$function"); -+# my $function="ShowPagesAddField_$pluginname('$key')"; -+# eval("$function"); -+ my $function="ShowPagesAddField_$pluginname"; -+ &$function($key); - } - print ""; - if ($ShowPagesStats =~ /P/i && $LogType ne 'F') { print "
"; } -@@ -9653,8 +9705,10 @@ if (scalar keys %HTMLOutput) { - if ($ShowPagesStats =~ /X/i) { print "".($rest_x?$rest_x:" ").""; } - # Call to plugins' function ShowPagesAddField - foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) { -- my $function="ShowPagesAddField_$pluginname('')"; -- eval("$function"); -+# my $function="ShowPagesAddField_$pluginname('')"; -+# eval("$function"); -+ my $function="ShowPagesAddField_$pluginname"; -+ &$function(''); - } - print " \n"; - } diff --git a/www/awstats/patches/patch-ab b/www/awstats/patches/patch-ab index bc180b52d6a..24284cc3897 100644 --- a/www/awstats/patches/patch-ab +++ b/www/awstats/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.3 2005/08/26 20:22:56 adrianp Exp $ +$NetBSD: patch-ab,v 1.3.6.1 2006/05/17 21:26:40 salo Exp $ ---- tools/awstats_configure.pl.orig 2005-01-15 22:42:58.000000000 +0000 +--- tools/awstats_configure.pl.orig 2006-02-08 13:26:14.000000000 -0800 +++ tools/awstats_configure.pl @@ -29,12 +29,12 @@ $AWSTATS_MODEL_CONFIG $AWSTATS_DIRDATA_PATH @@ -124,15 +124,15 @@ $NetBSD: patch-ab,v 1.3 2005/08/26 20:22:56 adrianp Exp $ else { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; } @@ -604,11 +606,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=; chomp $bidon; + 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=; chomp $bidon; - if (! $bidon) { $bidon = "/etc/awstats"; } + if (! $bidon) { $bidon = "@PKG_SYSCONFDIR@"; } - my $configdir=$bidon; + my $configdir=$bidon; if (! -d $configdir) { # Create the directory for config files -- cgit v1.2.3