1 |
commit: 6f097e8f95bf8a3c496821dc05ed57b71e0fc9f4 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 7 08:53:41 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 7 08:54:15 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f097e8f |
7 |
|
8 |
apache2.eclass: Fix stray 'no' from nested usex |
9 |
|
10 |
Closes: https://bugs.gentoo.org/669472 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
eclass/apache-2.eclass | 4 +++- |
14 |
1 file changed, 3 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass |
17 |
index 26f3d2d2891..d7c8254d8b2 100644 |
18 |
--- a/eclass/apache-2.eclass |
19 |
+++ b/eclass/apache-2.eclass |
20 |
@@ -293,7 +293,9 @@ setup_modules() { |
21 |
if ver_test ${PV} -ge 2.4.34 ; then |
22 |
MY_CONF+=( $(use_with !suexec-syslog suexec-logfile "${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}") ) |
23 |
MY_CONF+=( $(use_with suexec-syslog) ) |
24 |
- MY_CONF+=( $(usex suexec-syslog $(usex suexec-caps --enable-suexec-capabilities '') '') ) |
25 |
+ if use suexec-syslog && use suexec-caps ; then |
26 |
+ MY_CONF+=( --enable-suexec-capabilities ) |
27 |
+ fi |
28 |
else |
29 |
MY_CONF+=( --with-suexec-logfile="${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}" ) |
30 |
fi |