| 1 |
commit: 0dff3f67977ba3fe2e90ec38a2d64e0bd64fded8 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 1 14:00:39 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 1 14:07:34 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dff3f67 |
| 7 |
|
| 8 |
apache-2.eclass: Removed version specific suexec handling |
| 9 |
|
| 10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/apache-2.eclass | 17 ++++++----------- |
| 13 |
1 file changed, 6 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass |
| 16 |
index ff6ed9eafb1..29f6edda53c 100644 |
| 17 |
--- a/eclass/apache-2.eclass |
| 18 |
+++ b/eclass/apache-2.eclass |
| 19 |
@@ -272,7 +272,7 @@ setup_modules() { |
| 20 |
elog "through the following environment variables:" |
| 21 |
elog |
| 22 |
elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: '${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin')" |
| 23 |
- if { ver_test ${PV} -ge 2.4.34 && ! use suexec-syslog ; } || ver_test ${PV} -lt 2.4.34 ; then |
| 24 |
+ if ! use suexec-syslog ; then |
| 25 |
elog " SUEXEC_LOGFILE: Path to the suexec logfile (default: '${EPREFIX}/var/log/apache2/suexec_log')" |
| 26 |
fi |
| 27 |
elog " SUEXEC_CALLER: Name of the user Apache is running as (default: apache)" |
| 28 |
@@ -284,14 +284,10 @@ setup_modules() { |
| 29 |
elog |
| 30 |
|
| 31 |
MY_CONF+=( --with-suexec-safepath="${SUEXEC_SAFEPATH:-${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin}" ) |
| 32 |
- if ver_test ${PV} -ge 2.4.34 ; then |
| 33 |
- MY_CONF+=( $(use_with !suexec-syslog suexec-logfile "${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}") ) |
| 34 |
- MY_CONF+=( $(use_with suexec-syslog) ) |
| 35 |
- if use suexec-syslog && use suexec-caps ; then |
| 36 |
- MY_CONF+=( --enable-suexec-capabilities ) |
| 37 |
- fi |
| 38 |
- else |
| 39 |
- MY_CONF+=( --with-suexec-logfile="${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}" ) |
| 40 |
+ MY_CONF+=( $(use_with !suexec-syslog suexec-logfile "${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}") ) |
| 41 |
+ MY_CONF+=( $(use_with suexec-syslog) ) |
| 42 |
+ if use suexec-syslog && use suexec-caps ; then |
| 43 |
+ MY_CONF+=( --enable-suexec-capabilities ) |
| 44 |
fi |
| 45 |
MY_CONF+=( --with-suexec-bin="${EPREFIX}/usr/sbin/suexec" ) |
| 46 |
MY_CONF+=( --with-suexec-userdir=${SUEXEC_USERDIR:-public_html} ) |
| 47 |
@@ -626,8 +622,7 @@ apache-2_src_install() { |
| 48 |
|
| 49 |
# set some sane permissions for suexec |
| 50 |
if use suexec ; then |
| 51 |
- local needs_adjustment="$(ver_test ${PV} -ge 2.4.34 && { { ! use suexec-syslog || ! use suexec-caps ; } && echo true || echo false ; } || echo true)" |
| 52 |
- if ${needs_adjustment} ; then |
| 53 |
+ if ! use suexec-syslog || ! use suexec-caps ; then |
| 54 |
fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec |
| 55 |
fperms 4710 /usr/sbin/suexec |
| 56 |
# provide legacy symlink for suexec, bug 177697 |
Archives