diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 24 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/patches/00git_truncate_frequent.patch | 24 | ||||
| -rw-r--r-- | debian/patches/82-hurd_support.patch | 509 | ||||
| -rw-r--r-- | debian/patches/99-kfreebsd-empty-env.patch | 11 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rwxr-xr-x | debian/rules | 10 | ||||
| -rw-r--r-- | debian/watch | 2 |
8 files changed, 48 insertions, 542 deletions
diff --git a/debian/changelog b/debian/changelog index 4c24b9d..9d010ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +consolekit (0.4.6-2) experimental; urgency=low + + * Acknowledge non-maintainer upload, thanks Christoph and Petr. + + -- Michael Biebl <biebl@debian.org> Fri, 19 Jul 2013 19:33:04 +0200 + +consolekit (0.4.6-1) experimental; urgency=low + + * New upstream release. + * Track .xz tarballs instead of .gz. + * Remove patches which are now applied upstream. + * Enable support for udev-acl which has been removed from udev. + * Add necessary Breaks/Replaces for udev. + + -- Michael Biebl <biebl@debian.org> Fri, 19 Jul 2013 16:47:42 +0200 + +consolekit (0.4.5-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Include patch by Petr Salinger to ignore empty environments. + (Closes: #570015) + + -- Christoph Egger <christoph@debian.org> Mon, 30 Jul 2012 13:57:55 +0200 + consolekit (0.4.5-3+dyson1) unstable; urgency=low * Built for Dyson diff --git a/debian/control b/debian/control index 9a2dea9..582c118 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,9 @@ Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, libdbus-glib-1-dev (>= 0.30), - libglib2.0-dev (>= 2.14.0), + libglib2.0-dev (>= 2.22.0), + libacl1-dev [linux-any], + libudev-dev [linux-any], libx11-dev (>= 1.0.0), libkvm-dev [kfreebsd-any], xmlto, @@ -25,7 +27,8 @@ Section: admin Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libck-connector0 (= ${binary:Version}), dbus (>= 1.1.2) Recommends: libpam-ck-connector -Breaks: udev (<< 147) +Breaks: udev (<< 204-1) +Replaces: udev (<< 204-1) Description: framework for defining and tracking users, sessions and seats ConsoleKit is a system daemon for tracking what users are logged into the system and how they interact with the computer (e.g. diff --git a/debian/patches/00git_truncate_frequent.patch b/debian/patches/00git_truncate_frequent.patch deleted file mode 100644 index 4b48ae9..0000000 --- a/debian/patches/00git_truncate_frequent.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 803cbdfbd78b66b17ead45b1584d65a258e785bf Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstrode@redhat.com> -Date: Wed, 25 May 2011 00:58:10 +0000 -Subject: ck-history: don't truncate --frequent output to 8 chars - -GDM screenscrapes the output and so we need the full username. - -https://bugzilla.gnome.org/show_bug.cgi?id=650330 ---- -diff --git a/tools/ck-history.c b/tools/ck-history.c -index d02caaa..85d9e6f 100644 ---- a/tools/ck-history.c -+++ b/tools/ck-history.c -@@ -804,7 +804,7 @@ generate_report_frequent (int uid, - data = user_counts->data; - - username = get_user_name_for_uid (data->uid); -- g_print ("%-8.8s %u\n", username, data->count); -+ g_print ("%-8s %u\n", username, data->count); - g_free (data); - user_counts = g_list_delete_link (user_counts, user_counts); - g_free (username); --- -cgit v0.9.0.2-2-gbebe diff --git a/debian/patches/82-hurd_support.patch b/debian/patches/82-hurd_support.patch deleted file mode 100644 index b86720c..0000000 --- a/debian/patches/82-hurd_support.patch +++ /dev/null @@ -1,509 +0,0 @@ -Description: Add support for GNU/Hurd - currently consolekit fails to build on GNU/Hurd mainly because there's no - sysdeps backend for the GNU OS implemented. Also there is an unconditional - PATH_MAX usage. - The attached patch proposes a sysdeps-gnu backend, which implements the process - management using Hurd's libps, the *ttyent API for the part of the console - implementation and the rest using similar (valid) approaches of other backends. - Also, it fixes the PATH_MAX usage in pam-ck-connector/pam-ck-connector.c by - using a variable-length malloc'ed buffer. -Author: Pino Toscano <pino@kde.org> -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552393 -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24738 -Last-Update: 2010-09-20 - -Index: consolekit/configure.ac -=================================================================== ---- consolekit.orig/configure.ac 2010-09-20 03:07:20.969097019 +0200 -+++ consolekit/configure.ac 2010-09-20 03:07:22.189095438 +0200 -@@ -190,6 +190,9 @@ - *-*-solaris*) - CK_BACKEND="solaris" - ;; -+ *-*-gnu*) -+ CK_BACKEND="gnu" -+ ;; - *) - AC_MSG_ERROR([No sysdeps back-end implemented for host $host]) - ;; -@@ -200,6 +203,7 @@ - AM_CONDITIONAL(CK_COMPILE_LINUX, test x$CK_BACKEND = xlinux, [Compiling for Linux]) - AM_CONDITIONAL(CK_COMPILE_FREEBSD, test x$CK_BACKEND = xfreebsd, [Compiling for FreeBSD]) - AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris]) -+AM_CONDITIONAL(CK_COMPILE_GNU, test x$CK_BACKEND = xgnu, [Compiling for GNU]) - AC_SUBST(CK_BACKEND) - - dnl --------------------------------------------------------------------------- -Index: consolekit/src/Makefile.am -=================================================================== ---- consolekit.orig/src/Makefile.am 2010-09-20 03:07:09.397095424 +0200 -+++ consolekit/src/Makefile.am 2010-09-20 03:07:22.189095438 +0200 -@@ -57,11 +57,18 @@ - $(NULL) - libck_la_LIBADD = $(KVM_LIBS) - endif -+if CK_COMPILE_GNU -+libck_la_SOURCES += \ -+ ck-sysdeps-gnu.c \ -+ $(NULL) -+libck_la_LIBADD = -lps -+endif - - EXTRA_libck_la_SOURCES = \ - ck-sysdeps-linux.c \ - ck-sysdeps-solaris.c \ - ck-sysdeps-freebsd.c \ -+ ck-sysdeps-gnu.c \ - $(NULL) - - sbin_PROGRAMS = \ -Index: consolekit/src/ck-sysdeps-gnu.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ consolekit/src/ck-sysdeps-gnu.c 2010-09-20 03:07:22.189095438 +0200 -@@ -0,0 +1,402 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -+ * -+ * Copyright (C) 2009 Pino Toscano <pino@kde.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ */ -+ -+#include "config.h" -+ -+#include <stdlib.h> -+#include <stdio.h> -+#include <unistd.h> -+#include <string.h> -+#include <errno.h> -+ -+#include <hurd.h> -+#include <dirent.h> -+#include <ps.h> -+#include <ttyent.h> -+ -+#ifdef HAVE_PATHS_H -+#include <paths.h> -+#endif /* HAVE_PATHS_H */ -+ -+#include "ck-sysdeps.h" -+ -+struct _CkProcessStat -+{ -+ struct proc_stat *ps; /* the statistics of a process */ -+}; -+ -+static struct ps_context *pc = NULL; -+ -+static gboolean -+get_proc_stat_from_pid (pid_t pid, -+ ps_flags_t flags, -+ struct proc_stat **res_ps) -+{ -+ error_t err; -+ struct proc_stat *ps; -+ -+ g_assert (pid >= 0); -+ g_assert (res_ps != NULL); -+ -+ if (pc == NULL) { -+ err = ps_context_create (getproc (), &pc); -+ if (err) { -+ return FALSE; -+ } -+ } -+ -+ err = _proc_stat_create (pid, pc, &ps); -+ if (err) { -+ return FALSE; -+ } -+ -+ err = proc_stat_set_flags (ps, PSTAT_PID | flags); -+ if (err) { -+ return FALSE; -+ } -+ -+ *res_ps = ps; -+ return TRUE; -+} -+ -+ -+pid_t -+ck_process_stat_get_ppid (CkProcessStat *stat) -+{ -+ g_return_val_if_fail (stat != NULL, -1); -+ -+ return proc_stat_pid (stat->ps); -+} -+ -+char * -+ck_process_stat_get_cmd (CkProcessStat *stat) -+{ -+ g_return_val_if_fail (stat != NULL, NULL); -+ -+ return g_strdup (proc_stat_args (stat->ps)); -+} -+ -+char * -+ck_process_stat_get_tty (CkProcessStat *stat) -+{ -+ struct ps_tty *tty; -+ -+ g_return_val_if_fail (stat != NULL, NULL); -+ -+ tty = proc_stat_tty (stat->ps); -+ -+ return tty ? g_strdup (ps_tty_name (tty)) : NULL; -+} -+ -+gboolean -+ck_process_stat_new_for_unix_pid (pid_t pid, -+ CkProcessStat **stat, -+ GError **error) -+{ -+ gboolean res; -+ struct proc_stat *ps; -+ CkProcessStat *proc; -+ -+ g_return_val_if_fail (pid > 1, FALSE); -+ -+ if (stat == NULL) { -+ return FALSE; -+ } -+ -+ *stat = NULL; -+ -+ res = get_proc_stat_from_pid (pid, PSTAT_ARGS | PSTAT_TTY, &ps); -+ if (!res) { -+ return FALSE; -+ } -+ -+ proc = g_new0 (CkProcessStat, 1); -+ proc->ps = ps; -+ *stat = proc; -+ -+ return TRUE; -+} -+ -+void -+ck_process_stat_free (CkProcessStat *stat) -+{ -+ _proc_stat_free (stat->ps); -+ -+ g_free (stat); -+} -+ -+GHashTable * -+ck_unix_pid_get_env_hash (pid_t pid) -+{ -+ struct proc_stat *ps; -+ char *env_p; -+ size_t env_index; -+ size_t env_l; -+ gboolean res; -+ GHashTable *hash; -+ -+ g_return_val_if_fail (pid > 1, NULL); -+ -+ res = get_proc_stat_from_pid (pid, PSTAT_ENV, &ps); -+ if (!res) { -+ return NULL; -+ } -+ -+ hash = g_hash_table_new_full (g_str_hash, -+ g_str_equal, -+ g_free, -+ g_free); -+ -+ env_index = 0; -+ env_l = 0; -+ env_p = proc_stat_env (ps); -+ while (env_index < proc_stat_env_len (ps)) { -+ env_l = strlen (env_p); -+ env_index += env_l + 1; -+ if (env_l) { -+ char **vals; -+ vals = g_strsplit (env_p, "=", 2); -+ if (vals != NULL) { -+ g_hash_table_insert (hash, -+ g_strdup (vals[0]), -+ g_strdup (vals[1])); -+ g_strfreev (vals); -+ } -+ } -+ env_p = env_p + env_l + 1; -+ } -+ -+ _proc_stat_free (ps); -+ -+ return hash; -+} -+ -+char * -+ck_unix_pid_get_env (pid_t pid, -+ const char *var) -+{ -+ struct proc_stat *ps; -+ char *env_p; -+ size_t env_index; -+ size_t env_l; -+ char *prefix; -+ int prefix_len; -+ char *val; -+ gboolean res; -+ -+ g_return_val_if_fail (pid > 1, NULL); -+ -+ val = NULL; -+ -+ res = get_proc_stat_from_pid (pid, PSTAT_ENV, &ps); -+ if (!res) { -+ return NULL; -+ } -+ -+ prefix = g_strdup_printf ("%s=", var); -+ prefix_len = strlen (prefix); -+ -+ env_index = 0; -+ env_l = 0; -+ env_p = proc_stat_env (ps); -+ while (env_index < proc_stat_env_len (ps)) { -+ env_l = strlen (env_p); -+ env_index += env_l + 1; -+ if (env_l && g_str_has_prefix (env_p, prefix)) { -+ val = g_strdup (env_p + prefix_len); -+ break; -+ } -+ env_p = env_p + env_l + 1; -+ } -+ -+ g_free (prefix); -+ -+ _proc_stat_free (ps); -+ -+ return val; -+} -+ -+uid_t -+ck_unix_pid_get_uid (pid_t pid) -+{ -+ struct proc_stat *ps; -+ gboolean res; -+ uid_t uid; -+ -+ g_return_val_if_fail (pid > 1, 0); -+ -+ res = get_proc_stat_from_pid (pid, PSTAT_OWNER_UID, &ps); -+ if (!res) { -+ return 0; -+ } -+ -+ uid = proc_stat_owner_uid (ps); -+ -+ _proc_stat_free (ps); -+ -+ return uid; -+} -+ -+pid_t -+ck_unix_pid_get_ppid (pid_t pid) -+{ -+ struct proc_stat *ps; -+ gboolean res; -+ pid_t ppid; -+ -+ g_return_val_if_fail (pid > 1, 0); -+ -+ res = get_proc_stat_from_pid (pid, PSTAT_PROC_INFO, &ps); -+ if (!res) { -+ return 0; -+ } -+ -+ ppid = proc_stat_proc_info (ps)->ppid; -+ -+ _proc_stat_free (ps); -+ -+ return ppid; -+} -+ -+gboolean -+ck_unix_pid_get_login_session_id (pid_t pid, -+ char **idp) -+{ -+ g_return_val_if_fail (pid > 1, FALSE); -+ -+ return FALSE; -+} -+ -+gboolean -+ck_get_max_num_consoles (guint *num) -+{ -+ int max_consoles; -+ int res; -+ gboolean ret; -+ struct ttyent *t; -+ -+ ret = FALSE; -+ max_consoles = 0; -+ -+ res = setttyent (); -+ if (res == 0) { -+ goto done; -+ } -+ -+ while ((t = getttyent ()) != NULL) { -+ if (t->ty_status & TTY_ON && strncmp (t->ty_name, "tty", 3) == 0) -+ max_consoles++; -+ } -+ -+ /* Increment one more so that all consoles are properly counted -+ * this is arguable a bug in vt_add_watches(). -+ */ -+ max_consoles++; -+ -+ ret = TRUE; -+ -+ endttyent (); -+ -+done: -+ if (num != NULL) { -+ *num = max_consoles; -+ } -+ -+ return ret; -+} -+ -+gboolean -+ck_supports_activatable_consoles (void) -+{ -+ return TRUE; -+} -+ -+char * -+ck_get_console_device_for_num (guint num) -+{ -+ char *device; -+ -+ device = g_strdup_printf (_PATH_TTY "%u", num); -+ -+ return device; -+} -+ -+gboolean -+ck_get_console_num_from_device (const char *device, -+ guint *num) -+{ -+ guint n; -+ gboolean ret; -+ -+ n = 0; -+ ret = FALSE; -+ -+ if (device == NULL) { -+ return FALSE; -+ } -+ -+ if (sscanf (device, _PATH_TTY "%u", &n) == 1) { -+ ret = TRUE; -+ } -+ -+ if (num != NULL) { -+ *num = n; -+ } -+ -+ return ret; -+} -+ -+gboolean -+ck_get_active_console_num (int console_fd, -+ guint *num) -+{ -+ gboolean ret; -+ int res; -+ long cur_active; -+ char buf[30]; -+ guint active; -+ -+ g_assert (console_fd != -1); -+ -+ active = 0; -+ ret = FALSE; -+ -+ res = readlink ("/dev/cons/vcs", buf, sizeof (buf)); -+ if (res > 0) { -+ /* the resolved path is like "/dev/vcs/$number", so skip -+ the non-number part at the start */ -+ const char *p = buf; -+ while ((*p) && ((*p < '0') || (*p > '9'))) { -+ ++p; -+ } -+ if (*p) { -+ cur_active = strtol (p, NULL, 10); -+ g_debug ("Current VT: tty%ld", cur_active); -+ active = cur_active; -+ ret = TRUE; -+ } -+ } -+ -+ if (num != NULL) { -+ *num = active; -+ } -+ -+ return ret; -+} -Index: consolekit/pam-ck-connector/pam-ck-connector.c -=================================================================== ---- consolekit.orig/pam-ck-connector/pam-ck-connector.c 2010-09-20 17:15:53.000000000 +0200 -+++ consolekit/pam-ck-connector/pam-ck-connector.c 2010-09-20 17:33:54.000000000 +0200 -@@ -244,12 +244,12 @@ - const char *s; - uid_t uid; - char buf[256]; -- char ttybuf[PATH_MAX]; -+ char *ttybuf; - DBusError error; - dbus_bool_t is_local; - - ret = PAM_IGNORE; -- -+ ttybuf = NULL; - is_local = TRUE; - - _parse_pam_args (pamh, flags, argc, argv); -@@ -295,7 +295,13 @@ - x11_display = display_device; - display_device = ""; - } else if (strncmp (_PATH_DEV, display_device, 5) != 0) { -- snprintf (ttybuf, sizeof (ttybuf), _PATH_DEV "%s", display_device); -+ int len = strlen (_PATH_DEV) + strlen (display_device) + 1; -+ ttybuf = malloc (len); -+ if (ttybuf == NULL) { -+ ck_pam_syslog (pamh, LOG_ERR, "oom allocating ttybuf"); -+ goto out; -+ } -+ snprintf (ttybuf, len, _PATH_DEV "%s", display_device); - display_device = ttybuf; - } - -@@ -411,6 +417,8 @@ - ret = PAM_SUCCESS; - - out: -+ free (ttybuf); -+ - return ret; - } - diff --git a/debian/patches/99-kfreebsd-empty-env.patch b/debian/patches/99-kfreebsd-empty-env.patch new file mode 100644 index 0000000..4ed65ea --- /dev/null +++ b/debian/patches/99-kfreebsd-empty-env.patch @@ -0,0 +1,11 @@ +--- consolekit/src/ck-sysdeps-freebsd.c ++++ consolekit/src/ck-sysdeps-freebsd.c +@@ -261,6 +261,8 @@ + for (i = 0; penv[i] != NULL; i++) { + char **vals; + ++ if (!penv[i][0]) continue; ++ + vals = g_strsplit (penv[i], "=", 2); + if (vals != NULL) { + g_hash_table_insert (hash, diff --git a/debian/patches/series b/debian/patches/series index a4645ef..7970731 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ # Debian patches for consolekit -00git_truncate_frequent.patch 03-cleanup_console_tags.patch -82-hurd_support.patch +99-kfreebsd-empty-env.patch diff --git a/debian/rules b/debian/rules index 0269691..a2937c8 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,12 @@ else with-systemd := endif +ifeq ($(DEB_HOST_ARCH_OS),linux) +CONFFLAGS = --enable-udev-acl +endif override_dh_auto_configure: - dh_auto_configure -- \ + dh_auto_configure -- $(CONFFLAGS) \ --libexecdir="\$$(prefix)/lib/ConsoleKit" \ --enable-pam-module \ --enable-docbook-docs \ @@ -28,8 +31,7 @@ override_dh_auto_install: override_dh_install: dh_install -ifeq (linux, $(DEB_HOST_ARCH_OS)) - dh_install -pconsolekit lib/systemd +ifeq ($(DEB_HOST_ARCH_OS),linux) + dh_install -pconsolekit debian/tmp/lib/udev/ endif - diff --git a/debian/watch b/debian/watch index c52efc8..7187ffd 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-(.*)\.tar\.(?:gz|bz2) +http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-(.*)\.tar\.(?:bz2|xz) |