* Thu Apr 10 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-21.20080407

- xserver-1.5.0-selinux-off-by-default.patch: Re-disable selinux by default,
  again, in a way that lets you enable it if you really want to.

xorg-x11-server.spec

@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   20.%{gitdate}%{?dist}
+Release:   21.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -63,6 +63,7 @@ Patch5002: xserver-1.4.99-ssh-isnt-local.patch
 Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch
 Patch5008: xserver-1.5.0-xaa-sucks.patch
 Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
+Patch5010: xserver-1.5.0-selinux-off-by-default.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -513,6 +514,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 10 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-21.20080407
+- xserver-1.5.0-selinux-off-by-default.patch: Re-disable selinux by default,
+  again, in a way that lets you enable it if you really want to.
+
 * Wed Apr 09 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-20.20080407
 - xserver-1.5.0-quirk-acr.patch - add quirk for another monitor.
 

xserver-1.5.0-selinux-off-by-default.patch

@@ -0,0 +1,25 @@
+From 7007f29215604b2d16c4bda25ec2b752ca05d75f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 9 Apr 2008 13:55:25 -0400
+Subject: [PATCH] Default X-SELinux to off.
+
+---
+ os/utils.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/os/utils.c b/os/utils.c
+index d785d46..f58c763 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -233,7 +233,7 @@ _X_EXPORT Bool noXInputExtension = FALSE;
+ _X_EXPORT Bool noXIdleExtension = FALSE;
+ #endif
+ #ifdef XSELINUX
+-_X_EXPORT Bool noSELinuxExtension = FALSE;
++_X_EXPORT Bool noSELinuxExtension = TRUE;
+ _X_EXPORT int selinuxEnforcingState = SELINUX_MODE_DEFAULT;
+ #endif
+ #ifdef XV
+-- 
+1.5.4.5
+