rpms/xorg-x11-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Sun Feb 08 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-4

Browse Source 
- xserver-1.5.99.902-selinux-debugging.patch: Try to figure out why selinux
  class map setup fails.
- Remove mtrr header hack.
This commit is contained in:
Adam Jackson 2009-02-08 07:09:23 +00:00
parent a5cb92a1c1
commit f4905530a0
3 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xorg-x11-server.spec
View File

@ -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 @@ Patch5011: xserver-1.4.99-endian.patch
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 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Feb 08 2009 Adam Jackson <ajax@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@redhat.com> 1.5.99.902-3
- Update 10-x11-keymap.fdi: only call fedora-setup-keyboard for devices with
input.capabilities = keyboard (#484217)

39
xserver-1.5.99.3-broken-mtrr-header.patch
View File

@ -1,39 +0,0 @@
From 32a51abce25df28d579eb73b42f06cc63741f17b Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 8 Jan 2009 10:03:52 -0500
Subject: [PATCH] HACK: Work around broken mtrr.h
---
hw/kdrive/src/kmap.c | 1 +
hw/xfree86/os-support/linux/lnx_video.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c
index 60e8ae1..537d740 100644
--- a/hw/kdrive/src/kmap.c
+++ b/hw/kdrive/src/kmap.c
@@ -27,6 +27,8 @@
#include <unistd.h>
#include <sys/mman.h>
#ifdef HAVE_ASM_MTRR_H
+typedef unsigned char __u8;
+typedef unsigned int __u32;
#include <asm/mtrr.h>
#endif
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 688106a..535c3a0 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -44,6 +45,8 @@
#endif
#ifdef HAS_MTRR_SUPPORT
+typedef unsigned char __u8;
+typedef unsigned int __u32;
#include <asm/mtrr.h>
#endif
--
1.6.0.3

26
xserver-1.5.99.902-selinux-debugging.patch Normal file
View File

@ -0,0 +1,26 @@
From 6852b40518a70a884ee1369b6cf5fafe0faedfdb Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@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