Use snapshot from upstream git to clean up patchset.

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

7 files changed, 282 insertions, 5 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index ba637750538c..2f376b71d94e 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.119 2012/05/09 01:01:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.120 2012/05/14 12:53:19 ssuominen Exp $
+
+*consolekit-0.4.5_p20120320 (14 May 2012)
+
+  14 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +consolekit-0.4.5_p20120320.ebuild,
+  +files/consolekit-0.4.5-polkit-automagic.patch,
+  +files/consolekit-cleanup_console_tags.patch,
+  +files/consolekit-shutdown-reboot-without-policies.patch,
+  +files/consolekit-udev-acl-install_to_usr.patch:
+  Use snapshot from upstream git to clean up patchset.
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> consolekit-0.4.5-r3.ebuild:
   keyword ~amd64-fbsd
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 55272d0d97c1..e4b9c05f39d7 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -8,20 +8,30 @@ AUX consolekit-0.2.rc 627 RMD160 46f8b6eba63d4957c927b53a5a114512e6163cad SHA1 1
 AUX consolekit-0.4.0-multilib.patch 4378 RMD160 ef80a5e681e7d036be4de1dff40a550c3b422087 SHA1 221d6b04e35fca3bc42ec97f9bccb7c3792a0788 SHA256 1b00d28b62c0c71648978a48e65bd1bac08d230945c933e3f7cfd74cf59f337d
 AUX consolekit-0.4.0-polkit-automagic.patch 841 RMD160 59f6f8d13a6f030107908b5926e2f49439ae2f6e SHA1 6c1442f4cc860bd5e828997a6fb44cc891028e1c SHA256 965ea7e3a2868ae8fa3d0ee6c48a5b06149c08d273e8f4a8e6afa9eec0a26357
 AUX consolekit-0.4.1-shutdown-reboot-without-policies.patch 1166 RMD160 946969cbc2c86bf81f151cbefae022ea95971a57 SHA1 1db7f74e84146c738d5de4b5f835376a1a394280 SHA256 78e7e3b71c34c9a0b2eef58c55c8ac6e34fd4ee0ddb03d20c9adf138d2dafbc9
+AUX consolekit-0.4.5-polkit-automagic.patch 870 RMD160 a8b247b4cd1361c9152d33f9b5c9851dcaaa7f78 SHA1 149ad504527ac0465bb2c398ab1fe47ccdc22086 SHA256 7cd8e4ecc868b0d2566cc0d0b7b3d13a006fe55ff425314d15ecff83e550d184
 AUX consolekit-0.4.5-udev-acl-install_to_usr_and_missing_seat_d_symlink.patch 994 RMD160 4a8aa86c6194ce93da9c85f4c2257039d4fe7cca SHA1 a179bfbbba3c055fd038cb6397014b3f77d55c33 SHA256 f4c10b7cd1f5f476f48552c744f4fe7ea93dcc87cef1c7c56c7f344317a7b286
 AUX consolekit-0.4.5-udev-acl-missing-AC_SUBST.patch 279 RMD160 e3197523e484fd999646af5bb2832170bfb46fea SHA1 24659b0a759bc2c7081b1125d4c6aac1301c8d90 SHA256 ed4f2c8f476595e47169b30216dca2104220c250cd6d9b924fd15524ac7be072
 AUX consolekit-0.4.5-udev-acl.patch 20761 RMD160 431f365081b0069012a33d2ab1ccd0c227a2f863 SHA1 f6c9c7dc6c26bd4334f72b28364842ab9153109e SHA256 687cdeadf4c73bd2aa170c352acff33eddc95f8c344464730fcd18d4899db9ec
+AUX consolekit-cleanup_console_tags.patch 1596 RMD160 9fd2a84ed4f70dd43d294a5fa3518b5c5808c31e SHA1 28f4b4869f48f503103796117570b4e776d41514 SHA256 178d25a93bc04b070840650b6f847b018796186d2a54a3be7b0a6df75e8f501c
+AUX consolekit-shutdown-reboot-without-policies.patch 924 RMD160 7ba48946473bcad76cf9d47598e876d095b34114 SHA1 8c8118388755f78fbbd73031410631e6ba2efa8d SHA256 cd9a2aa582644ad50fb98e4580b9cf889c71a40f637eb0beb0eaab96d3ad9a47
+AUX consolekit-udev-acl-install_to_usr.patch 750 RMD160 cde56b246e09227d33bdedba0bb0901362212bc3 SHA1 4d4250ed5114eac21842ab7af19bbefeb8930b1a SHA256 823316f6898eaab0744e42fa11b1631f64187aebca35baa5aeab09279820bedd
 AUX pam-foreground-compat.ck 389 RMD160 b72a66d5fde612a825fb60f0f1402a0665cc6d81 SHA1 25c3e54e326606e6c476e0dbb9637e2e551a6ccc SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9
 DIST ConsoleKit-0.4.5.tar.bz2 425423 RMD160 2eba158e321778a4c17bf765d0106d214b93fe53 SHA1 6f090c1ce0d459dd6904854532554323755bdeca SHA256 43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38
