summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2013-03-08 10:26:42 +0000
committerHanno Böck <hanno@gentoo.org>2013-03-08 10:26:42 +0000
commitaa535415daed662ecc8107575977c32cced99e9e (patch)
tree00718065c258345a5a7fb8e22b2bed4521dd12d5 /eclass
parentAdjust entry for qt-creator. (diff)
downloadgentoo-2-aa535415daed662ecc8107575977c32cced99e9e.tar.gz
gentoo-2-aa535415daed662ecc8107575977c32cced99e9e.tar.bz2
gentoo-2-aa535415daed662ecc8107575977c32cced99e9e.zip
Don't let apache install re-set all permissions on log-dir.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/apache-2.eclass10
2 files changed, 7 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 133440d92d13..1a0705d2e6a7 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.718 2013/03/07 21:02:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.719 2013/03/08 10:26:42 hanno Exp $
+
+ 08 Mar 2013; Hanno Boeck <hanno@gentoo.org> apache-2.eclass:
+ Remove re-setting of permissions every time apache gets reinstalled. See bug
+ #398899.
07 Mar 2013; Tim Harder <radhermit@gentoo.org> python.eclass:
Add 2.7-jython.
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index b4fc37be5ca5..e5083afe08ae 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.29 2012/05/23 03:24:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.30 2013/03/08 10:26:42 hanno Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -550,12 +550,6 @@ 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