- added official x11r6.9.0-cidfonts.diff (fixes CVE-2006-3739 CVE-2006-3740)

- release 15

Changed files:
    X11.spec -> 1.205

diff --git a/X11.spec b/X11.spec
index 423770fb8adb4d4d04280d69c9eef3c8ef4e6e7d..6eaabb626d0f7004474e9cd4548d718c1d736260 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -27,7 +27,7 @@ Summary(uk):  
 Summary(zh_CN):        XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          X11
 Version:       6.9.0
-Release:       14
+Release:       15
 Epoch:         1
 License:       MIT/X Consortium/BSD (see README)
 Group:         X11
@@ -114,6 +114,7 @@ Patch31:    %{name}-i810fb.patch
 Patch32:       %{name}-compositefastpath.patch
 Patch33:       ftp://ftp.x.org/pub/X11R6.9.0/patches/x11r6.9.0-mitri.diff
 Patch34:       %{name}-intel.patch
+Patch35:       http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-cidfonts.diff
 Patch50:       %{name}-glibc-locale_sync.patch
 Patch60:       %{name}-oldkeyb.patch
 Patch61:       %{name}-sparc64-asmfix.patch
@@ -2047,6 +2048,7 @@ X11-libs.
 cd xc
 %patch0 -p0
 %patch33 -p0
+%patch35 -p0
 cd ..
 %patch34 -p1
 %patch1 -p1