debian/changelog |
7 +
debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff |
54 ++++++++++
debian/patches/series |
1
3 files changed, 62 insertions(+)
New commits:
commit 1b052d1a243e109af7fe96ab676ad6b74455de38
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Oct 7 18:51:24 2012 +0200
Fix Xephyr command line option parsing (closes: #689246).
Thanks, Andrzej Pietrasiewicz!
diff --git a/debian/changelog b/debian/changelog
index 77da19b..cc2706e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.12.4-2) UNRELEASED; urgency=low
+
+ * Fix Xephyr command line option parsing (closes: #689246). Thanks, Andrzej
+ Pietrasiewicz!
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 07 Oct 2012 18:50:40 +0200
+
xorg-server (2:1.12.4-1) unstable; urgency=low
* New upstream stable release.
diff --git
a/debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff
b/debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff
new file mode 100644
index 0000000..fbb6ac7
--- /dev/null
+++
b/debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff
@@ -0,0 +1,54 @@
+From 0f3ac13b3c23bc11a9b58d594aea9bb84523544f Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcris...@debian.org>
+Date: Sun, 7 Oct 2012 18:34:21 +0200
+Subject: [PATCH] Revert "kinput: allocate enough space for null character."
+
+This reverts commit 531785dd746d64ef7f473a83ca73bb20e74b6fca.
+
+The above commit breaks Xephyr option parsing. Andrzej writes:
+
+ Xephyr -retro -keybd
evdev,,device=/dev/input/event2,xkbrules=evdev,xkbmodel=evdev,xkblayout=pl
-mouse evdev,,device=/dev/input/event1 :3
+
+ results in:
+
+ <snip>
+ Pointer option key (device=) of value (/dev/input/event1) not assigned!
+ Kbd option key (device=) of value (/dev/input/event2) not assigned!
+ Kbd option key (xkbrules=) of value (evdev) not assigned!
+ Kbd option key (xkbmodel=) of value (evdev) not assigned!
+ Kbd option key (xkblayout=) of value (pl) not assigned!
+ <snip>
+
+ The effect of the patch is that the "key=value" pairs are parsed in such
+ a way that the key is added an "equals" sign to it and we end up with
+ keys like "device=" instead of "device". This in turn has effect on
+ KdParsePointerOptions and KdParseKbdOptions: the key does not match
+ any choice presented in the "switch" statement, and so "Pointer/Kbd
+ option key (...) of value (...) not assigned!" happens, making all
+ "key=value" options inaccessible to the user. Reverting the patch makes
+ them available again.
+
+Reference: http://bugs.debian.org/689246
+Reported-by: Andrzej Pietrasiewicz <andrzejtp2...@gmail.com>
+Signed-off-by: Julien Cristau <jcris...@debian.org>
+Cc: Dave Airlie <airl...@redhat.com>
+---
+ hw/kdrive/src/kinput.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
+index d35dcf8..b1068bb 100644
+--- a/hw/kdrive/src/kinput.c
++++ b/hw/kdrive/src/kinput.c
+@@ -1034,7 +1034,7 @@ KdGetOptions(InputOption **options, char *string)
+
+ if (strchr(string, '=')) {
+ tam_key = (strchr(string, '=') - string);
+- key = strndup(string, tam_key + 1);
++ key = strndup(string, tam_key);
+ if (!key)
+ goto out;
+
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 1094eaf..c3cb0a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
04_int10-fix-pci_device_read_rom-usage.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
+07_Revert-kinput-allocate-enough-space-for-null-charact.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tku4v-0000xp...@vasks.debian.org
