fix bug #187994, #187811

(Portage version: 2.1.3.7)

5 files changed, 76 insertions, 65 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index 9ce69d9f4f94..6064f80d5c60 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/awstats
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.47 2007/08/05 00:09:58 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.48 2007/09/06 18:48:01 hollow Exp $
+
+*awstats-6.7 (06 Sep 2007)
+
+  06 Sep 2007; Benedikt Böhm <hollow@gentoo.org>
+  files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff, -awstats-6.6.ebuild,
+  +awstats-6.7.ebuild:
+  fix bug #187994, #187811
 
   05 Aug 2007; Renat Lumpau <rl03@gentoo.org> files/digest-awstats-6.5-r1,
   files/digest-awstats-6.5-r2, Manifest:
diff --git a/net-www/awstats/awstats-6.6.ebuild b/net-www/awstats/awstats-6.7.ebuild
index 484e93802602..87daa9c82405 100644
--- a/net-www/awstats/awstats-6.6.ebuild
+++ b/net-www/awstats/awstats-6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.6.ebuild,v 1.12 2007/05/29 00:21:00 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.7.ebuild,v 1.1 2007/09/06 18:48:01 hollow Exp $
 
 inherit eutils webapp versionator depend.apache
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://awstats.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="geoip"
 
 RESTRICT="mirror"
diff --git a/net-www/awstats/files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff b/net-www/awstats/files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff
index 9a82f4eda964..46c6bc3ecfe0 100644
--- a/net-www/awstats/files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff
+++ b/net-www/awstats/files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff
@@ -1,6 +1,17 @@
---- awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl	2005-11-24 15:11:19.000000000 -0500
-+++ awstats-6.5/wwwroot/cgi-bin/awstats.pl	2006-05-06 17:34:13.000000000 -0400
-@@ -5534,7 +5534,7 @@
+Index: awstats-6.5/wwwroot/cgi-bin/awstats.pl
+===================================================================
+--- awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl
++++ awstats-6.5/wwwroot/cgi-bin/awstats.pl
+@@ -1131,7 +1131,7 @@ sub Read_Config {
+ 	my $configdir=shift;
+ 	my @PossibleConfigDir=();
+ 
+-	if ($configdir) { @PossibleConfigDir=("$configdir"); }
++	if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) { @PossibleConfigDir=("$configdir"); }
+ 	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
+ 
+ 	# Open config file
+@@ -5534,7 +5534,7 @@ if ($ENV{'GATEWAY_INTERFACE'}) {	# Run f
  	    $QueryString =~ s/&/&amp;/g;
  	}
  
@@ -9,7 +20,7 @@
  
      # Security test
  	if ($QueryString =~ /LogFile=([^&]+)/i)				{ error("Logfile parameter can't be overwritten when AWStats is used from a CGI"); }
-@@ -5542,7 +5542,7 @@
+@@ -5542,7 +5542,7 @@ if ($ENV{'GATEWAY_INTERFACE'}) {	# Run f
  	# No update but report by default when run from a browser
  	$UpdateStats=($QueryString=~/update=1/i?1:0);
  
@@ -18,7 +29,7 @@
  	if ($QueryString =~ /diricons=([^&]+)/i)			{ $DirIcons=&DecodeEncodedString("$1"); }
  	if ($QueryString =~ /pluginmode=([^&]+)/i)			{ $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); }
  	if ($QueryString =~ /configdir=([^&]+)/i)			{ $DirConfig=&Sanitize(&DecodeEncodedString("$1")); }
