Merge git://anonscm.debian.org/pkg-utopia/consolekit

Conflicts:
	debian/changelog
	debian/control
	debian/patches/series

7 files changed, 129 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 1e41d28..826494f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+consolekit (0.4.6-5) unstable; urgency=medium
+
+  [ Steve Langasek ]
+  * 03-cleanup_console_tags.patch: call g_dir_close() when we're done, fixing
+    a small memory leak.
+
+  [ Martin Pitt ]
+  * Add 04-long_device_names.patch: Allow for device names longer than 16
+    characters.  Thanks to Aleix Conchillo Flaqué for the patch.
+    (LP: #1130923)
+  * Bump Standards-Version to 3.9.5 (no changes necessary).
+
+ -- Martin Pitt <mpitt@debian.org>  Wed, 23 Apr 2014 16:37:49 +0200
+
+consolekit (0.4.6-4) unstable; urgency=low
+
+  * Change Maintainer to myself as per Michael's invitation
+    (https://lists.debian.org/debian-bsd/2014/02/msg00224.html)
+  * Fix VT switching and credential checks on GNU/kFreeBSD. (Closes: #734070)
+  * Use Linux versions of ck-system-restart and ck-system-stop on GNU/kFreeBSD.
+
+ -- Robert Millan <rmh@debian.org>  Wed, 19 Feb 2014 00:27:27 +0100
+
+consolekit (0.4.6-3) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 11 Sep 2013 23:08:34 +0200
+
 consolekit (0.4.6-2+dyson1) unstable; urgency=low
 
   * Package for Dyson
diff --git a/debian/control b/debian/control
index 9e4e978..adbd664 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
 Source: consolekit
 Section: admin
 Priority: optional
-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
-Uploaders: Michael Biebl <biebl@debian.org>
+Maintainer: Robert Millan <rmh@debian.org>
 Build-Depends: debhelper (>= 9),
  autotools-dev,
  pkg-config,
@@ -17,8 +16,9 @@ Build-Depends: debhelper (>= 9),
  libpolkit-gobject-1-dev (>= 0.92),
  zlib1g-dev,
  libscf-dev [illumos-any],
+ libbsd-dev (>= 0.3.0~) [kfreebsd-any],
  dh-autoreconf
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Vcs-Git: git://git.debian.org/git/pkg-utopia/consolekit.git
 Vcs-Browser: http://git.debian.org/?p=pkg-utopia/consolekit.git;a=summary
 Homepage: http://www.freedesktop.org/wiki/Software/ConsoleKit
diff --git a/debian/patches/03-cleanup_console_tags.patch b/debian/patches/03-cleanup_console_tags.patch
index 2ceb955..fca530f 100644
--- a/debian/patches/03-cleanup_console_tags.patch
+++ b/debian/patches/03-cleanup_console_tags.patch
@@ -2,9 +2,9 @@ Cleanup console tag files on application startup and shutdown.
 
 Index: consolekit/src/main.c
 ===================================================================
---- consolekit.orig/src/main.c	2010-11-17 07:02:23.030817878 +0100
-+++ consolekit/src/main.c	2010-11-17 07:03:17.434814872 +0100
-@@ -148,6 +148,43 @@
+--- consolekit.orig/src/main.c	2014-04-23 16:24:25.864069678 +0200
++++ consolekit/src/main.c	2014-04-23 16:24:46.320069405 +0200
+@@ -148,6 +148,44 @@
          unlink (CONSOLE_KIT_PID_FILE);
  }
  
@@ -36,6 +36,7 @@ Index: consolekit/src/main.c
 +		}
 +		g_free (file);
 +	}
++	g_dir_close (dir);
 +}
 +
 +static void
@@ -48,7 +49,7 @@ Index: consolekit/src/main.c
  /* copied from nautilus */
  static int debug_log_pipes[2];
  
-@@ -228,7 +265,7 @@
+@@ -228,7 +266,7 @@
                  snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
                  written = write (pf, pid, strlen (pid));
                  close (pf);
