rpms/linuxwacom/devel linuxwacom-0.8.0.3-nocrash-removal.patch, NONE, 1.1 linuxwacom.spec, 1.66, 1.67

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11183

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-0.8.0.3-nocrash-removal.patch 
Log Message:
* Tue Jan 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-7
- linuxwacom-0.8.0.3-nocrash-removal.patch: don't free the device's private,
  it causes a SIGABRT on device removal and the server does it anyway.



linuxwacom-0.8.0.3-nocrash-removal.patch:

--- NEW FILE linuxwacom-0.8.0.3-nocrash-removal.patch ---
>From 6d833162dd73d97511f7effa03f335b60749929b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 6 Jan 2009 10:41:55 +1000
Subject: [PATCH] xdrv: Don't explicitly free the driver private.

The X server frees the private in the call to xf86DeleteInput, if we free it
first we get a SIGABRT.
---
 src/xdrv/wcmConfig.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/xdrv/wcmConfig.c b/src/xdrv/wcmConfig.c
index 5dc84b7..1610918 100644
--- a/src/xdrv/wcmConfig.c
+++ b/src/xdrv/wcmConfig.c
@@ -376,7 +376,6 @@ static void xf86WcmUninit(InputDriverPtr drv, LocalDevicePtr local, int flags)
 	if (priv->pPressCurve)
 		xfree(priv->pPressCurve);
     
-	xfree(priv);
 	xf86DeleteInput(local, 0);    
 }
 
-- 
1.6.0.6



Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- linuxwacom.spec	22 Dec 2008 06:37:09 -0000	1.66
+++ linuxwacom.spec	6 Jan 2009 01:02:10 -0000	1.67
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.0.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -17,6 +17,7 @@
 Patch4:		linuxwacom-0.7.9.7-fix_build.patch
 Patch5:		linuxwacom-dont_call_devproc_again_in_uninit.patch
 Patch6:		linuxwacom-0.8.0.3-build-fixes.patch
+Patch7:		linuxwacom-0.8.0.3-nocrash-removal.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
@@ -48,6 +49,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1 -b .buildfixes
+%patch7 -p1 -b .nocrash-removal
 
 %build
 
@@ -109,6 +111,10 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Tue Jan 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-7
+- linuxwacom-0.8.0.3-nocrash-removal.patch: don't free the device's private,
+  it causes a SIGABRT on device removal and the server does it anyway.
+
 * Mon Dec 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-6
 - Rebuild for server 1.6
   add build-fixes.patch: protect against XINPUT ABI 3, and other build