summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2014-04-23 16:29:51 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2014-04-23 16:29:51 +0200
commitcd273387829a01cf656c69abf67caa1aafbd50fe (patch)
treed05b66aec1249c720bcda87d4609086147a402d5
parent855762949d44e9b87c5dfee335355fb87cb3c4fe (diff)
downloadconsolekit-cd273387829a01cf656c69abf67caa1aafbd50fe.tar.gz
Add 04-long_device_names.patch: Allow for device names longer than 16 characters.
Thanks to Aleix Conchillo FlaquƩ for the patch. LP: #1130923
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/04-long_device_names.patch15
-rw-r--r--debian/patches/series1
3 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b0b8d04..c891ea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ consolekit (0.4.6-4) UNRELEASED; urgency=medium
* 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)
+
-- Martin Pitt <mpitt@debian.org> Wed, 23 Apr 2014 16:25:06 +0200
consolekit (0.4.6-3) unstable; urgency=low
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/series b/debian/patches/series
index 7970731..852e0db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
# Debian patches for consolekit
03-cleanup_console_tags.patch
+04-long_device_names.patch
99-kfreebsd-empty-env.patch