- exec-shield fixes

Changed files:
    XFree86.spec -> 1.575

diff --git a/XFree86.spec b/XFree86.spec
index b0347226f967bd652e33aaa124a47a714fd6d585..0ed98ea73e846d34f89789281ceeedbd6a0ad207 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -19,7 +19,7 @@ Summary(uk):  
 Summary(zh_CN):        XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          XFree86
 Version:       4.4.0
-Release:       2
+Release:       3.1
 Epoch:         1
 License:       XFree86 1.1
 Group:         X11/XFree86
@@ -121,6 +121,9 @@ Patch50:    %{name}-xterm-256colors.patch
 Patch52:       %{name}-kernel_headers.patch
 Patch53:       %{name}-stdint.patch
 Patch54:       %{name}-lnx_kbd.patch
+Patch55:       %{name}-elfloader-linux-non-exec-stack.patch
+Patch56:       %{name}-exec-shield-GNU-stack.patch
+Patch57:       %{name}-libGL-exec-shield-fixes-v2.patch
 URL:           http://www.xfree86.org/
 BuildRequires: /usr/bin/perl
 %ifarch %{ix86} alpha amd64
@@ -1734,8 +1737,6 @@ System. 
 ÐÁËÅÔ(É) ÛÒÉÆÔ¦× XFree86, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator
 ÔÁ XFree86-libs.
 
-#--- %prep ---------------------------
-
 %prep
 %setup -qc -a1 -a2 -a7
 %patch0 -p0
@@ -1789,6 +1790,9 @@ System. 
 %patch52 -p1
 %patch53 -p0
 %patch54 -p0
+%patch55 -p0
+%patch56 -p0
+%patch57 -p0
 
 rm -f xc/config/cf/host.def