[arch-commits] Commit in xf86-input-acecad/trunk (2 files)

[Jan de Groot]

    Date: Wednesday, August 10, 2011 @ 07:45:03
  Author: jgc
Revision: 135117

upgpkg: xf86-input-acecad 1.5.0-2
Add null pointer dereference fix from git, rebuild for xserver 1.11

Added:
  xf86-input-acecad/trunk/assign-local-private-after-allocating.patch
Modified:
  xf86-input-acecad/trunk/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |   13 ++++++++-----
 assign-local-private-after-allocating.patch |   24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-10 10:57:13 UTC (rev 135116)
+++ PKGBUILD	2011-08-10 11:45:03 UTC (rev 135117)
@@ -3,21 +3,24 @@
 
 pkgname=xf86-input-acecad
 pkgver=1.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org acecad tablet input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('sysfsutils')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server<1.10.0')
+makedepends=('xorg-server-devel>=1.10.99.902')
+conflicts=('xorg-server<1.10.99.902')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        assign-local-private-after-allocating.patch)
+sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1'
+          '9301020b0ef3c6f2081e957481a88d2e187a7973')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch"
   ./configure --prefix=/usr
   make
 }

Added: assign-local-private-after-allocating.patch
===================================================================
--- assign-local-private-after-allocating.patch	                        (rev 0)
+++ assign-local-private-after-allocating.patch	2011-08-10 11:45:03 UTC (rev 135117)
@@ -0,0 +1,24 @@
+From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Mon, 27 Jun 2011 03:13:54 +0000
+Subject: Assign local->private after allocating.
+
+It is detrimental to the user experience when the driver tries to derefernce
+null pointers.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+diff --git a/src/acecad.c b/src/acecad.c
+index ad6d793..604fe91 100644
+--- a/src/acecad.c
++++ b/src/acecad.c
+@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
+         return BadAlloc;
+ 
+     memset(priv, 0, sizeof(AceCadPrivateRec));
++    local->private = priv;
+ 
+     local->device_control = DeviceControl;
+ 
+--
+cgit v0.8.3-6-g21f6