--- a/open-src/driver/xf86-input-mouse/6892799.patch	Thu Jun 30 16:38:19 2011 -0700
+++ b/open-src/driver/xf86-input-mouse/6892799.patch	Tue Jul 05 11:16:56 2011 -0700
@@ -20,10 +20,10 @@
 # DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/mouse.c b/src/mouse.c
-index c3498ea..ba9bfef 100644
+index d981f6f..298f042 100644
 --- a/src/mouse.c
 +++ b/src/mouse.c
-@@ -1612,13 +1612,14 @@ MouseProc(DeviceIntPtr device, int what)
+@@ -1614,13 +1614,14 @@ MouseProc(DeviceIntPtr device, int what)
  	ErrorF("assigning %p atom=%d name=%s\n", device, pInfo->atom,
  		pInfo->name);
  #endif
@@ -42,7 +42,7 @@
  	    if (pMse->xisbscale)
  		pMse->buffer = XisbNew(pInfo->fd, pMse->xisbscale * 4);
  	    else
-@@ -1674,8 +1675,6 @@ MouseProc(DeviceIntPtr device, int what)
+@@ -1676,8 +1677,6 @@ MouseProc(DeviceIntPtr device, int what)
  		XisbFree(pMse->buffer);
  		pMse->buffer = NULL;
  	    }
@@ -51,7 +51,7 @@
  	    if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft)
  	    {
  		RemoveBlockAndWakeupHandlers (MouseBlockHandler,
-@@ -1686,6 +1685,10 @@ MouseProc(DeviceIntPtr device, int what)
+@@ -1688,6 +1687,10 @@ MouseProc(DeviceIntPtr device, int what)
  	device->public.on = FALSE;
  	break;
      case DEVICE_CLOSE:

--- a/open-src/driver/xf86-input-mouse/Fix-OSMouse.patch	Thu Jun 30 16:38:19 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-From d6e9623875de5714e85f7da5782ea665116f86dc Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <[email protected]>
-Date: Wed, 30 Mar 2011 01:00:47 +0200
-Subject: [PATCH:xf86-input-mouse] Fix OSMouse OS-defined protocol support
-
-Fix regression introduced by 0a088df6: in the case of an OS-specific
-protocol, the protocol is PROT_UNKNOWN, but should not be rejected: the core
-mouse drive just needs to let the OS driver handle it.
-
-Signed-off-by: Samuel Thibault <[email protected]>
----
- src/mouse.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/mouse.c b/src/mouse.c
-index edb998f..c3498ea 100644
---- a/src/mouse.c
-+++ b/src/mouse.c
-@@ -953,6 +953,8 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-         MouseFindDevice(pInfo, protocol);
- 
-     xf86Msg(protocolFrom, "%s: Protocol: \"%s\"\n", pInfo->name, protocol);
-+    if (protocolID == PROT_UNKNOWN)
-+        goto out;
-     if (!(pProto = GetProtocol(protocolID)))
-     {
- 	rc = BadValue;
--- 
-1.7.3.2
-

--- a/open-src/driver/xf86-input-mouse/Makefile	Thu Jun 30 16:38:19 2011 -0700
+++ b/open-src/driver/xf86-input-mouse/Makefile	Tue Jul 05 11:16:56 2011 -0700
@@ -29,15 +29,14 @@
 MODULE_NAME=xf86-input-mouse
 
 # Version number (used in path names)
-MODULE_VERSION=1.7.0
+MODULE_VERSION=1.7.1
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 7f31472689c15b6de62eff04d0fb57d7
-TARBALL_SHA1 = 8b99054e5e4feafd7e08c87b936e64386b74ae8f
+TARBALL_MD5  = 13276d780b8ef3a82088f009185bf42b
+TARBALL_SHA1 = 11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
-	Fix-OSMouse.patch,-p1 \
 	6892799.patch,-p1
 
 # Man pages to apply Sun footer to & attributes to list