From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0466D1581E7 for ; Sun, 28 Apr 2024 15:54:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B7A3E2A19; Sun, 28 Apr 2024 15:54:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1727AE2A19 for ; Sun, 28 Apr 2024 15:54:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22D92340DE6 for ; Sun, 28 Apr 2024 15:54:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BE4D1497 for ; Sun, 28 Apr 2024 15:54:42 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1714319619.89163226f17ce8a679409592038137f97bf6c68c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/apache-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 89163226f17ce8a679409592038137f97bf6c68c X-VCS-Branch: master Date: Sun, 28 Apr 2024 15:54:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6571d8cf-195d-401f-ad45-738d7dfa0970 X-Archives-Hash: 8c88807100426e87f62e7c68575648ca commit: 89163226f17ce8a679409592038137f97bf6c68c Author: Michał Górny gentoo org> AuthorDate: Sun Apr 28 15:52:59 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Apr 28 15:53:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89163226 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 gentoo.org> eclass/apache-2.eclass | 6 +----- 1 file changed, 1 insertion(+), 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