summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-13 15:28:32 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-13 15:28:32 +0000
commit68449b764a535011edf0fafbf3625a7d27ff1a8e (patch)
treeb109a2ded4bc54ce914db3b622a5d02971e4a5e3 /sys-auth
parentStable for amd64, wrt bug #420935 (diff)
downloadgentoo-2-68449b764a535011edf0fafbf3625a7d27ff1a8e.tar.gz
gentoo-2-68449b764a535011edf0fafbf3625a7d27ff1a8e.tar.bz2
gentoo-2-68449b764a535011edf0fafbf3625a7d27ff1a8e.zip
Drop some keywords, fix polkitd user homedir, etc
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/polkit/ChangeLog7
-rw-r--r--sys-auth/polkit/polkit-0.106.ebuild19
2 files changed, 19 insertions, 7 deletions
diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index a831e0bf2247..de787bff9f31 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-auth/polkit
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.78 2012/06/13 14:45:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.79 2012/06/13 15:28:32 ssuominen Exp $
+
+ 13 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> polkit-0.106.ebuild:
+ Use /var/lib/polkit-1 as home directory for the polkitd user and fix owners
+ of /etc/polkit-1/rules.d and /usr/share/polkit-1/rules.d to polkitd:polkitd
+ accordingly wrt #420269
13 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> polkit-0.106.ebuild:
Missing dev-lang/spidermonkey dependency wrt #420173. Raise dev-libs/glib
diff --git a/sys-auth/polkit/polkit-0.106.ebuild b/sys-auth/polkit/polkit-0.106.ebuild
index d3290e3649d2..1ffc1bd625d5 100644
--- a/sys-auth/polkit/polkit-0.106.ebuild
+++ b/sys-auth/polkit/polkit-0.106.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106.ebuild,v 1.3 2012/06/13 14:45:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106.ebuild,v 1.4 2012/06/13 15:28:32 ssuominen Exp $
EAPI=4
inherit eutils user pam systemd
@@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="debug examples gtk +introspection kde nls pam systemd"
RDEPEND=">=dev-lang/spidermonkey-1.8.5
@@ -44,13 +44,13 @@ DOCS="docs/TODO HACKING NEWS README"
pkg_setup() {
enewgroup polkitd
- enewuser polkitd -1 -1 -1 polkitd
+ enewuser polkitd -1 -1 /var/lib/polkit-1 polkitd
}
src_prepare() {
# http://bugs.gentoo.org/401513
- ewarn "Switching from group \"wheel\" to group \"0\" in /etc/polkit-1/rules.d/*.rules"
- sed -i -e '/unix-group/s:wheel:0:' src/polkitbackend/*.rules || die
+ ewarn "Switching from group \"wheel\" to group \"0\" in /etc/polkit-1/rules.d/*-default.rules"
+ sed -i -e '/unix-group/s:wheel:0:' src/polkitbackend/*-default.rules || die
}
src_configure() {
@@ -75,7 +75,7 @@ src_install() {
prune_libtool_files
- diropts -m0700 -o root -g root
+ diropts -m0700 -o polkitd -g polkitd
keepdir /var/lib/polkit-1
if use examples; then
@@ -83,3 +83,10 @@ src_install() {
doins src/examples/{*.c,*.policy*}
fi
}
+
+pkg_postinst() {
+ # fowners in src_install fails and Portage sets these back to root:root
+ chown -R polkitd:polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+ # enewuser fails to refresh itself for new home directory #420269
+ sed -i -e '/^polkitd/s:/dev/null:/var/lib/polkit-1:' "${EROOT}"/etc/passwd
+}