Author: whot
Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18781
Modified Files:
xorg-x11-drv-vmmouse.spec
Added Files:
vmmouse-12.6.9-iopl-revert.patch
Log Message:
* Thu Jul 01 2010 Peter Hutterer peter.hutterer@redhat.com 12.6.9-4
- vmmouse-12.6.9-iopl-revert.patch: revert removal of iopl(2) call (#640660)
vmmouse-12.6.9-iopl-revert.patch:
vmmouse_detect.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE vmmouse-12.6.9-iopl-revert.patch ---
From e9ef63e19d8f9993950f1f06299aee1eb18ded9f Mon Sep 17 00:00:00 2001
From: Peter Hutterer peter.hutterer@who-t.net
Date: Thu, 1 Jul 2010 08:45:53 +1000
Subject: [PATCH] Revert "Remove call to iopl(). It's not portable and isn't necessary."
https://bugzilla.redhat.com/show_bug.cgi?id=604660
For details, see:
https://bugzilla.novell.com/show_bug.cgi?id=604966
This reverts commit bcdec3d0cd4434770cd841c33c030e0d7203881f.
---
tools/vmmouse_detect.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/tools/vmmouse_detect.c b/tools/vmmouse_detect.c
index ac238b4..cfb92e1 100644
--- a/tools/vmmouse_detect.c
+++ b/tools/vmmouse_detect.c
@@ -53,6 +53,11 @@ main(void)
signal(SIGSEGV, segvCB);
#if defined __i386__ || defined __x86_64__
+ /*
+ * To access i/o ports above 0x3ff, we need to be in iopl(3).
+ */
+
+ iopl(3);
if (VMMouseClient_Enable()) {
VMMouseClient_Disable();
return 0;
--
1.7.1
Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/F-13/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xorg-x11-drv-vmmouse.spec 20 Jun 2010 23:42:23 -0000 1.37
+++ xorg-x11-drv-vmmouse.spec 30 Jun 2010 23:10:15 -0000 1.38
@@ -5,7 +5,7 @@
Summary: Xorg X11 vmmouse input driver
Name: xorg-x11-drv-vmmouse
Version: 12.6.9
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{versio
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Patch1: vmmouse-12.6.9-single-udev-match.patch
+# 604660 - vmmouse_detect unexpected exit with status 0x000b
+Patch2: vmmouse-12.6.9-iopl-revert.patch
# Yes, this is not the same as vmware. Yes, this is intentional.
ExclusiveArch: %{ix86} x86_64
@@ -29,6 +31,7 @@ X.Org X11 vmmouse input driver.
%prep
%setup -q -n %{tarball}-%{version}
%patch1 -p1
+%patch2 -p1
%build
%configure --disable-static --with-xorg-conf-dir='%{_datadir}/X11/xorg.conf.d'
@@ -59,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
/lib/udev/rules.d/*.rules
%changelog
+* Thu Jul 01 2010 Peter Hutterer
peter.hutterer@redhat.com 12.6.9-4
+- vmmouse-12.6.9-iopl-revert.patch: revert removal of iopl(2) call (#640660)
+
* Fri Jun 18 2010 Peter Hutterer
peter.hutterer@redhat.com 12.6.9-3
- vmmouse-12.6.9-single-udev-match.patch: only match event devices once.
