From 503fd1019650fb53e21c704238c9e1317a82b6d8 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@fedoraproject.org>
Date: Jan 21 2008 20:19:58 +0000
Subject: * Mon Jan 21 2008 Kristian Høgsberg <krh@redhat.com> - 1.3.0.0-16

- cve-2007-3920.patch: Don't break grabs when redirecting windows.

---

diff --git a/cve-2007-3920.patch b/cve-2007-3920.patch
new file mode 100644
index 0000000..b48027b
--- /dev/null
+++ b/cve-2007-3920.patch
@@ -0,0 +1,26 @@
+From f5be9cb93c3a85572d741d56acb891bb56faf6a0 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
+Date: Wed, 16 Jan 2008 20:24:11 -0500
+Subject: [PATCH] Don't break grab and focus state for a window when redirecting it.
+
+---
+ dix/window.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/dix/window.c b/dix/window.c
+index f65fb84..ccfec2b 100644
+--- a/dix/window.c
++++ b/dix/window.c
+@@ -3022,7 +3022,8 @@ UnrealizeTree(
+ 	    } 
+ #endif
+ 	    (* Unrealize)(pChild);
+-	    DeleteWindowFromAnyEvents(pChild, FALSE);
++	    if (MapUnmapEventsEnabled(pWin))
++		DeleteWindowFromAnyEvents(pChild, FALSE);
+ 	    if (pChild->viewable)
+ 	    {
+ #ifdef DO_SAVE_UNDERS
+-- 
+1.5.3.7
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 06c8762..d68e014 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   15%{?dist}
+Release:   16%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -82,6 +82,7 @@ Patch3002:  cve-2007-6427.patch
 Patch3003:  cve-2007-6428.patch
 Patch3004:  cve-2007-6429.patch
 Patch3005:  cve-2008-0006-server-fixup.patch
+Patch3006:  cve-2007-3920.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -343,6 +344,7 @@ Xserver source code needed to build VNC server (Xvnc)
 %patch3003 -p1 -b .cve-2007-6428
 %patch3004 -p1 -b .cve-2007-6429
 %patch3005 -p1 -b .cve-2008-0006
+%patch3006 -p1 -b .cve-2007-3920
 
 %build
 
@@ -611,6 +613,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 21 2008 Kristian Høgsberg <krh@redhat.com> - 1.3.0.0-16
+- cve-2007-3920.patch: Don't break grabs when redirecting windows.
+
 * Fri Jan 18 2008 Dave Airlie <airlied@redhat.com> 1.3.0.0-15
 - cve-2007-6429.patch: Fix patch to not break java apps