From 641feeb2ac32ef72c4faf4546154b96e3af488b8 Mon Sep 17 00:00:00 2001 From: Ken Neighbors Date: Thu, 29 Apr 2010 14:01:39 -0700 Subject: Add patch to fix truncated nested included config files. Closes: #575545, thanks to Ken Neighbors. --- debian/patches/1016_nested_includes.patch | 28 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 debian/patches/1016_nested_includes.patch diff --git a/debian/patches/1016_nested_includes.patch b/debian/patches/1016_nested_includes.patch new file mode 100644 index 0000000..80449f9 --- /dev/null +++ b/debian/patches/1016_nested_includes.patch @@ -0,0 +1,28 @@ +Description: Fix bug with truncated nested included config files. +Author: Ken Neighbors +Bug-Debian: http://bugs.debian.org/575545 + +Index: awstats/wwwroot/cgi-bin/awstats.pl +=================================================================== +--- awstats.orig/wwwroot/cgi-bin/awstats.pl 2007-07-07 11:00:06.000000000 +0000 ++++ awstats/wwwroot/cgi-bin/awstats.pl 2010-03-26 16:54:32.000000000 +0000 +@@ -1220,6 +1220,7 @@ + ); + next; + } ++ local( *CONFIG_INCLUDE ); + if ( open( CONFIG_INCLUDE, $includeFile ) ) { + &Parse_Config( *CONFIG_INCLUDE, $level + 1, $includeFile ); + close(CONFIG_INCLUDE); +Index: awstats/tools/awstats_buildstaticpages.pl +=================================================================== +--- awstats.orig/tools/awstats_buildstaticpages.pl 2007-07-07 10:57:20.000000000 +0000 ++++ awstats/tools/awstats_buildstaticpages.pl 2010-03-26 19:11:57.000000000 +0000 +@@ -189,6 +189,7 @@ + warning("Warning: Perl versions before 5.6 cannot handle nested includes"); + next; + } ++ local( *CONFIG_INCLUDE ); + if ( open( CONFIG_INCLUDE, $includeFile ) ) { + &Parse_Config( *CONFIG_INCLUDE , $level+1, $includeFile); + close( CONFIG_INCLUDE ); diff --git a/debian/patches/series b/debian/patches/series index 88bb06f..00ddf4e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,4 +10,5 @@ 1012_ipv6_strip_trailing_dot.patch 1013_yahoo_search.patch 1014_websec_robot.patch +1016_nested_includes.patch 2001_awstatsprog_path.patch -- 1.5.6.5