summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-01-13 15:34:39 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-01-13 15:34:39 +0000
commit989136f8a0c87980be88295cd7e7c4614a3f2d0d (patch)
treea7510f796bac75c3b9e474eaa20f3e22962e4cfc /sys-auth
parentStable for HPPA (bug #349262). (diff)
downloadhistorical-989136f8a0c87980be88295cd7e7c4614a3f2d0d.tar.gz
historical-989136f8a0c87980be88295cd7e7c4614a3f2d0d.tar.bz2
historical-989136f8a0c87980be88295cd7e7c4614a3f2d0d.zip
old
Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/consolekit/Manifest3
-rw-r--r--sys-auth/consolekit/consolekit-0.4.2-r4.ebuild96
-rw-r--r--sys-auth/consolekit/files/consolekit-0.4.2-check-for-VT_WAITEVENT-ioctl-during-runtime.patch138
3 files changed, 0 insertions, 237 deletions
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index fdc52f1a046d..bba5aab52d25 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -5,11 +5,8 @@ AUX consolekit-0.2.10-polkit-automagic.patch 988 RMD160 1146e1c30b327191a5429e54
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.2-check-for-VT_WAITEVENT-ioctl-during-runtime.patch 4104 RMD160 7db82fa9b1da7c922b6fa8f68e6677c5fc215c70 SHA1 07bbb52b7d326c23d4262c4996e4be77d22017f7 SHA256 f74c68229ecdef620584b6a5c93aae60e4313dae66e9117099804b49719ac888
AUX pam-foreground-compat.ck 389 RMD160 b72a66d5fde612a825fb60f0f1402a0665cc6d81 SHA1 25c3e54e326606e6c476e0dbb9637e2e551a6ccc SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9
-DIST ConsoleKit-0.4.2.tar.bz2 412651 RMD160 cc76cfb1462a238754c7c1ecd7404a0db26c7501 SHA1 fa588abe532c1d55fd98e0cc0178dde3f30266ff SHA256 656f406c9c436bd105c34d87e824cb2fbae09fa672b93894059281124480fe15
DIST ConsoleKit-0.4.3.tar.bz2 413205 RMD160 f7abb173780734e4f34fef85d6f4eb3e9c3826c1 SHA1 59f4d3d16f4cfef69ec2ab6afe2f1f2e8f8f70a2 SHA256 fe02aca2b4c21df59aa5fbe6f28ea3ea4b3c9dd64c48c50634e9a53cf9c0dcc5
-EBUILD consolekit-0.4.2-r4.ebuild 2784 RMD160 42b70c8db9bd2fdd868ca4d8cd708f9b384c6ab3 SHA1 e1b6348f24875541c9b39a30090a44108175e103 SHA256 128c122c47a97e8cd66a9f6660463fba3d00cbb3f1054ad1a3c67f2d1e1ea83f
EBUILD consolekit-0.4.3.ebuild 2692 RMD160 a9af792f6268c2dec7bf78535979a35bbc355365 SHA1 e84db1321061c97f4ab3a9338fe322a55776387d SHA256 134fa451d3e139516d86d3905019f7fe7074d185576da09873c7b2571b4fd7b5
MISC ChangeLog 13941 RMD160 d3b3134d60b0a1ee10410e8961210efbee6147c4 SHA1 cbf17a9ce86b84c06252ba992ae6bdcb46edf1b7 SHA256 1bc23bb74f12a4cb2ebfe37a4694e2de7a44bb7b99a4192cb9e7269a42bab309
MISC metadata.xml 313 RMD160 d6625d48d47f8417bccec2c9ccf0524b5bbd58e5 SHA1 7934855c56b41e669b8070577a7838e3037dd1a1 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b
diff --git a/sys-auth/consolekit/consolekit-0.4.2-r4.ebuild b/sys-auth/consolekit/consolekit-0.4.2-r4.ebuild
deleted file mode 100644
index 8958a2d196f1..000000000000
--- a/sys-auth/consolekit/consolekit-0.4.2-r4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.2-r4.ebuild,v 1.8 2010/11/27 17:33:20 armin76 Exp $
-
-EAPI=3
-inherit autotools eutils linux-info multilib pam
-
-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"
-SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug doc kernel_linux pam policykit test"
-
-RDEPEND=">=dev-libs/dbus-glib-0.80
- >=dev-libs/glib-2.20
- sys-libs/zlib
- x11-libs/libX11
- pam? ( virtual/pam )
- policykit? ( >=sys-auth/polkit-0.96 )
- !<sys-apps/shadow-4.1.4.2-r6
- !<sys-auth/pambase-20101024"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- dev-libs/libxslt
- doc? ( app-text/xmlto )
- test? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use kernel_linux; then
- CONFIG_CHECK="~AUDITSYSCALL"
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.2.10-cleanup_console_tags.patch \
- "${FILESDIR}"/${PN}-0.4.0-polkit-automagic.patch \
- "${FILESDIR}"/${PN}-0.4.0-multilib.patch \
- "${FILESDIR}"/${PN}-0.4.1-shutdown-reboot-without-policies.patch \
- "${FILESDIR}"/${PN}-0.4.2-check-for-VT_WAITEVENT-ioctl-during-runtime.patch
-
- eautoreconf
-}
-
-src_configure() {
- 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) \
- --with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
- --with-pam-module-dir=$(getpam_mod_dir)
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
- install || die
-
- dodoc AUTHORS ChangeLog HACKING NEWS README TODO
-
- newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
-
- keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d
- keepdir /etc/ConsoleKit/run-session.d
- keepdir /var/run/ConsoleKit
- keepdir /var/log/ConsoleKit
-
- exeinto /etc/X11/xinit/xinitrc.d
- newexe "${FILESDIR}"/90-consolekit-3 90-consolekit || die
-
- exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d
- doexe "${FILESDIR}"/pam-foreground-compat.ck || die
-
- find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_postinst() {
- ewarn
- ewarn "You need to restart ConsoleKit to get the new features."
- ewarn "This can be done with /etc/init.d/consolekit restart"
- ewarn "but make sure you do this and then restart your session"
- ewarn "otherwise you will get access denied for certain actions"
-}
diff --git a/sys-auth/consolekit/files/consolekit-0.4.2-check-for-VT_WAITEVENT-ioctl-during-runtime.patch b/sys-auth/consolekit/files/consolekit-0.4.2-check-for-VT_WAITEVENT-ioctl-during-runtime.patch
deleted file mode 100644
index cee268a2244c..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.4.2-check-for-VT_WAITEVENT-ioctl-during-runtime.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 24dc214f55e7c7c17d888d0ccf94cd3625767462 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl@debian.org>
-Date: Sun, 19 Sep 2010 22:45:16 +0000
-Subject: linux: Check for VT_WAITEVENT ioctl during runtime
-
-Since 2782cc8d4950effbc4407455e72bd4750cef6e11 ConsoleKit fails, if it
-has been compiled on a linux kernel >= 2.6.32 but is run with an older
-kernel. Check for VT_WAITEVENT ioctl during runtime and fallback to the
-old behaviour of creating a thread for every possible vt.
----
-diff --git a/src/ck-vt-monitor.c b/src/ck-vt-monitor.c
-index 369c63e..9310341 100644
---- a/src/ck-vt-monitor.c
-+++ b/src/ck-vt-monitor.c
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <errno.h>
- #include <signal.h>
-+#include <sys/ioctl.h>
-
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -311,6 +312,34 @@ schedule_process_queue (CkVtMonitor *vt_monitor)
- G_UNLOCK (schedule_lock);
- }
-
-+#ifdef VT_WAITEVENT
-+static gboolean
-+vt_waitevent_supported (int fd)
-+{
-+ static int supported = -1;
-+ int res;
-+
-+ if (supported >= 0)
-+ return supported;
-+
-+ res = ioctl(fd, VT_WAITEVENT, NULL);
-+
-+ if (res == ERROR) {
-+ if (errno == EINVAL) {
-+ g_debug ("VT_WAITEVENT not supported on this system");
-+ supported = FALSE;
-+ return FALSE;
-+ } else if (errno == EFAULT) {
-+ g_debug ("VT_WAITEVENT supported on this system");
-+ supported = TRUE;
-+ return TRUE;
-+ }
-+ }
-+ g_debug ("Unexpected result for VT_WAITEVENT check, returning FALSE");
-+ return FALSE;
-+}
-+#endif
-+
- static void *
- vt_thread_start (ThreadData *data)
- {
-@@ -322,6 +351,9 @@ vt_thread_start (ThreadData *data)
- num = data->num;
-
- #ifdef VT_WAITEVENT
-+ if (!vt_waitevent_supported(vt_monitor->priv->vfd))
-+ goto no_waitevent;
-+
- for (;;) {
- res = ck_wait_for_console_switch (vt_monitor->priv->vfd, &num);
- if (! res) {
-@@ -340,7 +372,10 @@ vt_thread_start (ThreadData *data)
- schedule_process_queue (vt_monitor);
- }
- }
--#else
-+ goto out;
-+#endif
-+
-+no_waitevent:
- res = ck_wait_for_active_console_num (vt_monitor->priv->vfd, num);
- if (! res) {
- /* FIXME: what do we do if it fails? */
-@@ -357,8 +392,8 @@ vt_thread_start (ThreadData *data)
- /* schedule processing of queue */
- schedule_process_queue (vt_monitor);
- }
--#endif
-
-+out:
- G_LOCK (hash_lock);
- if (vt_monitor->priv->vt_thread_hash != NULL) {
- g_hash_table_remove (vt_monitor->priv->vt_thread_hash, GUINT_TO_POINTER (num));
-@@ -418,19 +453,24 @@ vt_add_watches (CkVtMonitor *vt_monitor)
- sigaction (SIGPOLL, &act, NULL);
-
- ioctl (vt_monitor->priv->vfd, I_SETSIG, S_MSG);
--#elif defined (VT_WAITEVENT)
-+#else
-+ guint max_consoles;
-+ int i;
-+ gint32 current_num;
- gpointer id;
-
-+#if defined (VT_WAITEVENT)
-+ if (!vt_waitevent_supported(vt_monitor->priv->vfd))
-+ goto no_waitevent;
-+
- G_LOCK (hash_lock);
- id = GINT_TO_POINTER (1);
- if (g_hash_table_lookup (vt_monitor->priv->vt_thread_hash, id) == NULL)
- vt_add_watch_unlocked (vt_monitor, 1);
-- G_UNLOCK (hash_lock);
--#else
-- guint max_consoles;
-- int i;
-- gint32 current_num;
-+ goto out;
-+#endif
-
-+no_waitevent:
- G_LOCK (hash_lock);
-
- current_num = vt_monitor->priv->active_num;
-@@ -442,7 +482,6 @@ vt_add_watches (CkVtMonitor *vt_monitor)
- }
-
- for (i = 1; i < max_consoles; i++) {
-- gpointer id;
-
- /* don't wait on the active vc */
- if (i == current_num) {
-@@ -457,6 +496,7 @@ vt_add_watches (CkVtMonitor *vt_monitor)
- }
- }
-
-+out:
- G_UNLOCK (hash_lock);
- #endif
- }
---
-cgit v0.8.3-6-g21f6