[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 285dfa726213f237f31712ee8898cd3a4527fd9a

[Arno Töll]

The following commit has been merged in the next branch:
commit 285dfa726213f237f31712ee8898cd3a4527fd9a
Author: Arno Töll <debian at toell.net>
Date:   Mon Apr 2 10:50:36 2012 +0200

    Fix #666875 - change directory permissions to 755 by default. Thanks Axel Beckert for the hint

diff --git a/debian/changelog b/debian/changelog
index a5c010f..2735294 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ apache2 (2.4.1-4) experimental; urgency=low
   * Drop update-alternative call in postrm. Our prerm script catches them
     already anyway.
   * Update my mail address.
+  * Fix "dh_apache2 does not set "x" bits on /usr/lib/apache2/modules/"
+    Set directory permissions to 755 by default (Closes: #666875). Thanks Axel
+    Beckert for the hint.
 
- -- Arno Töll <arno at debian.org>  Sun, 01 Apr 2012 22:06:48 +0200
+ -- Arno Töll <arno at debian.org>  Mon, 02 Apr 2012 10:49:09 +0200
 
 apache2 (2.4.1-3) experimental; urgency=low
 
diff --git a/debian/debhelper/dh_apache2.in b/debian/debhelper/dh_apache2.in
index c871ae2..2c516cb 100755
--- a/debian/debhelper/dh_apache2.in
+++ b/debian/debhelper/dh_apache2.in
@@ -342,9 +342,9 @@ foreach my $package (getpackages())
 					if (! -d $modinstalldir)
 					{
 						complex_doit("mkdir","-p", $modinstalldir);
+						complex_doit("chmod","755","$modinstalldir");
 					}
 					complex_doit("cp", $source, $modinstalldir);
-					complex_doit("chmod","644","$modinstalldir");
 					next;
 				}
 
@@ -377,6 +377,7 @@ foreach my $package (getpackages())
 			if (! -d $installdir)
 			{
 				complex_doit("mkdir","-p",$installdir);
+				complex_doit("chmod","755","$installdir");
 			}
 			complex_doit("cp",$source,$installdir);
 			complex_doit("chmod","644","$installdir/$basesource");

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)