rpms/xorg-x11-server/devel xserver-1.5.99.902-selinux-debugging.patch, NONE, 1.1 xorg-x11-server.spec, 1.397, 1.398 xserver-1.5.99.3-broken-mtrr-header.patch, 1.3, NONE

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16008

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.99.902-selinux-debugging.patch 
Removed Files:
	xserver-1.5.99.3-broken-mtrr-header.patch 
Log Message:
* Sun Feb 08 2009 Adam Jackson <ajax at redhat.com> 1.5.99.902-4
- xserver-1.5.99.902-selinux-debugging.patch: Try to figure out why selinux
  class map setup fails.
- Remove mtrr header hack.


xserver-1.5.99.902-selinux-debugging.patch:

--- NEW FILE xserver-1.5.99.902-selinux-debugging.patch ---
>From 6852b40518a70a884ee1369b6cf5fafe0faedfdb Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Sun, 8 Feb 2009 02:08:46 -0500
Subject: [PATCH] Additional debugging for selinux failures

Apropos of bug #482924
---
 Xext/xselinux.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 93ea05b..8e026be 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1977,7 +1977,7 @@ SELinuxExtensionInit(INITARGS)
 	    ErrorF("SELinux: Invalid object class mapping, disabling SELinux support.\n");
 	    return;
 	}
-	FatalError("SELinux: Failed to set up security class mapping\n");
+	FatalError("SELinux: Failed to set up security class mapping, %s\n", strerror(errno));
     }
 
     if (avc_open(&avc_option, 1) < 0)
-- 
1.6.1.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- xorg-x11-server.spec	5 Feb 2009 22:21:20 -0000	1.397
+++ xorg-x11-server.spec	8 Feb 2009 07:09:23 -0000	1.398
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.902
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -73,12 +73,12 @@
 Patch6002: xserver-1.5.1-mode-debug.patch
 
 Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
-# hack around broken mtrr.h.  drop me as soon as possible.
-Patch6007: xserver-1.5.99.3-broken-mtrr-header.patch
 
 Patch6008: xserver-1.5.99.3-fix-core-fonts.patch
 # Pushed to master, should be in 1.6
 Patch6009: xserver-1.5.99.902-xinerama.patch
+# cf. bug 482924
+Patch6010: xserver-1.5.99.902-selinux-debugging.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -496,6 +496,11 @@
 
 
 %changelog
+* Sun Feb 08 2009 Adam Jackson <ajax at redhat.com> 1.5.99.902-4
+- xserver-1.5.99.902-selinux-debugging.patch: Try to figure out why selinux
+  class map setup fails.
+- Remove mtrr header hack.
+
 * Fri Feb 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.902-3
 - Update 10-x11-keymap.fdi: only call fedora-setup-keyboard for devices with
   input.capabilities = keyboard (#484217)


--- xserver-1.5.99.3-broken-mtrr-header.patch DELETED ---