From 94cda6bf059d9d4bc6988faaae18d3ccd3a72268 Mon Sep 17 00:00:00 2001 From: William Light Date: Tue, 28 Sep 2021 14:56:24 +0000 Subject: [PATCH] sys-auth/polkit 0.119: re-apply downstream patches commit 5c4d184e22fd93ab926878a131150047b54d0b6c Author: Michael Marineau Date: Fri Aug 1 14:48:59 2014 -0700 polkit: fix config install paths, use systemd-tmpfiles All configs should be installed to /usr and tmpfiles should be used to create and fix directory permissions instead of the ebuild's postinst. --- .../sys-auth/polkit/files/polkit.conf | 3 +++ .../sys-auth/polkit/polkit-0.119-r2.ebuild | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit.conf diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit.conf b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit.conf new file mode 100644 index 0000000000..9734ff4ba6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit.conf @@ -0,0 +1,3 @@ +d /etc/polkit-1 - - - - - +d /etc/polkit-1/rules.d 0700 polkitd root - - +d /var/lib/polkit-1 0700 polkitd polkitd - - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.119-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.119-r2.ebuild index 280850854a..5acbca3381 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.119-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.119-r2.ebuild @@ -119,6 +119,16 @@ src_compile() { src_install() { default + dodir /usr/share/polkit-1/rules.d + dodir /usr/lib/pam.d + + mv "${D}"/{etc,usr/share}/polkit-1/rules.d/50-default.rules || die + mv "${D}"/{etc,usr/lib}/pam.d/polkit-1 || die + rmdir "${D}"/etc/polkit-1/rules.d "${D}"/etc/polkit-1 || die + rmdir "${D}"/etc/pam.d || die + + systemd_dotmpfilesd "${FILESDIR}/polkit.conf" + if use examples; then docinto examples dodoc src/examples/{*.c,*.policy*} @@ -129,8 +139,3 @@ src_install() { find "${ED}" -name '*.la' -delete || die } - -pkg_postinst() { - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d -}