Revert entire unix-group:wheel experiment back to unix-user:0 because PolicyKit agent(s) don't behave correctly with it wrt #423733 by Travis Hansen. Revert system-local-login to system-auth for PAM errors wrt #423487 by Doug Goldstein.

Package-Manager: portage-2.2.0_alpha111/cvs/Linux x86_64

3 files changed, 122 insertions, 9 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index a87a6eb41cf0..3ede6f1988d4 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,14 @@
 # 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.89 2012/06/27 10:06:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.90 2012/06/27 10:24:22 ssuominen Exp $
+
+*polkit-0.106-r5 (27 Jun 2012)
+
+  27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +polkit-0.106-r5.ebuild:
+  Revert entire unix-group:wheel experiment back to unix-user:0 because
+  PolicyKit agent(s) don't behave correctly with it wrt #423733 by Travis
+  Hansen. Revert system-local-login to system-auth for PAM errors wrt #423487
+  by Doug Goldstein.
 
 *polkit-0.106-r4 (27 Jun 2012)
 
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 63811105a4ce..b50c78c53d98 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -9,16 +9,17 @@ EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630
 EBUILD polkit-0.106-r2.ebuild 2944 RMD160 692481f847aff6601a3468e938bff3334698ef8c SHA1 4fe3ae9cea9a1494d9575ede92197ee1b4301682 SHA256 f17b750e069cff665a55072c6a3ef964ddb7a37864f1d9f49e1bfc3b67aae0bb
 EBUILD polkit-0.106-r3.ebuild 3170 RMD160 2cd485c3de6e1b879bea0b18f4b68fb11cd87c9f SHA1 0ad0731aba7e43a0f2ac3e126dba8221d729e852 SHA256 776b4985b9695dd8af083b552420d5114bae795bf4dd34e7f5ef47a3bcfaedeb
 EBUILD polkit-0.106-r4.ebuild 3232 RMD160 d23f76f02200dde1bc171ff73b23d5738cb53673 SHA1 b4252503536faef0c922c7ee853bc444e1f91f56 SHA256 d4c05dd3f34770675e8f8f9382b3266e95e8bf28cbee966abb0d8529a22a14de
-MISC ChangeLog 12243 RMD160 202ba35e198dd76d44f69018706e8190ee3a19d4 SHA1 269467e1673a984e74ed04910495b8be1ec95ca1 SHA256 4e16d0b7febc7f90671461ece174921e08b0e3f567953104dcf2f156e1f8de9d
+EBUILD polkit-0.106-r5.ebuild 2831 RMD160 e0249d138bdfdcda4400255ff85e4de860cf38ea SHA1 c779d1af881b7747067ae089460a5e6905230b47 SHA256 b05ccfb1bd8bd9c44c24aa0f5a811fe9615b7990f139ae3be2131dd0b48c056a
+MISC ChangeLog 12600 RMD160 e2546604a369ed1b9e0ef241fbf3e35b85e31be4 SHA1 eb6ada9311f0c5a1e23326cd784b401334724110 SHA256 566843fab50235b444635b5d90bff8035befa78ee63e8273ea44d914146e7d1f
 MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP6tnfAAoJEEdUh39IaPFNsmEH/0n1TPT79cHM4RLYECgA5oLl
-Y2IT2f4DIgbPBQtOrRX6a4XMDhmC/nOppyKpHGNSfNqtT4NxbqB3mcI3hYGyR5Ed
-y3v+5U91nq4vUxgrSpJp481mC3FHU1yU6062dzk+1G5dWd5f3BH/R2aQhg2fhHIp
-xvqmIP+Bx/pfyPaPyUo0NX9LB0ipHs7FXdrX/gw4l/8TyouWJbZ0dkCdgEqISTr9
-pW8JGsA2qos8HiWiDVnWmr4OYnzVeLRsxP3KqmWh8xic02kN6tEknRf1nTpgb1Bw
-zQI57BWRy2HioMB7em7Ao956X43pfafO+6gn3H1AB4VEHXhq7xL3z69HarOL/0M=
-=C+zn
+iQEcBAEBAgAGBQJP6t4gAAoJEEdUh39IaPFNXq8H/1inemn+NC8KE9L1AS9XBYZN
+TZd9bZEBXDFW9VTwAud/fj6vgWUpxaH/pXAllawnDR1rK4Kp4BHJ5OBI/40sa40T
+2yERNsmQIpvSgCg1Dtc5K10qMf03yAFzqI4qfWWu9ZCb/LAB+6BCMqvyPxxH6HY3
+Qoi7/Py6mSFWiv5bLFGWjhZp9Chh5rGETQQlEfGGl6Ab1YjTYIzu+1oMFXrZxEm8
+rzlMfM+g266ypgMlxcjT+5ll+ptTs9qaC+ismXdVTSmVXfOOyd8S5QZlg7oppuGv
+/hh8Ws5hZ6lNvqbpVwmxfOrOnOxO13JaeS4u1Y1gHQQ6dN87r4p7uTQmZgx1of4=
+=KMUB
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.106-r5.ebuild b/sys-auth/polkit/polkit-0.106-r5.ebuild
new file mode 100644
index 000000000000..c75bc369ca55
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.106-r5.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-r5.ebuild,v 1.1 2012/06/27 10:24:22 ssuominen Exp $
+
+EAPI=4
+inherit eutils multilib pam pax-utils 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 )
+	pam? (
+		systemd? ( sys-auth/pambase[systemd] )
+		!systemd? ( sys-auth/pambase[consolekit] )
+		)
+	!systemd? ( >=sys-auth/consolekit-0.4.5_p2012[policykit] )"
+
+pkg_setup() {
+	local u=polkitd
+	local g=polkitd
+	local h=/var/lib/polkit-1
+
+	enewgroup ${g}
+	enewuser ${u} -1 -1 ${h} ${g}
+	esethome ${u} ${h}
+}
+
+src_prepare() {
+	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
+	has_version ">=dev-lang/spidermonkey-1.8.7" && { sed -i -e '/mozjs/s:185:187:g' configure || die; }
+}
+
+src_configure() {
+	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) \
+		"$(systemd_with_unitdir)" \
+		--with-authfw=$(usex pam pam shadow) \
+		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
+		--with-os-type=gentoo
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		libprivdir="${EPREFIX}"/usr/$(get_libdir)/polkit-1 \
+		install
+
+	dodoc docs/TODO HACKING NEWS README
+
+	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
+
+	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
+
+	prune_libtool_files
+	rm -f "${ED}"/usr/lib*/pkgconfig/polkit-backend-1.pc #423431
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	pax-mark mr "${ED}"/usr/$(get_libdir)/polkit-1/polkitd
+}
+
+pkg_postinst() {
+	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
+}