+DIST ConsoleKit-0.4.5_p20120320.tar.xz 103424 RMD160 57e1c93e755d9f30c571a637922e18123dac8a98 SHA1 bf760d8e908bb8d1ad14eb300a29ff0dfd64fa64 SHA256 f85abe0644f4e9314bd33411aebceef662e482c02ab70635426996f743e2bbe3
 EBUILD consolekit-0.4.5-r1.ebuild 2800 RMD160 6c367317fef864053923c8fee00732a681152c72 SHA1 6d9037f786edc95f936d1ae1b254cc8711744a9e SHA256 d4ae0b585f5ac45311be9e01c84851f9b52d6de9032be8bf55f90abf120440ed
 EBUILD consolekit-0.4.5-r2.ebuild 2781 RMD160 b181379cf4e9a28fed832c38d5c9de005a17cab6 SHA1 0cb3ec134b1c681728a22421f09cc77868e57433 SHA256 62b9862409d01e87550217ada335edc64cf0de197e87d22fb428aa194059990e
 EBUILD consolekit-0.4.5-r3.ebuild 2827 RMD160 befce77fa36cdf6ec78341fe232a5d4b34904616 SHA1 9a273288d1caa2c97bfeb75e07ee58dab31a1c0c SHA256 ebf342d0fcfd28433ca7a92da7bd0b89a21cc88d91c6f3f0546a5bb9b9b589ca
-MISC ChangeLog 17549 RMD160 0b60d052f190e30f8e430dd64d3d9dbde97fdd36 SHA1 e6a468873f3e134df742da6116292855cd4c0ac2 SHA256 f90ade877b26b629b1fa210e5a2d1e6efdd7fc6186567deb27c0ca01b94e4943
+EBUILD consolekit-0.4.5_p20120320.ebuild 2867 RMD160 ed763218b31a36787ca18553a45b9219a6632061 SHA1 af7e1b27d515be645eae9c4f27fb3a168bd8ba4c SHA256 ed081db75faef9c5b52e5bd522d0ce7d3c7177b26f03790134bd06c6e7362423
+MISC ChangeLog 17950 RMD160 96f08185cd68bb14af4baaa1d8de8203517e4092 SHA1 486673df08b277e89a42815cef38b2a4976a4960 SHA256 12437dabea322f706bb7e2615b3c1cd3fb8e2297aaa6a3efdebf3892f3213702
 MISC metadata.xml 313 RMD160 d6625d48d47f8417bccec2c9ccf0524b5bbd58e5 SHA1 7934855c56b41e669b8070577a7838e3037dd1a1 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+pweEACgkQvFcC4BYPU0orJwCgrmjCZZfbzPo55wXW2xdbu15U
