| 1 |
commit: 4f0e84d3a865427b76e86b79af792c5eb5b313b0 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 17 07:06:03 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 17 07:10:01 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0e84d3 |
| 7 |
|
| 8 |
apache-2.eclass: New suexec options. |
| 9 |
|
| 10 |
eclass/apache-2.eclass | 12 ++++++++++-- |
| 11 |
1 file changed, 10 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass |
| 14 |
index 56187720b5d..ab09ce367c1 100644 |
| 15 |
--- a/eclass/apache-2.eclass |
| 16 |
+++ b/eclass/apache-2.eclass |
| 17 |
@@ -277,7 +277,9 @@ setup_modules() { |
| 18 |
elog "through the following environment variables:" |
| 19 |
elog |
| 20 |
elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: '${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin')" |
| 21 |
- elog " SUEXEC_LOGFILE: Path to the suexec logfile (default: '${EPREFIX}/var/log/apache2/suexec_log')" |
| 22 |
+ if { ver_test ${PV} -ge 2.4.34 && ! use suexec-syslog ; } || ver_test ${PV} -lt 2.4.34 ; then |
| 23 |
+ elog " SUEXEC_LOGFILE: Path to the suexec logfile (default: '${EPREFIX}/var/log/apache2/suexec_log')" |
| 24 |
+ fi |
| 25 |
elog " SUEXEC_CALLER: Name of the user Apache is running as (default: apache)" |
| 26 |
elog " SUEXEC_DOCROOT: Directory in which suexec will run scripts (default: '${EPREFIX}/var/www')" |
| 27 |
elog " SUEXEC_MINUID: Minimum UID, which is allowed to run scripts via suexec (default: 1000)" |
| 28 |
@@ -287,7 +289,13 @@ setup_modules() { |
| 29 |
elog |
| 30 |
|
| 31 |
MY_CONF+=( --with-suexec-safepath="${SUEXEC_SAFEPATH:-${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin}" ) |
| 32 |
- MY_CONF+=( --with-suexec-logfile="${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}" ) |
| 33 |
+ if ver_test ${PV} -ge 2.4.34 ; then |
| 34 |
+ MY_CONF+=( $(use_with !suexec-syslog suexec-logfile "${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}") ) |
| 35 |
+ MY_CONF+=( $(use_with suexec-syslog) ) |
| 36 |
+ MY_CONF+=( $(use_with suexec-caps suexec-capabilities) ) |
| 37 |
+ else |
| 38 |
+ MY_CONF+=( --with-suexec-logfile="${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}" ) |
| 39 |
+ fi |
| 40 |
MY_CONF+=( --with-suexec-bin="${EPREFIX}/usr/sbin/suexec" ) |
| 41 |
MY_CONF+=( --with-suexec-userdir=${SUEXEC_USERDIR:-public_html} ) |
| 42 |
MY_CONF+=( --with-suexec-caller=${SUEXEC_CALLER:-apache} ) |
Archives