diff options
Diffstat (limited to 'eclass/apache-2.eclass')
| -rw-r--r-- | eclass/apache-2.eclass | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index b2d72f479c7b..ab09ce367c14 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -9,7 +9,7 @@ # This eclass handles apache-2.x ebuild functions such as LoadModule generation # and inter-module dependency checking. -inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs versionator +inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs eapi7-ver [[ ${CATEGORY}/${PN} != www-servers/apache ]] \ && die "Do not use this eclass with anything else than www-servers/apache ebuilds!" @@ -21,7 +21,7 @@ case ${EAPI:-0} in esac # settings which are version specific go in here: -case $(get_version_component_range 1-2) in +case $(ver_cut 1-2) in 2.4) DEFAULT_MPM_THREADED="event" #509922 CDEPEND=">=dev-libs/apr-1.5.1:= @@ -119,7 +119,7 @@ _apache2_set_mpms() { REQUIRED_USE+=" )" done - if [[ "${PV}" != 2.2* ]] ; then + if [[ "$(ver_cut 1-2)" != 2.2 ]] ; then REQUIRED_USE+=" apache2_mpms_prefork? ( !apache2_modules_http2 )" fi } @@ -277,7 +277,9 @@ setup_modules() { elog "through the following environment variables:" elog elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: '${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin')" - elog " SUEXEC_LOGFILE: Path to the suexec logfile (default: '${EPREFIX}/var/log/apache2/suexec_log')" + if { ver_test ${PV} -ge 2.4.34 && ! use suexec-syslog ; } || ver_test ${PV} -lt 2.4.34 ; then + elog " SUEXEC_LOGFILE: Path to the suexec logfile (default: '${EPREFIX}/var/log/apache2/suexec_log')" + fi elog " SUEXEC_CALLER: Name of the user Apache is running as (default: apache)" elog " SUEXEC_DOCROOT: Directory in which suexec will run scripts (default: '${EPREFIX}/var/www')" elog " SUEXEC_MINUID: Minimum UID, which is allowed to run scripts via suexec (default: 1000)" @@ -287,7 +289,13 @@ setup_modules() { elog MY_CONF+=( --with-suexec-safepath="${SUEXEC_SAFEPATH:-${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin}" ) - MY_CONF+=( --with-suexec-logfile="${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}" ) + if ver_test ${PV} -ge 2.4.34 ; then + MY_CONF+=( $(use_with !suexec-syslog suexec-logfile "${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}") ) + MY_CONF+=( $(use_with suexec-syslog) ) + MY_CONF+=( $(use_with suexec-caps suexec-capabilities) ) + else + MY_CONF+=( --with-suexec-logfile="${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}" ) + fi MY_CONF+=( --with-suexec-bin="${EPREFIX}/usr/sbin/suexec" ) MY_CONF+=( --with-suexec-userdir=${SUEXEC_USERDIR:-public_html} ) MY_CONF+=( --with-suexec-caller=${SUEXEC_CALLER:-apache} ) |