-ZGIAnRp/xk+uWYMgbKPHjBeesCAzvQvp
-=kkQm
+iQEcBAEBAgAGBQJPsP99AAoJEEdUh39IaPFNeowH/1CS2D02BXxaqN3FYdYbXYqg
+skl/pxGdZP1Zv20WoReNuKEoD8MEjLqnKU2u1m1FNSprtsy8CC6Uz30fCDyHSRmb
+tKouz7f9PGeCt8/poFdltHuwmYelu5fMyIPvwH84PJvLeJ7s2eQyDL5+VEB38UCV
+MJZexYVjCBXsOzcog3O2+YYzErl/n1H+VxX4A9p9WxCbtOjxZYIJCs2EdU1hLRjW
+u943I/Iyuaj9O/mucpYLZ/HXi8LPU1eniMYW8S29iD0ypcog4krnhdx0Irv28mqI
+Fs5xtdy0LpChWklo0kkBKA0Fcup7LBbAWjcXYbQ1d12D8NlVdjip6nGLuD3cVrA=
+=NBy1
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild b/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild
new file mode 100644
index 000000000000..caa8dcdfb0fc
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild,v 1.1 2012/05/14 12:53:19 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils linux-info pam systemd
+
+MY_PN=ConsoleKit
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
+
+if [[ ${PV} = *p20* ]]; then
+	SRC_URI="http://dev.gentoo.org/~ssuominen/${MY_P}.tar.xz"
+else
+	SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="acl debug doc kernel_linux pam policykit test"
+
+RDEPEND=">=dev-libs/dbus-glib-0.98
+	>=dev-libs/glib-2.22
+	sys-libs/zlib
+	x11-libs/libX11
+	acl? (
+		sys-apps/acl
+		sys-apps/coreutils[acl]
+		>=sys-fs/udev-171-r5
+		!<sys-fs/udev-182[acl]
+		)
+	pam? ( virtual/pam )
+	policykit? ( >=sys-auth/polkit-0.104-r1 )"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+	test? ( app-text/docbook-xml-dtd:4.1.2 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use kernel_linux; then
+		# This is from http://bugs.gentoo.org/376939
+		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
+		# This is required to get login-session-id string with pam_ck_connector.so
+		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-cleanup_console_tags.patch \
+		"${FILESDIR}"/${PN}-shutdown-reboot-without-policies.patch \
+		"${FILESDIR}"/${PN}-udev-acl-install_to_usr.patch \
+		"${FILESDIR}"/${PN}-0.4.5-polkit-automagic.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	[[ ${PV} = *p20* ]] && myconf='--enable-maintainer-mode'
+
+
+	econf \
+		XMLTO_FLAGS="--skip-validation" \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable pam pam-module) \
+		$(use_enable doc docbook-docs) \
+		$(use_enable debug) \
+		$(use_enable policykit polkit) \
+		$(use_enable acl udev-acl) \
+		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
+		--with-pam-module-dir=$(getpam_mod_dir) \
+		"$(systemd_with_unitdir)" \
+		${myconf}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	dodoc AUTHORS HACKING NEWS README TODO
+
+	newinitd "${FILESDIR}"/${PN}-0.2.rc consolekit
+
+	keepdir /usr/lib/ConsoleKit/run-seat.d
+	keepdir /usr/lib/ConsoleKit/run-session.d
+	keepdir /etc/ConsoleKit/run-session.d
+	keepdir /var/log/ConsoleKit
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
+
+	exeinto /usr/lib/ConsoleKit/run-session.d
+	doexe "${FILESDIR}"/pam-foreground-compat.ck
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/sys-auth/consolekit/files/consolekit-0.4.5-polkit-automagic.patch b/sys-auth/consolekit/files/consolekit-0.4.5-polkit-automagic.patch
new file mode 100644
index 000000000000..b896089d4485
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.4.5-polkit-automagic.patch
@@ -0,0 +1,30 @@
+http://bugs.freedesktop.org/show_bug.cgi?id=47587
+
+--- configure.ac
++++ configure.ac
+@@ -56,10 +56,21 @@
+   gthread-2.0 >= $GLIB_REQUIRED_VERSION
+ )
+ 
+-PKG_CHECK_MODULES(POLKIT,
+-  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
+-  have_polkit=yes,
+-  have_polkit=no)
++AC_ARG_ENABLE([polkit],
++  AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]),
++  enable_polkit=$enableval,
++  enable_polkit=auto)
++
++if test "x$enable_polkit" != "xno"; then
++  PKG_CHECK_MODULES(POLKIT,
++    polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
++    have_polkit=yes,
++    have_polkit=no)
++  if test "x$enable_polkit"  = "xyes" -a "x$have_polkit" = "xno"; then
++    AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
++  fi
++fi
++
+ if test "x$have_polkit" = "xyes" ; then
+        AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
+ fi
diff --git a/sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch b/sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch
new file mode 100644
index 000000000000..c02411ebded5
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch
@@ -0,0 +1,67 @@
+http://bugs.gentoo.org/257761
+http://patches.ubuntu.com/by-release/extracted/ubuntu/c/consolekit/
+
+--- src/main.c
++++ src/main.c
+@@ -148,6 +148,43 @@
+         unlink (CONSOLE_KIT_PID_FILE);
+ }
+ 
++#define CONSOLE_TAGS_DIR "/var/run/console"
++
++static void
++delete_console_tags (void)
++{
++	GDir *dir;
++	GError *error = NULL;
++	const gchar *name;
++
++	g_debug ("Cleaning up %s", CONSOLE_TAGS_DIR);
++
++	dir = g_dir_open (CONSOLE_TAGS_DIR, 0, &error);
++	if (dir == NULL) {
++		g_debug ("Couldn't open directory %s: %s", CONSOLE_TAGS_DIR,
++		           error->message);
++		g_error_free (error);
++		return;
++	}
++	while ((name = g_dir_read_name (dir)) != NULL) {
++		gchar *file;
++		file = g_build_filename (CONSOLE_TAGS_DIR, name, NULL);
++
++		g_debug ("Removing tag file: %s", file);
++		if (unlink (file) == -1) {
++			g_warning ("Couldn't delete tag file: %s", file);
++		}
++		g_free (file);
++	}
++}
++
++static void
++cleanup (void)
++{
++	delete_console_tags ();
++	delete_pid ();
++}
++
+ /* copied from nautilus */
+ static int debug_log_pipes[2];
+ 
+@@ -228,7 +265,7 @@
+                 snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
+                 written = write (pf, pid, strlen (pid));
+                 close (pf);
+-                g_atexit (delete_pid);
++                g_atexit (cleanup);
+         } else {
+                 g_warning ("Unable to write pid file %s: %s",
+                            CONSOLE_KIT_PID_FILE,
+@@ -317,6 +354,8 @@
+                 goto out;
+         }
+ 
++	delete_console_tags ();
++
+         create_pid_file ();
+ 
+         loop = g_main_loop_new (NULL, FALSE);
diff --git a/sys-auth/consolekit/files/consolekit-shutdown-reboot-without-policies.patch b/sys-auth/consolekit/files/consolekit-shutdown-reboot-without-policies.patch
new file mode 100644
index 000000000000..6a46649f7587
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-shutdown-reboot-without-policies.patch
@@ -0,0 +1,26 @@
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Sat, 24 Oct 2009 18:43:43 +0200
+Subject: [PATCH] Be able to shutdown or reboot even without polkit or RBAC supports
+
+Ck does NOTHING at the origin if its built without polkit or RBAC supports, except
+display a warning using g_warning() (which does not make sense).
+The trick is to to call do_stop()/do_restart() in the #else directive :)
+
+--- src/ck-manager.c
++++ src/ck-manager.c
+@@ -1131,6 +1131,7 @@
+         check_rbac_permissions (manager, context, RBAC_SHUTDOWN_KEY, do_restart);
+ #else
+         g_warning ("Compiled without PolicyKit or RBAC support!");
++        do_restart(manager, context);
+ #endif
+ 
+         return TRUE;
+@@ -1207,6 +1208,7 @@
+         check_rbac_permissions (manager, context, RBAC_SHUTDOWN_KEY, do_stop);
+ #else
+         g_warning ("Compiled without PolicyKit or RBAC support!");
++        do_stop(manager, context);
+ #endif
+ 
+         return TRUE;
diff --git a/sys-auth/consolekit/files/consolekit-udev-acl-install_to_usr.patch b/sys-auth/consolekit/files/consolekit-udev-acl-install_to_usr.patch
new file mode 100644
index 000000000000..3ef39873dbd6
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-udev-acl-install_to_usr.patch
@@ -0,0 +1,28 @@
+http://bugs.gentoo.org/398049
+
+--- tools/Makefile.am
++++ tools/Makefile.am
+@@ -144,11 +144,10 @@
+ 	$(NULL)
+ 
+ if ENABLE_UDEV_ACL
+-udevdir = $(UDEVDIR)
+ udevrulesdir = $(UDEVDIR)/rules.d
+ 
+ dist_udevrules_DATA = 70-udev-acl.rules
+-udev_PROGRAMS = udev-acl
++libexec_PROGRAMS = udev-acl
+ 
+ udev_acl_SOURCES = udev-acl.c
+ udev_acl_LDADD = $(UDEV_ACL_LIBS)
+@@ -156,7 +155,9 @@
+ 
+ install-exec-hook:
+ 	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+-	ln -sf $(UDEVDIR)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
++	mkdir -p $(DESTDIR)$(UDEVDIR)
++	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
++	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(UDEVDIR)/udev-acl
+ endif
+ 
+ EXTRA_DIST =				\