@@ -57,7 +58,7 @@ Index: consolekit/src/main.c
          } else {
                  g_warning ("Unable to write pid file %s: %s",
                             CONSOLE_KIT_PID_FILE,
-@@ -317,6 +354,8 @@
+@@ -317,6 +355,8 @@
                  goto out;
          }
  
diff --git a/debian/patches/04-long_device_names.patch b/debian/patches/04-long_device_names.patch
new file mode 100644
index 0000000..d85941a
--- /dev/null
+++ b/debian/patches/04-long_device_names.patch
@@ -0,0 +1,15 @@
+Description: Add support for devices with long names
+Bug-Ubuntu: http://launchpad.net/bugs/1130923
+Index: consolekit/src/ck-sysdeps-linux.c
+===================================================================
+--- consolekit.orig/src/ck-sysdeps-linux.c	2013-03-04 10:53:26.597712000 -0800
++++ consolekit/src/ck-sysdeps-linux.c	2013-03-04 10:57:33.612308825 -0800
+@@ -93,7 +93,7 @@
+         guint major_number;
+         guint minor_first;
+         guint minor_last;
+-        char name[16];
++        char name[32];
+         char devfs_type;
+ } tty_map_node;
+ 
diff --git a/debian/patches/99-kfreebsd-empty-env.patch b/debian/patches/99-kfreebsd-empty-env.patch
index 4ed65ea..ebab639 100644
--- a/debian/patches/99-kfreebsd-empty-env.patch
+++ b/debian/patches/99-kfreebsd-empty-env.patch
@@ -1,9 +1,9 @@
---- consolekit/src/ck-sysdeps-freebsd.c
-+++ consolekit/src/ck-sysdeps-freebsd.c
+--- a/src/ck-sysdeps-freebsd.c
++++ b/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);
diff --git a/debian/patches/misc_kfreebsd_fixes.diff b/debian/patches/misc_kfreebsd_fixes.diff
new file mode 100644
index 0000000..dfe8844
--- /dev/null
+++ b/debian/patches/misc_kfreebsd_fixes.diff
@@ -0,0 +1,71 @@
+--- a/src/ck-sysdeps-unix.c
++++ b/src/ck-sysdeps-unix.c
+@@ -100,6 +100,15 @@
+         if (ucred != NULL) {
+                 ucred_free (ucred);
+         }
++#elif defined(HAVE_GETPEEREID)
++	gid_t dummy;
++
++        if (getpeereid (socket_fd, &uid_read, &dummy) == 0) {
++                ret = TRUE;
++        } else {
++                g_warning ("Failed to getpeereid() credentials: %s\n",
++                           g_strerror (errno));
++        }
+ #else /* !SO_PEERCRED && !HAVE_GETPEERUCRED */
+         g_warning ("Socket credentials not supported on this OS\n");
+ #endif
+@@ -129,7 +138,7 @@
+ {
+ #ifdef __linux__
+         struct vt_stat vts;
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+         int vers;
+ #endif
+         int  kb_ok;
+@@ -137,7 +146,7 @@
+         errno = 0;
+ #ifdef __linux__
+         kb_ok = (ioctl (fd, VT_GETSTATE, &vts) == 0);
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+         kb_ok = (ioctl (fd, CONS_GETVERS, &vers) == 0);
+ #else
+         kb_ok = 1;
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -11,7 +11,7 @@
+ endif
+ 
+ if CK_COMPILE_FREEBSD
+-SUBDIRS += freebsd
++SUBDIRS += linux
+ endif
+ 
+ if CK_COMPILE_SOLARIS
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,10 +83,19 @@
+ EXTRA_COMPILE_WARNINGS(yes)
+ 
+ # Solaris requires libresolv for daemon()
+-case "$host" in
+-	*-*-solaris*)
++case "$host_os" in
++	solaris*)
+ 		AC_CHECK_LIB(resolv, daemon, [CONSOLE_KIT_LIBS="$CONSOLE_KIT_LIBS -lresolv"])
+ 	;;
++	kfreebsd*-gnu)
++		have_getpeereid=no
++		AC_CHECK_LIB(bsd, getpeereid, have_getpeereid=yes)
++		if test "x$have_getpeereid" = "xyes"; then
++			CONSOLE_KIT_LIBS="${CONSOLE_KIT_LIBS} -lbsd"
++			TOOLS_LIBS="${TOOLS_LIBS} -lbsd"
++			AC_DEFINE(HAVE_GETPEEREID, [], [Define if we have getpeereid])
++		fi
++	;;
+ esac
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 07c1c3e..cd3ab23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,8 @@
 # Debian patches for consolekit
 03-cleanup_console_tags.patch
+04-long_device_names.patch
 99-kfreebsd-empty-env.patch
+misc_kfreebsd_fixes.diff
 solaris/ConsoleKit-01-ck-dynamic.diff
 solaris/ConsoleKit-02-add-sunray-type.diff
 solaris/ConsoleKit-03-sol-novt.diff