| 1 |
commit: 7470c19b301ffe27fe8f20df46906827b3f24972 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 24 11:22:38 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 24 11:27:16 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7470c19b |
| 7 |
|
| 8 |
apache2.eclass: Attempt to fix USE="suexec-caps" |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/665742 |
| 11 |
|
| 12 |
eclass/apache-2.eclass | 15 +++++++++------ |
| 13 |
1 file changed, 9 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass |
| 16 |
index 3195d03a395..b4048ae9c63 100644 |
| 17 |
--- a/eclass/apache-2.eclass |
| 18 |
+++ b/eclass/apache-2.eclass |
| 19 |
@@ -10,7 +10,7 @@ |
| 20 |
# This eclass handles apache-2.x ebuild functions such as LoadModule generation |
| 21 |
# and inter-module dependency checking. |
| 22 |
|
| 23 |
-inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs eapi7-ver |
| 24 |
+inherit autotools flag-o-matic multilib ssl-cert user toolchain-funcs eapi7-ver |
| 25 |
|
| 26 |
[[ ${CATEGORY}/${PN} != www-servers/apache ]] \ |
| 27 |
&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!" |
| 28 |
@@ -293,7 +293,7 @@ setup_modules() { |
| 29 |
if ver_test ${PV} -ge 2.4.34 ; then |
| 30 |
MY_CONF+=( $(use_with !suexec-syslog suexec-logfile "${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}") ) |
| 31 |
MY_CONF+=( $(use_with suexec-syslog) ) |
| 32 |
- MY_CONF+=( $(use_with suexec-caps suexec-capabilities) ) |
| 33 |
+ MY_CONF+=( $(usex suexec-syslog $(use_enable suexec-caps suexec-capabilities) --disable-suexec-capabilities) ) |
| 34 |
else |
| 35 |
MY_CONF+=( --with-suexec-logfile="${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}" ) |
| 36 |
fi |
| 37 |
@@ -627,10 +627,13 @@ apache-2_src_install() { |
| 38 |
|
| 39 |
# set some sane permissions for suexec |
| 40 |
if use suexec ; then |
| 41 |
- fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec |
| 42 |
- fperms 4710 /usr/sbin/suexec |
| 43 |
- # provide legacy symlink for suexec, bug 177697 |
| 44 |
- dosym /usr/sbin/suexec /usr/sbin/suexec2 |
| 45 |
+ local needs_adjustment="$(ver_test ${PV} -ge 2.4.34 && { { ! use suexec-syslog || ! use suexec-caps ; } && echo true || echo false ; } || echo true)" |
| 46 |
+ if ${needs_adjustment} ; then |
| 47 |
+ fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec |
| 48 |
+ fperms 4710 /usr/sbin/suexec |
| 49 |
+ # provide legacy symlink for suexec, bug 177697 |
| 50 |
+ dosym /usr/sbin/suexec /usr/sbin/suexec2 |
| 51 |
+ fi |
| 52 |
fi |
| 53 |
|
| 54 |
# empty dirs |
Archives