old

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 5 insertions, 289 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 5a97bfa67329..f3d669940612 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.126 2013/01/11 03:06:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.127 2013/01/11 03:08:39 ssuominen Exp $
+
+  11 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> -polkit-0.104-r1.ebuild,
+  -polkit-0.109-r1.ebuild, -files/polkit-0.109-XAUTHORITY-fallback.patch:
+  old
 
 *polkit-0.110 (11 Jan 2013)
 
diff --git a/sys-auth/polkit/files/polkit-0.109-XAUTHORITY-fallback.patch b/sys-auth/polkit/files/polkit-0.109-XAUTHORITY-fallback.patch
deleted file mode 100644
index cf00b929c021..000000000000
--- a/sys-auth/polkit/files/polkit-0.109-XAUTHORITY-fallback.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d6acecdd0ebb42e28ff28e04e0207cb01fa20910 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Wed, 19 Dec 2012 19:28:29 +0000
-Subject: Set XAUTHORITY environment variable if is unset
-
-The way it works is that if XAUTHORITY is unset, then its default
-value is $HOME/.Xauthority. But since we're changing user identity
-this will not work since $HOME will now change. Therefore, if
-XAUTHORITY is unset, just set its default value before changing
-identity. This bug only affected login managers using X Window
-Authorization but not explicitly setting the XAUTHORITY variable.
-
-You can argue that XAUTHORITY is broken since it forces uid-changing
-apps like pkexec(1) to do more work - and get involved in intimate
-details of how X works and so on - but that doesn't change how things
-work.
-
-Based on a patch from Peter Wu <lekensteyn@gmail.com>.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=51623
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
-index 840eb3c..da9784a 100644
---- a/src/programs/pkexec.c
-+++ b/src/programs/pkexec.c
-@@ -608,6 +608,28 @@ main (int argc, char *argv[])
-       g_ptr_array_add (saved_env, g_strdup (value));
-     }
- 
-+  /* $XAUTHORITY is "special" - if unset, we need to set it to ~/.Xauthority. Yes,
-+   * this is broken but it's unfortunately how things work (see fdo #51623 for
-+   * details)
-+   */
-+  if (g_getenv ("XAUTHORITY") == NULL)
-+    {
-+      const gchar *home;
-+
-+      /* pre-2.36 GLib does not examine $HOME (it always looks in /etc/passwd) and
-+       * this is not what we want
-+       */
-+      home = g_getenv ("HOME");
-+      if (home == NULL)
-+        home = g_get_home_dir ();
-+
-+      if (home != NULL)
-+        {
-+          g_ptr_array_add (saved_env, g_strdup ("XAUTHORITY"));
-+          g_ptr_array_add (saved_env, g_build_filename (home, ".Xauthority", NULL));
-+        }
-+    }
-+
-   /* Nuke the environment to get a well-known and sanitized environment to avoid attacks
-    * via e.g. the DBUS_SYSTEM_BUS_ADDRESS environment variable and similar.
-    */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-auth/polkit/polkit-0.104-r1.ebuild b/sys-auth/polkit/polkit-0.104-r1.ebuild
deleted file mode 100644
index c44490567fbd..000000000000
--- a/sys-auth/polkit/polkit-0.104-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.12 2012/10/28 15:49:09 naota 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 ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="debug doc examples gtk +introspection kde nls pam selinux systemd"
-
-RDEPEND=">=dev-libs/glib-2.30
-	dev-libs/expat
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-policykit )
-	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
-	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
-}
diff --git a/sys-auth/polkit/polkit-0.109-r1.ebuild b/sys-auth/polkit/polkit-0.109-r1.ebuild
deleted file mode 100644
index cf95b638b833..000000000000
--- a/sys-auth/polkit/polkit-0.109-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.109-r1.ebuild,v 1.3 2013/01/06 18:20:05 armin76 Exp $
-
-EAPI=5
-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 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="examples gtk +introspection kde nls pam selinux systemd"
-
-RDEPEND=">=dev-lang/spidermonkey-1.8.5-r2
-	>=dev-libs/glib-2.32
-	>=dev-libs/expat-2
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-		)
-	selinux? ( sec-policy/selinux-policykit )
-	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] )"
-
-QA_MULTILIB_PATHS="
-	usr/lib/polkit-1/polkit-agent-helper-1
-	usr/lib/polkit-1/polkitd"
-
-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() {
-	epatch "${FILESDIR}"/${P}-XAUTHORITY-fallback.patch
-
-	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
-
-	if has_version '>=dev-lang/spidermonkey-1.8.7'; then
-		sed -i \
-			-e '/mozjs/s:185:187:g' \
-			configure src/polkitbackend/polkitbackendjsauthority.c || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--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_compile() {
-	default
-
-	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
-	local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest'
-	if has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m ${f}
-	elif has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr ${f}
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" 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
-}
-
-pkg_postinst() {
-	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
-	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
-}