From 75906dbeb7bcd6cd616c476cfa5e9acf04995117 Mon Sep 17 00:00:00 2001
From: salo <salo>
Date: Wed, 31 May 2006 00:03:03 +0000
Subject: Pullup ticket 1677 - requested by minskim security fix for awstats

Revisions pulled up:
- pkgsrc/www/awstats/Makefile			1.26
- pkgsrc/www/awstats/distinfo			1.15, 1.16
- pkgsrc/www/awstats/patches/patch-aa		1.5, 1.5

   Module Name:		pkgsrc
   Committed By:	minskim
   Date:		Tue May 30 04:33:12 UTC 2006

   Modified Files:
   	pkgsrc/www/awstats: Makefile distinfo
   Added Files:
   	pkgsrc/www/awstats/patches: patch-aa

   Log Message:
   Fix http://www.debian.org/security/2006/dsa-1075.  Patch from Debian
   GNU/Linux.

   Bump PKGREVISION.
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Tue May 30 19:50:25 UTC 2006

   Modified Files:
   	pkgsrc/www/awstats: distinfo
   	pkgsrc/www/awstats/patches: patch-aa

   Log Message:
   Fix a problem with perl warnings and static page generation.
   ok'ed minskim@
---
 www/awstats/Makefile         |  3 ++-
 www/awstats/distinfo         |  3 ++-
 www/awstats/patches/patch-aa | 24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 www/awstats/patches/patch-aa

diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 59f536741a0..4c1c220ef30 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23.2.1 2006/05/17 21:26:40 salo Exp $
+# $NetBSD: Makefile,v 1.23.2.2 2006/05/31 00:03:03 salo Exp $
 #
 
 DISTNAME=	awstats-6.6
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://awstats.sourceforge.net/files/
 
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index de5789e4766..f084188361e 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13.6.1 2006/05/17 21:26:40 salo Exp $
+$NetBSD: distinfo,v 1.13.6.2 2006/05/31 00:03:03 salo Exp $
 
 SHA1 (awstats-6.6.tar.gz) = bc873ca91ee82905fdb37e83349e4007f1042c81
 RMD160 (awstats-6.6.tar.gz) = 0b5e4e2ff718943065cdff81577ae9ca4f50a74d
 Size (awstats-6.6.tar.gz) = 1059148 bytes
+SHA1 (patch-aa) = 2245d859abcd7facf5e57714d414e52ec7cc5040
 SHA1 (patch-ab) = e740af99580d2cb5d68e99ca4f8e08e71a46d9d9
diff --git a/www/awstats/patches/patch-aa b/www/awstats/patches/patch-aa
new file mode 100644
index 00000000000..5a3c03bb206
--- /dev/null
+++ b/www/awstats/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.3.6.2 2006/05/31 00:03:03 salo Exp $
+
+--- wwwroot/cgi-bin/awstats.pl.orig	2006-05-06 03:42:26.000000000 +0100
++++ wwwroot/cgi-bin/awstats.pl
+@@ -10,8 +10,8 @@
+ require 5.005;
+ 
+ #$|=1;
+-use warnings;		# Must be used in test mode only. This reduce a little process speed
+-use diagnostics;	# Must be used in test mode only. This reduce a lot of process speed
++#use warnings;		# Must be used in test mode only. This reduce a little process speed
++#use diagnostics;	# Must be used in test mode only. This reduce a lot of process speed
+ use strict;no strict "refs";
+ use Time::Local;	# use Time::Local 'timelocal_nocheck' is faster but not supported by all Time::Local modules
+ use Socket;
+@@ -1131,7 +1131,7 @@ sub Read_Config {
+ 	my $configdir=shift;
+ 	my @PossibleConfigDir=();
+ 
+-	if ($configdir)
++	if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+ 	{
+ 		# If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+ 		#if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
-- 
cgit v1.2.3