[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.5.dfsg-3-10-g3f11eca

[Sergey B Kirpichev]

The following commit has been merged in the master branch:
commit 79df4053ee9605cdc9c8930b319acf0b571541df
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Sat Jun 12 20:00:03 2010 +0400

    Prevent nested includes from being prematurely closed.  Closes: bug#575545.

diff --git a/debian/patches/1005_nested_includes.patch b/debian/patches/1005_nested_includes.patch
new file mode 100644
index 0000000..f9862fe
--- /dev/null
+++ b/debian/patches/1005_nested_includes.patch
@@ -0,0 +1,28 @@
+Description: Prevent nested includes from being prematurely closed.
+Author: Ken Neighbors <debian3 at ken.nsds.com>
+Bug-Debian: http://bugs.debian.org/575545
+
+Index: awstats/tools/awstats_buildstaticpages.pl
+===================================================================
+--- awstats.orig/tools/awstats_buildstaticpages.pl	2010-06-12 19:49:47.000000000 +0400
++++ awstats/tools/awstats_buildstaticpages.pl	2010-06-12 19:50:12.000000000 +0400
+@@ -197,6 +197,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 );
+Index: awstats/wwwroot/cgi-bin/awstats.pl
+===================================================================
+--- awstats.orig/wwwroot/cgi-bin/awstats.pl	2010-06-12 19:49:39.000000000 +0400
++++ awstats/wwwroot/cgi-bin/awstats.pl	2010-06-12 19:51:56.000000000 +0400
+@@ -1848,6 +1848,7 @@
+ 				);
+ 				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 472c668..35345cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 1002_disable_configdir.patch
 1003_redirect_to_STDERR.patch
 1004_perl_version.patch
+1005_nested_includes.patch
 1008_extrasections_with_top.patch
 1009_hurd_url.patch
 1010_dirdata_permissions.patch

-- 
awstats Debian packaging