pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q2]: pkgsrc/www/awstats Pullup ticket 702 - requested by A...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a1b3695fc784
branches: pkgsrc-2005Q2
changeset: 496009:a1b3695fc784
user: salo <salo%pkgsrc.org@localhost>
date: Sat Aug 20 15:33:42 2005 +0000
description:
Pullup ticket 702 - requested by Adrian Portelli
security fix for awstats
Revisions pulled up:
- pkgsrc/www/awstats/Makefile 1.19
- pkgsrc/www/awstats/distinfo 1.12
- pkgsrc/www/awstats/patches/patch-aa 1.3
Module Name: pkgsrc
Committed By: adrianp
Date: Sat Aug 20 14:28:03 UTC 2005
Modified Files:
pkgsrc/www/awstats: Makefile distinfo
Added Files:
pkgsrc/www/awstats/patches: patch-aa
Log Message:
Patch from awstats CVS for CAN-2005-1527
Bump to nb1
diffstat:
www/awstats/Makefile | 3 +-
www/awstats/distinfo | 9 +-
www/awstats/patches/patch-aa | 353 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 360 insertions(+), 5 deletions(-)
diffs (truncated from 384 to 300 lines):
diff -r d3efe4517834 -r a1b3695fc784 www/awstats/Makefile
--- a/www/awstats/Makefile Sat Aug 20 15:26:21 2005 +0000
+++ b/www/awstats/Makefile Sat Aug 20 15:33:42 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16.2.1 2005/08/15 04:43:59 snj Exp $
+# $NetBSD: Makefile,v 1.16.2.2 2005/08/20 15:33:42 salo Exp $
#
DISTNAME= awstats-6.4
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://awstats.sourceforge.net/files/
EXTRACT_SUFX= .tgz
diff -r d3efe4517834 -r a1b3695fc784 www/awstats/distinfo
--- a/www/awstats/distinfo Sat Aug 20 15:26:21 2005 +0000
+++ b/www/awstats/distinfo Sat Aug 20 15:33:42 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10.4.1 2005/08/15 04:43:59 snj Exp $
+$NetBSD: distinfo,v 1.10.4.2 2005/08/20 15:33:42 salo Exp $
-SHA1 (awstats-6.4/awstats-6.4.tgz) = e58671499006881516406e9fa704b0ef34b94971
-RMD160 (awstats-6.4/awstats-6.4.tgz) = 318b34afcb7f7e8a4d26d46344e37bcbe3a8460a
-Size (awstats-6.4/awstats-6.4.tgz) = 918435 bytes
+SHA1 (awstats-6.4nb1/awstats-6.4.tgz) = e58671499006881516406e9fa704b0ef34b94971
+RMD160 (awstats-6.4nb1/awstats-6.4.tgz) = 318b34afcb7f7e8a4d26d46344e37bcbe3a8460a
+Size (awstats-6.4nb1/awstats-6.4.tgz) = 918435 bytes
+SHA1 (patch-aa) = a28254829dc3a025648ead708c932d432a69ed59
diff -r d3efe4517834 -r a1b3695fc784 www/awstats/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/awstats/patches/patch-aa Sat Aug 20 15:33:42 2005 +0000
@@ -0,0 +1,353 @@
+$NetBSD: patch-aa,v 1.1.6.2 2005/08/20 15:33:42 salo 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<a name=\"urls\"> </a><br />\n";
+ # Show filter form
+@@ -7977,8 +8017,10 @@ if (scalar keys %HTMLOutput) {
+ if ($ShowPagesStats =~ /X/i) { print "<th bgcolor=\"#$color_x\" width=\"80\">$Message[116]</th>"; }
+ # Call to plugins' function ShowPagesAddField
+ foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) {
+- my $function="ShowPagesAddField_$pluginname('title')";
+- eval("$function");
++# my $function="ShowPagesAddField_$pluginname('title')";
Home |
Main Index |
Thread Index |
Old Index