[Pkg-apache-commits] r1366 - in /trunk/apache2: changelog rules

[sf at alioth.debian.org]

Author: sf
Date: Tue Oct 11 20:38:15 2011
New Revision: 1366

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1366
Log:
Correctly set permissions of suexec.load even if umask is 0002 during
build

Modified:
    trunk/apache2/changelog
    trunk/apache2/rules

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1366&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Tue Oct 11 20:38:15 2011
@@ -1,3 +1,10 @@
+apache2 (2.2.21-2) UNRELEASED; urgency=low
+
+  * Correctly set permissions of suexec.load even if umask is 0002 during
+    build. LP: #872000
+
+ -- Stefan Fritsch <sf at debian.org>  Tue, 11 Oct 2011 22:28:24 +0200
+
 apache2 (2.2.21-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/apache2/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/rules?rev=1366&op=diff
==============================================================================
--- trunk/apache2/rules (original)
+++ trunk/apache2/rules Tue Oct 11 20:38:15 2011
@@ -235,8 +235,6 @@
 	chmod 4754 debian/apache2-suexec/usr/lib/apache2/suexec 
 	chgrp www-data debian/apache2-suexec/usr/lib/apache2/suexec
 
-	chmod 644 debian/apache2.2-bin/usr/lib/apache2/modules/mod_suexec.so
-
 	# configurable suexec
 	cp debian/build-tree/worker/support/suexec-custom debian/apache2-suexec-custom/usr/lib/apache2/suexec
 	cp debian/suexec-custom.config debian/apache2-suexec-custom/etc/apache2/suexec/www-data
@@ -311,7 +309,7 @@
 	dh_link
 	dh_installexamples
 	dh_compress
-	dh_fixperms -Xsuexec
+	dh_fixperms -Xusr/lib/apache2/suexec
 	chown -R www-data:www-data debian/apache2.2-common/var/cache/apache2
 	chown root:adm debian/apache2.2-common/var/log/apache2
 	chmod o-rx debian/apache2.2-common/var/log/apache2