diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2024-04-28 17:52:59 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2024-04-28 17:53:39 +0200 |
| commit | 89163226f17ce8a679409592038137f97bf6c68c (patch) | |
| tree | 8ca2dafaf14333bfadcd915d066c92cc47f582ac | |
| parent | sci-libs/evaluate: scilibs/transformers is now SINGLE_USEDEP (diff) | |
| download | gentoo-89163226f17ce8a679409592038137f97bf6c68c.tar.gz gentoo-89163226f17ce8a679409592038137f97bf6c68c.tar.bz2 gentoo-89163226f17ce8a679409592038137f97bf6c68c.zip | |
eclass/apache2.eclass: Revert "use fcaps eclass to set capabilities"
This is causing fatal postinst errors with some USE flag combinations.
Reverts: 8b19280613e0efdbd5dd39860e835565e6a48c0e
Bug: https://bugs.gentoo.org/930455
Signed-off-by: Michał Górny <mgorny@gentoo.org>
| -rw-r--r-- | eclass/apache-2.eclass | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 9c7369514c5d..17b8b0e2a64a 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -13,7 +13,7 @@ # and inter-module dependency checking. LUA_COMPAT=( lua5-{1..4} ) -inherit autotools fcaps flag-o-matic lua-single multilib ssl-cert toolchain-funcs +inherit autotools flag-o-matic lua-single multilib ssl-cert toolchain-funcs [[ ${CATEGORY}/${PN} != www-servers/apache ]] \ && die "Do not use this eclass with anything else than www-servers/apache ebuilds!" @@ -666,8 +666,6 @@ apache-2_src_install() { fperms 4710 /usr/sbin/suexec # provide legacy symlink for suexec, bug 177697 dosym /usr/sbin/suexec /usr/sbin/suexec2 - else - FILECAPS=( cap_setgid,cap_setuid=ep usr/sbin/suexec ) fi fi @@ -687,8 +685,6 @@ apache-2_src_install() { # because the default webroot is a copy of the files that exist elsewhere and we # don't want them to be managed/removed by portage when apache is upgraded. apache-2_pkg_postinst() { - fcaps_pkg_postinst || die "fcaps_pkg_postinst" - if use ssl && [[ ! -e "${EROOT}/etc/ssl/apache2/server.pem" ]]; then SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}" install_cert /etc/ssl/apache2/server |