From 853acffdfdaafc5b2982cbac2a0e5adda28e6d6e Mon Sep 17 00:00:00 2001 From: root Date: Thu, 11 Aug 2011 23:14:30 +0000 Subject: Thu Aug 11 23:14:30 UTC 2011 --- staging/xf86-input-acecad/PKGBUILD | 35 ++++++++++++++++++++++ .../assign-local-private-after-allocating.patch | 24 +++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 staging/xf86-input-acecad/PKGBUILD create mode 100644 staging/xf86-input-acecad/assign-local-private-after-allocating.patch (limited to 'staging/xf86-input-acecad') diff --git a/staging/xf86-input-acecad/PKGBUILD b/staging/xf86-input-acecad/PKGBUILD new file mode 100644 index 000000000..4e0bc3f24 --- /dev/null +++ b/staging/xf86-input-acecad/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 135117 2011-08-10 11:45:03Z jgc $ +# Maintainer: Jan de Groot + +pkgname=xf86-input-acecad +pkgver=1.5.0 +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>=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 + 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 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch b/staging/xf86-input-acecad/assign-local-private-after-allocating.patch new file mode 100644 index 000000000..e3e635a6f --- /dev/null +++ b/staging/xf86-input-acecad/assign-local-private-after-allocating.patch @@ -0,0 +1,24 @@ +From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +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 +--- +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 -- cgit v1.2.3-54-g00ecf