-@@ -5561,7 +5561,7 @@
+@@ -5561,7 +5561,7 @@ if ($ENV{'GATEWAY_INTERFACE'}) {	# Run f
  
  	# If migrate
  	if ($QueryString =~ /(^|-|&|&amp;)migrate=([^&]+)/i)	{
@@ -27,7 +38,7 @@
  		$MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/;
  		$SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//;		# SiteConfig is used to find config file
  	}
-@@ -5591,7 +5591,7 @@
+@@ -5591,7 +5591,7 @@ else {								# Run from command line
  	# Update with no report by default when run from command line
  	$UpdateStats=1;
  
@@ -36,23 +47,11 @@
  	if ($QueryString =~ /diricons=([^&]+)/i)			{ $DirIcons="$1"; }
  	if ($QueryString =~ /pluginmode=([^&]+)/i)			{ $PluginMode=&Sanitize("$1",1); }
  	if ($QueryString =~ /configdir=([^&]+)/i)			{ $DirConfig=&Sanitize("$1"); }
-Index: awstats-6.5/wwwroot/cgi-bin/awstats.pl
+Index: awstats-6.5/tools/awstats_buildstaticpages.pl
 ===================================================================
---- awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl	2006-05-05 16:43:12.000000000 -0400
-+++ awstats-6.5/wwwroot/cgi-bin/awstats.pl	2006-05-06 17:26:10.000000000 -0400
-@@ -1131,7 +1131,7 @@
- 	my $configdir=shift;
- 	my @PossibleConfigDir=();
- 
--	if ($configdir) { @PossibleConfigDir=("$configdir"); }
-+	if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) { @PossibleConfigDir=("$configdir"); }
- 	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
- 
- 	# Open config file
-diff -urN awstats-6.5.orig/tools/awstats_buildstaticpages.pl awstats-6.5/tools/awstats_buildstaticpages.pl
---- awstats-6.5.orig/tools/awstats_buildstaticpages.pl	2005-08-23 15:56:35.000000000 -0400
-+++ awstats-6.5/tools/awstats_buildstaticpages.pl	2006-01-04 00:58:20.490613529 -0500
-@@ -75,7 +75,7 @@
+--- awstats-6.5.orig/tools/awstats_buildstaticpages.pl
++++ awstats-6.5/tools/awstats_buildstaticpages.pl
+@@ -75,7 +75,7 @@ $nowsec $nowmin $nowhour $nowday $nowmon
  # Return:		None
  #------------------------------------------------------------------------------
  sub error {
@@ -61,7 +60,7 @@ diff -urN awstats-6.5.orig/tools/awstats_buildstaticpages.pl awstats-6.5/tools/a
      exit 1;
  }
  
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ sub warning {
  #    		print "$messagestring<br />\n";
  #    	}
  #    	else {
@@ -70,10 +69,11 @@ diff -urN awstats-6.5.orig/tools/awstats_buildstaticpages.pl awstats-6.5/tools/a
  #    	}
  #	}
  }
-diff -urN awstats-6.5.orig/tools/awstats_configure.pl awstats-6.5/tools/awstats_configure.pl
---- awstats-6.5.orig/tools/awstats_configure.pl	2005-04-22 13:34:05.000000000 -0400
-+++ awstats-6.5/tools/awstats_configure.pl	2006-01-04 00:58:24.987002812 -0500
-@@ -87,7 +87,7 @@
+Index: awstats-6.5/tools/awstats_configure.pl
+===================================================================
+--- awstats-6.5.orig/tools/awstats_configure.pl
++++ awstats-6.5/tools/awstats_configure.pl
+@@ -87,7 +87,7 @@ $Step=0;
  # error
  #-------------------------------------------------------
  sub error {
@@ -82,10 +82,11 @@ diff -urN awstats-6.5.orig/tools/awstats_configure.pl awstats-6.5/tools/awstats_
      exit 1;
  }
  
-diff -urN awstats-6.5.orig/tools/awstats_exportlib.pl awstats-6.5/tools/awstats_exportlib.pl
---- awstats-6.5.orig/tools/awstats_exportlib.pl	2003-12-05 18:53:38.000000000 -0500
-+++ awstats-6.5/tools/awstats_exportlib.pl	2006-01-04 00:58:30.769217454 -0500
-@@ -93,8 +93,8 @@
+Index: awstats-6.5/tools/awstats_exportlib.pl
+===================================================================
+--- awstats-6.5.orig/tools/awstats_exportlib.pl
++++ awstats-6.5/tools/awstats_exportlib.pl
+@@ -93,8 +93,8 @@ sub error {
  	my $thirdmessage=shift||"";
  	my $donotshowsetupinfo=shift||0;
  	if ($Debug) { debug("$message $secondmessage $thirdmessage",1); }
@@ -96,22 +97,11 @@ diff -urN awstats-6.5.orig/tools/awstats_exportlib.pl awstats-6.5/tools/awstats_
  	exit 1;
  }
  
-diff -urN awstats-6.5.orig/tools/awstats_updateall.pl awstats/tools/awstats_updateall.pl
---- awstats-6.5.orig/tools/awstats_updateall.pl	2005-04-22 13:34:05.000000000 -0400
-+++ awstats-6.5/tools/awstats_updateall.pl	2006-01-04 00:58:34.910654953 -0500
-@@ -36,7 +36,7 @@
- # Return:		None
- #------------------------------------------------------------------------------
- sub error {
--	print "Error: $_[0].\n";
-+	print STDERR "Error: $_[0].\n";
-     exit 1;
- }
- 
-diff -urN awstats-6.5.orig/tools/logresolvemerge.pl awstats-6.5/tools/logresolvemerge.pl
---- awstats-6.5.orig/tools/logresolvemerge.pl	2005-12-04 16:10:46.000000000 -0500
-+++ awstats-6.5/tools/logresolvemerge.pl	2006-01-04 00:58:38.552160356 -0500
-@@ -104,7 +104,7 @@
+Index: awstats-6.5/tools/awstats_updateall.pl
+===================================================================
+--- awstats-6.5.orig/tools/awstats_updateall.pl
++++ awstats-6.5/tools/awstats_updateall.pl
+@@ -36,7 +36,7 @@ my $AwstatsProg='';
  # Return:		None
  #------------------------------------------------------------------------------
  sub error {
@@ -120,19 +110,33 @@ diff -urN awstats-6.5.orig/tools/logresolvemerge.pl awstats-6.5/tools/logresolve
      exit 1;
  }
  
-@@ -133,7 +133,7 @@
- sub warning {
- 	my $messagestring=shift;
- 	if ($Debug) { debug("$messagestring",1); }
--   	print "$messagestring\n";
-+   	print STDERR "$messagestring\n";
- }
- 
+Index: awstats-6.5/tools/logresolvemerge.pl
+===================================================================
+--- awstats-6.5.orig/tools/logresolvemerge.pl
++++ awstats-6.5/tools/logresolvemerge.pl
+@@ -104,7 +104,7 @@ my $bzcat_file = '\.bz2$';

+ # Return:		None

+ #------------------------------------------------------------------------------

+ sub error {

+-	print "Error: $_[0].\n";

++	print STDERR "Error: $_[0].\n";

+     exit 1;

+ }

+ 

+@@ -133,7 +133,7 @@ sub debug {

+ sub warning {

+ 	my $messagestring=shift;

+ 	if ($Debug) { debug("$messagestring",1); }

+-   	print "$messagestring\n";

++   	print STDERR "$messagestring\n";

+ }

+ 

  #-----------------------------------------------------------------------------

-diff -urN awstats-6.5.orig/tools/maillogconvert.pl awstats-6.5/tools/maillogconvert.pl
---- awstats-6.5.orig/tools/maillogconvert.pl	2005-04-22 13:34:05.000000000 -0400
-+++ awstats-6.5/tools/maillogconvert.pl	2006-01-04 00:58:42.465628823 -0500
-@@ -56,7 +56,7 @@
+Index: awstats-6.5/tools/maillogconvert.pl
+===================================================================
+--- awstats-6.5.orig/tools/maillogconvert.pl
++++ awstats-6.5/tools/maillogconvert.pl
+@@ -56,7 +56,7 @@ $MailType='';				# Mail server family (p
  #-------------------------------------------------------
  
  sub error {
diff --git a/net-www/awstats/files/digest-awstats-6.6 b/net-www/awstats/files/digest-awstats-6.6
deleted file mode 100644
index c91ad7be03d5..000000000000
--- a/net-www/awstats/files/digest-awstats-6.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 38e393edb530d409fdf7f79127a7548e awstats-6.6.tar.gz 1084101
-RMD160 5588e667948b6f739ff5f2d61b26a45c2d39e0da awstats-6.6.tar.gz 1084101
-SHA256 dcd5d717621b15474ab79c88251f39471eb2dbfdc46ba6a62113c3e953b9755c awstats-6.6.tar.gz 1084101
diff --git a/net-www/awstats/files/digest-awstats-6.7 b/net-www/awstats/files/digest-awstats-6.7
new file mode 100644
index 000000000000..e2671d9817bc
--- /dev/null
+++ b/net-www/awstats/files/digest-awstats-6.7
@@ -0,0 +1,3 @@
+MD5 512cd146247eb178ef023c924f7bb766 awstats-6.7.tar.gz 1089638
+RMD160 5a84327871b65cad5cb6dbaded5c223660806953 awstats-6.7.tar.gz 1089638
+SHA256 36344e7c2271393cf60e9a3818392fbece0ff838c83fcf59fed9818dfac5a081 awstats-6.7.tar.gz 1089638