[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.5.dfsg-2-8-gdc52b44

[Sergey B Kirpichev]

The following commit has been merged in the master branch:
commit dc52b444cb22707cfc13d9a5d67d44d06dea5f44
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Tue May 18 22:28:19 2010 +0400

    Report permissions problem while reading awstats.custom.conf (Closes: #572353, thanks to Ken Neighbors)

diff --git a/debian/patches/1016_report_permissions_problem_for_configs.patch b/debian/patches/1016_report_permissions_problem_for_configs.patch
new file mode 100644
index 0000000..b527244
--- /dev/null
+++ b/debian/patches/1016_report_permissions_problem_for_configs.patch
@@ -0,0 +1,26 @@
+Description: Report permissions problem while reading awstats.custom.conf
+Author: Ken Neighbors <KenNeighbors at gmail.com>
+Bug-Debian: http://bugs.debian.org/572353
+
+Index: awstats/wwwroot/cgi-bin/awstats.pl
+===================================================================
+--- awstats.orig/wwwroot/cgi-bin/awstats.pl	2010-05-18 22:22:42.000000000 +0400
++++ awstats/wwwroot/cgi-bin/awstats.pl	2010-05-18 22:24:14.000000000 +0400
+@@ -1745,11 +1745,17 @@
+ 			$FileSuffix = ".$SiteConfig";
+ 			last;
+ 		}
++		elsif ( -e "$searchdir$PROG.$SiteConfig.conf" ) {
++			error("Couldn't open config file \"$searchdir$PROG.$SiteConfig.conf\": $!" );
++		}
+ 		if ( open( CONFIG, "$searchdir$PROG.conf" ) ) {
+ 			$FileConfig = "$searchdir$PROG.conf";
+ 			$FileSuffix = '';
+ 			last;
+ 		}
++		elsif ( -e "$searchdir$PROG.conf" ) {
++			error("Couldn't open config file \"$searchdir$PROG.conf\": $!" );
++		}
+ 	}
+ 	if ( !$FileConfig ) {
+ 		error(
diff --git a/debian/patches/series b/debian/patches/series
index 7053bf1..26c95d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,5 @@
 1013_yahoo_search.patch
 1014_websec_robot.patch
 1015_ignore_case_for_rtsp.patch
+1016_report_permissions_problem_for_configs.patch
 2001_awstatsprog_path.patch

-- 
awstats Debian packaging