From bff87ff2e57c9972ac3bf6d1a1590a61cd3350b9 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Mon, 30 Jan 2012 13:43:16 +0000
Subject: Restore the default value of AdminIdentities from "wheel" to "0" like
 it was in polkit-0.102 and ones before that. You should see files
 50-localauthority.conf and 60-gentoo.conf in
 /etc/polkit-1/localauthority.conf.d. You should also familiarize yourself
 with "man 8 pklocalauthority" as soon as possible.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
RepoMan-Options: --force
---
 sys-auth/polkit/ChangeLog              |  11 +++-
 sys-auth/polkit/Manifest               |  13 ++--
 sys-auth/polkit/polkit-0.104-r1.ebuild | 109 +++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+), 5 deletions(-)
 create mode 100644 sys-auth/polkit/polkit-0.104-r1.ebuild

(limited to 'sys-auth/polkit')

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 32856c3a2bcf..2f532cd8d630 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,15 @@
 # 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.64 2012/01/29 16:49:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.65 2012/01/30 13:43:16 ssuominen Exp $
+
+*polkit-0.104-r1 (30 Jan 2012)
+
+  30 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +polkit-0.104-r1.ebuild:
+  Restore the default value of AdminIdentities from "wheel" to "0" like it was
+  in polkit-0.102 and ones before that. You should see files
+  50-localauthority.conf and 60-gentoo.conf in
+  /etc/polkit-1/localauthority.conf.d. You should also familiarize yourself
+  with "man 8 pklocalauthority" as soon as possible.
 
   29 Jan 2012; Markus Meier <maekke@gentoo.org> polkit-0.103.ebuild:
   arm stable, bug #397755
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 7af741cf1900..e2745bcf62bd 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -6,13 +6,18 @@ DIST polkit-0.103.tar.gz 1065419 RMD160 50aad2a95649771727b8fc42e8bbbe2ad5f7b5e8
 DIST polkit-0.104.tar.gz 1416583 RMD160 244e825347a463ff4b9eb0a2318ab04c821bded9 SHA1 599208cf584b9e13f8c9d863238a8271af4aba62 SHA256 6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9
 EBUILD polkit-0.102.ebuild 3257 RMD160 df812581d3e2725f713d253a622b1dec60de0cfd SHA1 115137c6caa2e4002868a4e753f5f2d7410e4114 SHA256 c79c9b83280e6c3384bc76ac8ec83cfa0f65d29865cdd9f8673eb5feeffe4213
 EBUILD polkit-0.103.ebuild 3217 RMD160 61223cbca3751ffcca57ba45ea60a1159845b437 SHA1 9d46c6dfae38c0b4e5cff2453e5b00994f361fda SHA256 ee6c59945b8694f303ab080140c3c5624a614a54d97f00aea8a7f8e44643d647
+EBUILD polkit-0.104-r1.ebuild 3562 RMD160 6bcb868dfc68cb272a6dae179aa4fddf533ac056 SHA1 930694bb177aca663845692fd44f8aa654d93723 SHA256 adb856681531e988a684335dea86a1ce2fe6f773022bfc01df622c4f985c0efb
 EBUILD polkit-0.104.ebuild 3295 RMD160 bad19f8f0e054509ec6c7c05215a5468174290a8 SHA1 e8dc4008dc860b01309d3ccdf8aa29ac3bfba669 SHA256 e224f082b7f9a2ab7958da98cbf098da39a72cf907deaa218ccd6d9ca404cc96
-MISC ChangeLog 8374 RMD160 ff477a39bcdb4b2cf4179959e99594d728261c01 SHA1 bd9472446e11d771096c5b8247a8975d3a43a994 SHA256 69b9f10e1eab1c6654ce9d8463cdb0ea8fe2cc64037ec28cdf4e2d197ee8b4a1
+MISC ChangeLog 8805 RMD160 7cf880c38bc11619b11c9a6cb4b9ef2402503d8a SHA1 a4f8075eaca39ad34857c9e73c2053c29aaf3d99 SHA256 e58a93d4f332677c37411c92bdecaaab2f81e13b615ed19ecf0d6dc8d39fcfb2
 MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8leTQACgkQkKaRLQcq0GIZ3gCgsyR0ZebKTutJ8bqjgWFiuI0j
