[Frugalware-git] xorgtesting: xf86-video-vmware-11.0.1-2-i686

Elentir elentir at frugalware.org
Fri Jun 4 14:48:22 CEST 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=a13cce91ee503d1a9eafb7364aa8eaa9b98efb0a

commit a13cce91ee503d1a9eafb7364aa8eaa9b98efb0a
Author: Elentir <elentir at frugalware.org>
Date:   Fri Jun 4 14:43:02 2010 +0200

xf86-video-vmware-11.0.1-2-i686

* rebuild with xorg-server 1.8.1
* add vmware-fix-null-ptr-dereference.patch
* (workaround to fix segfault on module loading)

diff --git a/source/x11/xf86-video-vmware/FrugalBuild b/source/x11/xf86-video-vmware/FrugalBuild
index f108547..b616e3f 100644
--- a/source/x11/xf86-video-vmware/FrugalBuild
+++ b/source/x11/xf86-video-vmware/FrugalBuild
@@ -3,14 +3,16 @@

pkgname=xf86-video-vmware
pkgver=11.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org video driver for vmware cards"
url="http://xorg.freedesktop.org"
groups=('x11' 'xorg-core' 'xorg-drivers')
archs=('i686' 'x86_64')
-depends=('xorg-server>=1.7.4')
+depends=('xorg-server>=1.8.1')
makedepends=('randrproto>=1.3.1' 'renderproto' 'xineramaproto')
Finclude xorg
-sha1sums=('cc82cbacaa90c28b42440f6a197f5167595c8417')
+source=($source vmware-fix-null-ptr-dereference.patch)
+sha1sums=('cc82cbacaa90c28b42440f6a197f5167595c8417' \
+          'df2feec6b46ba476811e6705dd231263f2fc0c08')

# optimization OK
diff --git a/source/x11/xf86-video-vmware/vmware-fix-null-ptr-dereference.patch b/source/x11/xf86-video-vmware/vmware-fix-null-ptr-dereference.patch
new file mode 100644
index 0000000..f52cc76
--- /dev/null
+++ b/source/x11/xf86-video-vmware/vmware-fix-null-ptr-dereference.patch
@@ -0,0 +1,21 @@
+diff -Naur xf86-video-vmware-11.0.1/src/vmwaremodule.c xf86-video-vmware-11.0.1/src/vmwaremodule.c
+--- xf86-video-vmware-11.0.1/src/vmwaremodule.c	2010-03-18 16:02:17.000000000 +0200
++++ xf86-video-vmware-11.0.1/src/vmwaremodule.c	2010-06-04 12:57:29.642813157 +0300
+@@ -143,7 +143,7 @@
+     return FALSE;
+ }
+
+-static Bool
++static void
+ vmware_chain_module(pointer opts)
+ {
+     int vmwlegacy_devices;
+@@ -156,6 +156,8 @@
+     int i;
+
+     vmware_devices = xf86MatchDevice(VMWARE_DRIVER_NAME, &gdevs);
++    if(vmware_devices <= 0 || gdevs == NULL)
++	return;
+     vmwgfx_devices = xf86MatchDevice(VMWGFX_DRIVER_NAME, NULL);
+     vmwlegacy_devices = xf86MatchDevice(VMWLEGACY_DRIVER_NAME, NULL);
+


More information about the Frugalware-git mailing list