diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2012-03-29 15:35:04 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2012-03-29 15:35:04 +0000 |
| commit | 4f2ffd20d2b9212c7b67f99e77a417094fd2cce4 (patch) | |
| tree | ef01eaef7f1dafcee2cbaa4b1bd920714954ccf6 /eclass | |
| parent | Stable for HPPA (bug #408727). (diff) | |
| download | gentoo-2-4f2ffd20d2b9212c7b67f99e77a417094fd2cce4.tar.gz gentoo-2-4f2ffd20d2b9212c7b67f99e77a417094fd2cce4.tar.bz2 gentoo-2-4f2ffd20d2b9212c7b67f99e77a417094fd2cce4.zip | |
Sanitizing directory permissions #398899
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/apache-2.eclass | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 22a52857791e..305243ca0071 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.193 2012/03/29 12:47:35 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.194 2012/03/29 15:35:04 patrick Exp $ + + 29 Mar 2012; Patrick Lauer <patrick@gentoo.org> apache-2.eclass: + Sanitizing directory permissions #398899 29 Mar 2012; Marien Zwart <marienz@gentoo.org> python.eclass: Add more versions of pypy to the hardcoded mapping in python.eclass. diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 74110bacc03b..570a61850a8f 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.27 2012/03/05 08:20:52 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.28 2012/03/29 15:35:04 patrick Exp $ # @ECLASS: apache-2.eclass # @MAINTAINER: @@ -539,7 +539,7 @@ apache-2_src_install() { for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do keepdir ${i} fowners apache:apache ${i} - fperms 0755 ${i} + fperms 0750 ${i} done } @@ -550,6 +550,12 @@ apache-2_src_install() { # because the default webroot is a copy of the files that exist elsewhere and we # don't want them to be managed/removed by portage when apache is upgraded. apache-2_pkg_postinst() { + # fix previously wrong set permissions Bug#398899 + einfo "Sanitizing directory permissions ..." + for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do + chmod 0750 ${i} + done + if use ssl && [[ ! -e "${ROOT}/etc/ssl/apache2/server.pem" ]]; then SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}" install_cert /etc/ssl/apache2/server |