summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-10-01 16:00:39 +0200
committerLars Wendler <polynomial-c@gentoo.org>2020-10-01 16:07:34 +0200
commit0dff3f67977ba3fe2e90ec38a2d64e0bd64fded8 (patch)
treea860f0852166922804dc29c213eac5e165503214 /eclass/apache-2.eclass
parentapache-2.eclass: Drop apache-2.2 specific code (diff)
downloadgentoo-0dff3f67977ba3fe2e90ec38a2d64e0bd64fded8.tar.gz
gentoo-0dff3f67977ba3fe2e90ec38a2d64e0bd64fded8.tar.bz2
gentoo-0dff3f67977ba3fe2e90ec38a2d64e0bd64fded8.zip
apache-2.eclass: Removed version specific suexec handling
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'eclass/apache-2.eclass')
-rw-r--r--eclass/apache-2.eclass17
1 files changed, 6 insertions, 11 deletions
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index ff6ed9eafb11..29f6edda53cf 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -272,7 +272,7 @@ 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')"
- if { ver_test ${PV} -ge 2.4.34 && ! use suexec-syslog ; } || ver_test ${PV} -lt 2.4.34 ; then
+ if ! use suexec-syslog ; 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)"
@@ -284,14 +284,10 @@ setup_modules() {
elog
MY_CONF+=( --with-suexec-safepath="${SUEXEC_SAFEPATH:-${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin}" )
- 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) )
- if use suexec-syslog && use suexec-caps ; then
- MY_CONF+=( --enable-suexec-capabilities )
- fi
- else
- MY_CONF+=( --with-suexec-logfile="${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}" )
+ MY_CONF+=( $(use_with !suexec-syslog suexec-logfile "${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}") )
+ MY_CONF+=( $(use_with suexec-syslog) )
+ if use suexec-syslog && use suexec-caps ; then
+ MY_CONF+=( --enable-suexec-capabilities )
fi
MY_CONF+=( --with-suexec-bin="${EPREFIX}/usr/sbin/suexec" )
MY_CONF+=( --with-suexec-userdir=${SUEXEC_USERDIR:-public_html} )
@@ -626,8 +622,7 @@ apache-2_src_install() {
# set some sane permissions for suexec
if use suexec ; then
- local needs_adjustment="$(ver_test ${PV} -ge 2.4.34 && { { ! use suexec-syslog || ! use suexec-caps ; } && echo true || echo false ; } || echo true)"
- if ${needs_adjustment} ; then
+ if ! use suexec-syslog || ! use suexec-caps ; then
fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec
fperms 4710 /usr/sbin/suexec
# provide legacy symlink for suexec, bug 177697