From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E4C141581EE for ; Tue, 25 Mar 2025 08:22:49 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D138D3432B8 for ; Tue, 25 Mar 2025 08:22:49 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BCE871104AD; Tue, 25 Mar 2025 08:22:48 +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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id AD284110296 for ; Tue, 25 Mar 2025 08:22:48 +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 5FC50343193 for ; Tue, 25 Mar 2025 08:22:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5315122C for ; Tue, 25 Mar 2025 08:22:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1742890926.80d4449eb6cd125ca355842ebd03890e907bc5df.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/polkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/polkit/polkit-126-r1.ebuild sys-auth/polkit/polkit-9999.ebuild X-VCS-Directories: sys-auth/polkit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 80d4449eb6cd125ca355842ebd03890e907bc5df X-VCS-Branch: master Date: Tue, 25 Mar 2025 08:22:46 +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: faefa664-f1d1-4403-b74d-a661facf9d37 X-Archives-Hash: b16869562e268d7ca65ca744e8fa9cd2 commit: 80d4449eb6cd125ca355842ebd03890e907bc5df Author: Sam James gentoo org> AuthorDate: Tue Mar 25 08:21:54 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 25 08:22:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d4449e sys-auth/polkit: handle USE=-daemon in pkg_postinst Closes: https://bugs.gentoo.org/952019 Signed-off-by: Sam James gentoo.org> sys-auth/polkit/polkit-126-r1.ebuild | 10 ++++++---- sys-auth/polkit/polkit-9999.ebuild | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/sys-auth/polkit/polkit-126-r1.ebuild b/sys-auth/polkit/polkit-126-r1.ebuild index 896f29b6aefc..d3d5ee6aac97 100644 --- a/sys-auth/polkit/polkit-126-r1.ebuild +++ b/sys-auth/polkit/polkit-126-r1.ebuild @@ -154,10 +154,12 @@ src_install() { } pkg_postinst() { - tmpfiles_process polkit-tmpfiles.conf + if use daemon ; then + tmpfiles_process polkit-tmpfiles.conf - if use daemon && [[ ${EUID} == 0 ]]; then - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d + if [[ ${EUID} == 0 ]]; then + chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d + chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d + fi fi } diff --git a/sys-auth/polkit/polkit-9999.ebuild b/sys-auth/polkit/polkit-9999.ebuild index b9a851389923..d3d5ee6aac97 100644 --- a/sys-auth/polkit/polkit-9999.ebuild +++ b/sys-auth/polkit/polkit-9999.ebuild @@ -83,6 +83,12 @@ QA_MULTILIB_PATHS=" usr/lib/polkit-1/polkitd " +PATCHES=( + "${FILESDIR}"/${P}-elogind.patch + "${FILESDIR}"/${P}-realpath.patch + "${FILESDIR}"/${P}-musl.patch +) + python_check_deps() { python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" @@ -148,10 +154,12 @@ src_install() { } pkg_postinst() { - tmpfiles_process polkit-tmpfiles.conf + if use daemon ; then + tmpfiles_process polkit-tmpfiles.conf - if use daemon && [[ ${EUID} == 0 ]]; then - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d + if [[ ${EUID} == 0 ]]; then + chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d + chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d + fi fi }