- added x11r6.9.0-mitri.diff (official CVE-2006-1525 fix)

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index e5c07dbbd178d781c597f65f959c6c379cd8abbd..6c97e58a455ec7a80beda0d28380b163c7db6ef7 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -7,7 +7,6 @@
 # - -Xprint seem to be Xprt configuration files - if they aren't used by
 #   some (possibly remote) X client, merge them into -Xprt
 # - where to take dtpdmd from?
-# - http://security.gentoo.org/glsa/glsa-200509-07.xml
 #
 # Conditional build:
 %bcond_without glide           # don't build glide driver
@@ -28,7 +27,7 @@ Summary(uk):  
 Summary(zh_CN):        XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          X11
 Version:       6.9.0
-Release:       6
+Release:       9
 Epoch:         1
 License:       MIT/X Consortium/BSD (see README)
 Group:         X11
@@ -78,6 +77,7 @@ Source52:     xmag.png
 Source53:      http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
 Source54:      XvMCConfig
 # NoSource53-md5:      0c40bd4545aa630e139043c2b12f0807
+Patch0:                http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-geteuid.diff
 Patch1:                %{name}-PLD.patch
 Patch2:                %{name}-enableglide.patch
 Patch3:                %{name}-DisableDebug.patch
@@ -112,6 +112,7 @@ Patch30:    %{name}-acpi_event_loop_fix.patch
 Patch31:       %{name}-i810fb.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=4320
 Patch32:       %{name}-compositefastpath.patch
+Patch33:       ftp://ftp.x.org/pub/X11R6.9.0/patches/x11r6.9.0-mitri.diff
 Patch50:       %{name}-glibc-locale_sync.patch
 Patch60:       %{name}-oldkeyb.patch
 Patch61:       %{name}-sparc64-asmfix.patch
@@ -1958,6 +1959,10 @@ X11-libs.
 
 %prep
 %setup -qc -a1 -a2 -a7
+cd xc
+%patch0 -p0
+%patch33 -p0
+cd ..
 %patch1 -p1
 %{?with_glide:%patch2 -p0}
 %patch3 -p0
@@ -1993,8 +1998,7 @@ rm -f xc/config/cf/host.def
 %patch30 -p0
 %patch31 -p0
 %patch32 -p0
-# ankry, FIXME :)
-# %patch50 -p1
+%patch50 -p1
 %patch60 -p0
 # FIXME
 # %patch61 -p1