summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2007-06-29 17:09:36 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:36:44 +0100
commitfa5fc930afb108b92230dab8fd1a4db2cb0b6dee (patch)
tree0edad4d5082df6a4461f3939eb92ad922e80e6cd /debian
parent15191815bdc33ed0d7d4a96ce1770e043f33a25b (diff)
downloadapache2-fa5fc930afb108b92230dab8fd1a4db2cb0b6dee.tar.gz
chmod o-rx suexec
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@395 01b336ce-410b-0410-9a02-a0e7f243c266
Diffstat (limited to 'debian')
-rw-r--r--debian/apache2.2-common.lintian-overrides2
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules3
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/apache2.2-common.lintian-overrides b/debian/apache2.2-common.lintian-overrides
index 430032ad..74aacdbf 100644
--- a/debian/apache2.2-common.lintian-overrides
+++ b/debian/apache2.2-common.lintian-overrides
@@ -1,2 +1,2 @@
-apache2.2-common: setuid-binary usr/lib/apache2/suexec 4755 root/root
+apache2.2-common: setuid-binary usr/lib/apache2/suexec 4750 root/www-data
apache2.2-common: non-standard-dir-perm var/log/apache2/ 0750 != 0755
diff --git a/debian/changelog b/debian/changelog
index fa57d695..cb26001b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ apache2 (2.2.4-1) UNRELEASED; urgency=low
* Show -X option in help message (Closes: #391817)
* remove sick-hack-to-update-modules
* Don't use AddDefaultCharset for our docs (Closes: #414429)
+ * chmod o-rx suexec (Closes: #431048)
[ Peter Samuelson ]
* Add shlibs:Depends to apache2.2-common.
diff --git a/debian/rules b/debian/rules
index 2552f16f..1bbac9bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -192,7 +192,8 @@ install: build install-worker install-prefork install-common install-dev install
fi
mkdir -p debian/apache2.2-common/etc/logrotate.d
cp debian/logrotate debian/apache2.2-common/etc/logrotate.d/apache2
- chmod 4755 debian/apache2.2-common/usr/lib/apache2/suexec
+ chmod 4750 debian/apache2.2-common/usr/lib/apache2/suexec
+ chgrp www-data debian/apache2.2-common/usr/lib/apache2/suexec
chmod 644 debian/apache2.2-common/usr/lib/apache2/modules/mod_suexec.so
for i in `find debian/a2-scripts -name .svn -prune -o -name .arch-ids -prune -o -type f -print`; \
do install -m755 $$i debian/apache2.2-common/usr/sbin; \