rpms/xorg-x11-server/F-7 cve-2007-3920.patch, NONE, 1.1 xorg-x11-server.spec, 1.235, 1.236

[Kristian Høgsberg (krh)]

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-server/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5799

Modified Files:
	xorg-x11-server.spec 
Added Files:
	cve-2007-3920.patch 
Log Message:
* Mon Jan 21 2008 Kristian Høgsberg <krh at redhat.com> - 1.3.0.0-16
- cve-2007-3920.patch: Don't break grabs when redirecting windows.


cve-2007-3920.patch:

--- NEW FILE cve-2007-3920.patch ---
>From f5be9cb93c3a85572d741d56acb891bb56faf6a0 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at 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



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-7/xorg-x11-server.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- xorg-x11-server.spec	18 Jan 2008 19:50:27 -0000	1.235
+++ xorg-x11-server.spec	21 Jan 2008 20:19:58 -0000	1.236
@@ -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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Mon Jan 21 2008 Kristian Høgsberg <krh at 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 at redhat.com> 1.3.0.0-15
 - cve-2007-6429.patch: Fix patch to not break java apps