3 files changed, 124 insertions, 19 deletions
diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index de787bff9f31..e2251f7946b9 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,23 +1,23 @@
 # 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.79 2012/06/13 15:28:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.80 2012/06/17 08:20:29 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
+*polkit-0.106-r1 (17 Jun 2012)
+
+  17 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +polkit-0.106-r1.ebuild:
+  Update /etc/pam.d/polkit-1 from system-login to system-local-login. Use
+  unix-group "adm" for administrators. Use /var/lib/polkit-1 as home directory
+  for unix-user polkitd. Update owners of /etc/polkit-1/rules.d and
+  /usr/share/polkit-1/rules.d to polkitd:root 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
-  dependency to >= 2.32 wrt #420307.
+  Pull in dev-lang/spidermonkey >= 1.8.5 and dev-libs/glib >= 2.32 wrt
+  #420173 and #420307.
 
 *polkit-0.106 (07 Jun 2012)
 
   07 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +polkit-0.106.ebuild:
-  Version bump. Setting default unix-group location changed to
-  /etc/polkit-1/rules.d/50-default.rules.
-  Create dedicated user and group "polkitd" as per upstream documentation
-  (recommendation).
+  Version bump.
 
   20 May 2012; Samuli Suominen <ssuominen@gentoo.org> polkit-0.105.ebuild:
   Improve systemd handling wrt #416317 by Christoph Brill
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 6a32af9a2e11..d46ca5f20700 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -6,17 +6,18 @@ DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a
 DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3 SHA1 665624f5d69876ec5833f7952290188ca594aac0 SHA256 4005076a67aaa182872c1e316939fcb0ba74a89298e6330d72cfdac6624c984e
 EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
 EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
+EBUILD polkit-0.106-r1.ebuild 2823 RMD160 de6ab6e621ae0452e53427f2ae4ebcf6bb97f910 SHA1 7c0efa8b6c6ccffc878d777f23a3e8b8387bc16e SHA256 1fd2dcf151cb3fdac84a8583a4751547553a0ef02b147c4e9a28f6c50ceb6228
 EBUILD polkit-0.106.ebuild 2562 RMD160 2844b59bef28e2c18ffb08d826793733b1454afb SHA1 62ed22459c2d7d584e1d4d9ac25bc6b0e304c631 SHA256 abf42e5382be66ed0f1ba7c81bedc1fad32f61e7cce83a597509d65858c3f477
-MISC ChangeLog 10810 RMD160 61f4706b918e0f233865ab1a513141506368ed93 SHA1 1676902f707b9aae7ddee405fd93d490eb72de2f SHA256 97dcb6add9eacfe7af19a243c6702a1baec292c4433475dddcbe66f8e9548b84
+MISC ChangeLog 10742 RMD160 0b830aea45c00b55aa86803d986140f6747be6c0 SHA1 b175d8bedeec5c02215262b4dfb6b17214113a81 SHA256 d29d64b523f1af4dc08eabd7a571b4092cb9eef0ef777ee087c5eef66227787d
 MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP2LCuAAoJEEdUh39IaPFNqz0H/3d51nGJd23e22I/3L2Wgqn2
-57rcWu116P2Rgkub1ZfqB9SqiDpJgxdAxd5Jptg8EyX7EW0iaf+l+sILJtL/5y5w
-eLuDTPrV3mxQvSh/nt7lB+d/V0ImMhlwHyU4MwA08+mhWaCA5jh6zZSy8WVOInOt
-/QrpHHOkXuJ0C9voahVfAeqym6tucDF6wwrnKWWxHIamGdZkhHGLL9fYdnDZNIFP
-kKQkhny4Pog1TohSAbpv9BdLjMgxmdJX/Pn6aot9q13uH4U8xGUSwkp5GNtmq3z5
-PMoNN0qJljU7FXSVTrJHDKWedFwQ4NTeuqu2QtYj2Q5nbhBYcPy8b2g66mRFGy0=
-=iO/F
+iQEcBAEBAgAGBQJP3ZJKAAoJEEdUh39IaPFNsbUH/2CzVyjvWHM5Ks0elo1/aQQx
+/PZ/jHTrGCPjPTVkPvxlf0kwg96nXBoKeqbU2EaXATWnJ/8/zqS30rekBbvMEi3V
+aO1/WPcKR2/y3MFZiEehGMPXzF5TwwKUdgNxnc5OSwumVRvfv6atJCZpc8JTg0Lk
+1OWglnWOHRIzqWDnMEVfNXSAe+i46/WS24IMME8Pevxp8qBk5RmcJs+hNxhTrdhp
+tt7pmDJX4BKEEgbM9uuG4EYBgG2QNqcOvehUaLWOJR83LfOVIbXoxkIIEGouy0fO
+0g0azYiZntebXpa2oY/DgMMrOpOqhhkpsx025gyuWE8mcEiUuy33Y7pV+1CMbZs=
+=Ktut
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.106-r1.ebuild b/sys-auth/polkit/polkit-0.106-r1.ebuild
new file mode 100644
index 000000000000..be15402854f2
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.106-r1.ebuild
@@ -0,0 +1,104 @@
+# 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-r1.ebuild,v 1.1 2012/06/17 08:20:29 ssuominen Exp $
+
+EAPI=4
+inherit eutils pam systemd user
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+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
+	>=dev-libs/glib-2.32
+	>=dev-libs/expat-2
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+		)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/intltool
+	virtual/pkgconfig"
+PDEPEND="
+	gtk? ( || (
+		>=gnome-extra/polkit-gnome-0.105
+		lxde-base/lxpolkit
+		) )
+	kde? ( sys-auth/polkit-kde-agent )
+	!systemd? (
+		>=sys-auth/consolekit-0.4.5_p2012[policykit]
+		pam? ( sys-auth/pambase[consolekit] )
+		)"
+
+DOCS="docs/TODO HACKING NEWS README"
+
+pkg_setup() {
+	enewgroup polkitd
+	enewuser polkitd -1 -1 /var/lib/polkit-1 polkitd
+}
+
+src_prepare() {
+	sed -i -e '/unix-group/s:wheel:adm:' src/polkitbackend/*-default.rules || die #401513
+}
+
+src_configure() {
+	local myconf="--with-authfw=shadow"
+	use pam && \
+		myconf="--with-authfw=pam --with-pam-module-dir=$(getpam_mod_dir) --with-pam-include=system-local-login"
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		--disable-gtk-doc \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable introspection) \
+		--disable-examples \
+		$(use_enable nls) \
+		--with-os-type=gentoo \
+		"$(systemd_with_unitdir)" \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
+
+	prune_libtool_files
+
+	diropts -m0700 -o polkitd -g polkitd
+	keepdir /var/lib/polkit-1
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/{*.c,*.policy*}
+	fi
+}
+
+pkg_postinst() {
+	# fowners bug?
+	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+
+	echo
+	ewarn "If home directory of unix-user \"polkitd\" is set to /dev/null, run:"
+	ewarn "# usermod -d /var/lib/polkit-1 polkitd"
+
+	echo
+	ewarn "The default administrator unix-group was changed from \"wheel\" to"
+	ewarn "\"adm\", see *-default.rules in /etc/polkit-1/rules.d"
+	ewarn "Users of unix-group \"adm\" can run, for example, \"pkexec /bin/sh\""
+	ewarn "to gain root shell without root password."
+	ewarn "For more information, see http://bugs.gentoo.org/401513"
+}