rpms/xorg-x11-server/devel xserver-1.5.0-enable-selinux.patch, NONE, 1.1 xorg-x11-server.spec, 1.339, 1.340

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10727

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-enable-selinux.patch 
Log Message:
* Wed Aug 13 2008 Adam Jackson <ajax at redhat.com> 1.4.99.906-6
- xserver-1.5.0-enable-selinux.patch: Enable selinux again.


xserver-1.5.0-enable-selinux.patch:

--- NEW FILE xserver-1.5.0-enable-selinux.patch ---
>From 79fefef30f94f979a8f69ce9253d08be4b28a543 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 13 Aug 2008 13:42:31 -0400
Subject: [PATCH] Enable selinux extension again.

---
 os/utils.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/os/utils.c b/os/utils.c
index f58c763..d785d46 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 = TRUE;
+_X_EXPORT Bool noSELinuxExtension = FALSE;
 _X_EXPORT int selinuxEnforcingState = SELINUX_MODE_DEFAULT;
 #endif
 #ifdef XV
-- 
1.5.5.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- xorg-x11-server.spec	5 Aug 2008 05:10:31 -0000	1.339
+++ xorg-x11-server.spec	13 Aug 2008 17:44:01 -0000	1.340
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.906
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -66,6 +66,8 @@
 Patch5013: xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch
 Patch5014: xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch
 
+Patch5015: xserver-1.5.0-enable-selinux.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -276,7 +278,8 @@
 %endif
 
 # Apply all the patches.
-git-am -p1 %{patches}
+#git-am -p1 %{patches}
+git-am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
 
 %build
 
@@ -489,6 +492,9 @@
 
 
 %changelog
+* Wed Aug 13 2008 Adam Jackson <ajax at redhat.com> 1.4.99.906-6
+- xserver-1.5.0-enable-selinux.patch: Enable selinux again.
+
 * Tue Aug 05 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.4.99.906-5
 - xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch: force xkb requests
   to apply to all extension devices.