-VrIAoJFD8AQ1nbwpZAW/29zOqaNKn0m8
-=Uu4/
+iQEcBAEBAgAGBQJPJp3jAAoJEEdUh39IaPFNTsEH/A3sRlf0H6GxMnxuwGj2FG5q
+9I1CqR6oexIa2e1xFt7Hc6aXMCsP3nTMWHY90wq3lwdgjbwhanRWzT5Jmh/2Nwz3
+0Pe2x2CEqUDBi1yt8UW+SUeSg3sZVzJLdR1KWaGpvL6/PNRNXAPZemQ+7EB6JIrh
+W3ku0+io9As1CHYPG5tP2RbtkUk/CLcQRcK87OVRykqQyr+JNrx3U+KIZ0tcGWMb
+dvvO5itvNzSN8qZU4cQ8NCPM5/esH+KDREa+sDhTcTrJm5wE7WGylNAdQuiYKFGu
+Nu2QU78UivCBbwjrWbJQBM22vq3OEkcH5OvK0afnh4TW1EWlDMt/U4cKn5PXqrc=
+=vIWM
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.104-r1.ebuild b/sys-auth/polkit/polkit-0.104-r1.ebuild
new file mode 100644
index 000000000000..3f3487080bc2
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.104-r1.ebuild
@@ -0,0 +1,109 @@
+# 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.104-r1.ebuild,v 1.1 2012/01/30 13:43:16 ssuominen Exp $
+
+EAPI=4
+inherit pam
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="http://hal.freedesktop.org/docs/polkit/"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples gtk +introspection kde nls pam systemd"
+
+RDEPEND=">=dev-libs/glib-2.30
+	dev-libs/expat
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+	pam? ( 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
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.13 )"
+PDEPEND="!systemd? ( >=sys-auth/consolekit-0.4.5[policykit] )
+	pam? ( sys-auth/pambase[consolekit] )
+	gtk? ( || ( >=gnome-extra/polkit-gnome-${PV} lxde-base/lxpolkit ) )
+	kde? ( sys-auth/polkit-kde-agent )"
+
+DOCS=( docs/TODO HACKING NEWS README )
+
+src_prepare() {
+	cat <<-EOF > "${T}"/60-gentoo.conf
+	# This file will override 50-localauthority.conf, see:
+	# man 8 pklocalauthority
+	[Configuration]
+	AdminIdentities=unix-group:0
+	EOF
+}
+
+src_configure() {
+	local myauth="--with-authfw=shadow"
+	use pam && myauth="--with-authfw=pam --with-pam-module-dir=$(getpam_mod_dir)"
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		$(use_enable systemd) \
+		$(use_enable introspection) \
+		--disable-examples \
+		$(use_enable nls) \
+		--with-os-type=gentoo \
+		${myauth}
+}
+
+src_install() {
+	default
+
+	insinto /etc/polkit-1/localauthority.conf.d
+	doins "${T}"/60-gentoo.conf
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	# We disable example compilation above, and handle it here
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/{*.c,*.policy*}
+	fi
+
+	# Need to keep a few directories around...
+	diropts -m0700 -o root -g root
+	keepdir /var/lib/polkit-1
+	#keepdir /var/run/polkit-1 #387903
+}
+
+pkg_postinst() {
+	# Make sure that the user has consolekit sessions working so that the
+	# 'allow_active' directive in polkit action policies works
+	if has_version 'gnome-base/gdm' && ! has_version 'gnome-base/gdm[consolekit]'; then
+		# If user has GDM installed, but USE=-consolekit, warn them
+		ewarn "You have GDM installed, but it does not have USE=consolekit"
+		ewarn "If you login using GDM, polkit authorizations will not work"
+		ewarn "unless you enable USE=consolekit"
+		einfo
+	fi
+	if has_version 'kde-base/kdm' && ! has_version 'kde-base/kdm[consolekit]'; then
+		# If user has KDM installed, but USE=-consolekit, warn them
+		ewarn "You have KDM installed, but it does not have USE=consolekit"
+		ewarn "If you login using KDM, polkit authorizations will not work"
+		ewarn "unless you enable USE=consolekit"
+		einfo
+	fi
+	if ! has_version 'gnome-base/gdm[consolekit]' && \
+		! has_version 'kde-base/kdm[consolekit]'; then
+		# Inform user about the alternative method
+		ewarn "If you don't use GDM or KDM for logging in,"
+		ewarn "you must start your desktop environment (DE) as follows:"
+		ewarn "	ck-launch-session \$STARTGUI"
+		ewarn "Where \$STARTGUI is a DE-starting command such as 'gnome-session'."
+		ewarn "You should add this to your ~/.xinitrc if you use startx."
+	fi
+}
-- 
cgit v1.2.3-65-gdbad