[arch-commits] Commit in consolekit/trunk (3 files)

Ionut Biru ibiru at archlinux.org
Tue Jan 25 16:19:32 EST 2011


    Date: Tuesday, January 25, 2011 @ 16:19:31
  Author: ibiru
Revision: 107463

upgpkg: consolekit 0.4.3-1
update to 0.4.3

Modified:
  consolekit/trunk/PKGBUILD
Deleted:
  consolekit/trunk/check-for-VT_WAITEVENT-ioctl-during-runtime.patch
  consolekit/trunk/consolekit.logrotate

---------------------------------------------------+
 PKGBUILD                                          |   18 --
 check-for-VT_WAITEVENT-ioctl-during-runtime.patch |  138 --------------------
 consolekit.logrotate                              |    5 
 3 files changed, 5 insertions(+), 156 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-25 20:51:54 UTC (rev 107462)
+++ PKGBUILD	2011-01-25 21:19:31 UTC (rev 107463)
@@ -3,27 +3,22 @@
 # Contributor: onestep_ua <onestep at ukr.net>
 
 pkgname=consolekit
-pkgver=0.4.2
+pkgver=0.4.3
 pkgrel=1
 pkgdesc="A framework for defining and tracking users, login sessions, and seats"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
 license=('GPL')
-depends=('polkit>=0.98' 'zlib' 'libx11>=1.3.5' 'dbus-glib>=0.86')
+depends=('polkit>=0.99' 'zlib' 'libx11>=1.4.1' 'dbus-glib>=0.92')
 makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
 options=(!libtool)
 source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2
-        pam-foreground-compat.ck
-        consolekit.logrotate
-        check-for-VT_WAITEVENT-ioctl-during-runtime.patch)
-md5sums=('285acb35bfcb2b8dc21c6071e6f6e116'
-         'a8a4de71d9b0549b8143e5f6c2a36fc7'
-         '6fefa451d9fe2fc6d6269629d3529793'
-         'dea270ebf52ef0e1b8130f1c6da73d65')
+        pam-foreground-compat.ck)
+md5sums=('4c39c6eacc75334b890f21eead1d2945'
+         'a8a4de71d9b0549b8143e5f6c2a36fc7')
 
 build() {
   cd "${srcdir}/ConsoleKit-${pkgver}"
-  patch -Np1 -i "${srcdir}/check-for-VT_WAITEVENT-ioctl-during-runtime.patch"
   ./configure --prefix=/usr \
       --sysconfdir=/etc \
       --localstatedir=/var \
@@ -33,7 +28,4 @@
   make
   make DESTDIR="${pkgdir}" install
   install -m755 "${srcdir}/pam-foreground-compat.ck" "${pkgdir}/usr/lib/ConsoleKit/run-session.d/"
-
-  # install the logrotate config
-  install -D -m644 ${srcdir}/consolekit.logrotate ${pkgdir}/etc/logrotate.d/consolekit
 }

Deleted: check-for-VT_WAITEVENT-ioctl-during-runtime.patch
===================================================================
--- check-for-VT_WAITEVENT-ioctl-during-runtime.patch	2011-01-25 20:51:54 UTC (rev 107462)
+++ check-for-VT_WAITEVENT-ioctl-during-runtime.patch	2011-01-25 21:19:31 UTC (rev 107463)
@@ -1,138 +0,0 @@
-From 24dc214f55e7c7c17d888d0ccf94cd3625767462 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl at 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

Deleted: consolekit.logrotate
===================================================================
--- consolekit.logrotate	2011-01-25 20:51:54 UTC (rev 107462)
+++ consolekit.logrotate	2011-01-25 21:19:31 UTC (rev 107463)
@@ -1,5 +0,0 @@
-/var/log/ConsoleKit/history {
-    missingok
-    notifempty
-    delaycompress
-}



More information about the arch-commits mailing list