[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-vmmouse: Changes to 'ubuntu'



 debian/changelog                        |    7 +++++
 debian/patches/series                   |    1 
 debian/patches/use-sigsafe-logging.diff |   41 ++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)

New commits:
commit 8b353cfc217cd8f1f84a65c06eb9f99734c65d72
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date:   Mon Sep 24 11:48:17 2012 +0300

    Added use-sigsafe-logging.diff. Fix crashes by using signal safe logging (LP: #1053702)

diff --git a/debian/changelog b/debian/changelog
index 60467f9..55f0c9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-vmmouse (1:12.9.0-0ubuntu3) quantal; urgency=low
+
+  * Added use-sigsafe-logging.diff. Fix crashes by using signal safe
+    logging (LP: #1053702)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 24 Sep 2012 11:46:55 +0300
+
 xserver-xorg-input-vmmouse (1:12.9.0-0ubuntu2) quantal-proposed; urgency=low
 
   * Rebuild for xserver 1.13.
diff --git a/debian/patches/series b/debian/patches/series
index 1a0c312..e04350a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-enable-detect-in-kvm.diff
+use-sigsafe-logging.diff
diff --git a/debian/patches/use-sigsafe-logging.diff b/debian/patches/use-sigsafe-logging.diff
new file mode 100644
index 0000000..16acb7b
--- /dev/null
+++ b/debian/patches/use-sigsafe-logging.diff
@@ -0,0 +1,41 @@
+From: Peter Hutterer <peter.hutterer@who-t.net>
+To: xorg-devel@lists.freedesktop.org
+Subject: [PATCH vmmouse 1/2] Use sigsafe logging in ReadInput path
+Date: Tue, 21 Aug 2012 14:03:54 +1000
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/vmmouse.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/src/vmmouse.c
++++ b/src/vmmouse.c
+@@ -73,6 +73,10 @@
+ #include "exevents.h"
+ #endif
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 18
++#define LogMessageVerbSigSafe xf86MsgVerb
++#endif
++
+ #include "xisb.h"
+ #include "mipointer.h"
+ 
+@@ -1063,7 +1067,7 @@
+        */
+       VMMouseClient_RequestAbsolute();
+       mPriv->absoluteRequested = TRUE;
+-      xf86Msg(X_INFO, "VMWARE(0): vmmouse enable absolute mode\n");
++      LogMessageVerbSigSafe(X_INFO, -1, "VMWARE(0): vmmouse enable absolute mode\n");
+    }
+ 
+    /*
+@@ -1130,7 +1134,7 @@
+          VMMouseClient_Disable();
+          VMMouseClient_Enable();
+          VMMouseClient_RequestAbsolute();
+-         xf86Msg(X_INFO, "VMWARE(0): re-requesting absolute mode after reset\n");
++         LogMessageVerbSigSafe(X_INFO, -1, "VMWARE(0): re-requesting absolute mode after reset\n");
+          break;
+       }
+ 


Reply to: