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

* Wed Aug 13 2008 Adam Jackson <ajax@redhat.com> 1.4.99.906-6

Browse Source 
- xserver-1.5.0-enable-selinux.patch: Enable selinux again.
This commit is contained in:
Adam Jackson 2008-08-13 17:44:01 +00:00
parent 3262bac3e6
commit b7326ab083
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xorg-x11-server.spec
View File

@ -19,7 +19,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.4.99.906 Version: 1.4.99.906
Release: 5%{?dist} Release: 6%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -66,6 +66,8 @@ Patch5011: xserver-1.4.99-endian.patch
Patch5013: xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch Patch5013: xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch
Patch5014: xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.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 moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri %define drimoduledir %{_libdir}/dri
%define sdkdir %{_includedir}/xorg %define sdkdir %{_includedir}/xorg
@ -276,7 +278,8 @@ git-commit -a -q -m "%{version} baseline."
%endif %endif
# Apply all the patches. # Apply all the patches.
git-am -p1 %{patches} #git-am -p1 %{patches}
git-am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
%build %build
@ -489,6 +492,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Aug 13 2008 Adam Jackson <ajax@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@redhat.com> 1.4.99.906-5 * Tue Aug 05 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.4.99.906-5
- xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch: force xkb requests - xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch: force xkb requests
to apply to all extension devices. to apply to all extension devices.

25
xserver-1.5.0-enable-selinux.patch Normal file
View File

@ -0,0 +1,25 @@
From 79fefef30f94f979a8f69ce9253d08be4b28a543 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@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