- new; CVE-2006-6101 CVE-2006-6102 CVE-2006-6103

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index 902dd163edae7b0a247746f752c370bfb15b4fbb..5985f2ca7d9b9998d9516c2191a66221d9046825 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:       11.1
+Release:       18
 Epoch:         1
 License:       MIT/X Consortium/BSD (see README)
 Group:         X11
@@ -97,7 +97,7 @@ Patch16:      %{name}-mga-busmstr.patch
 Patch17:       %{name}-agpgart-load.patch
 Patch18:       %{name}-XTerm.ad.patch
 Patch19:       %{name}-llh.patch
-Patch20:       XFree86-xman-manpaths.patch
+Patch20:       %{name}-xman-manpaths.patch
 Patch21:       %{name}-clearrts.patch
 Patch22:       XFree86-Xfont-Type1-large-DoS.patch
 Patch23:       %{name}-GLcore-strip-a-workaround.patch
@@ -114,11 +114,15 @@ 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
+Patch36:       %{name}-i810_945GM.patch
 Patch50:       %{name}-glibc-locale_sync.patch
 Patch60:       %{name}-oldkeyb.patch
 Patch61:       %{name}-sparc64-asmfix.patch
 Patch62:       %{name}-sparc64-v9fix.patch
 Patch63:       %{name}-pci-build.patch
+# from http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-setuid.diff, but existing chunks removed.
+Patch64:       x11r6.9.0-setuid.diff
 # XFree86-tdfx-fix-vtswitch-font-corruption.patch - issue still not fixed,
 # but patch doesn't help either; however, it occurs in text mode only, not
 # with tdfxfb, which is worth using anyway
@@ -157,6 +161,7 @@ BuildRequires:      zlib-devel
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      %{name}-xauth = %{epoch}:%{version}-%{release}
 Requires:      pam >= 0.79.0
+Requires:      filesystem >= 2.0-1
 Provides:      XFree86 = %{epoch}:%{version}-%{release}
 Obsoletes:     XFree86
 Obsoletes:     xpm-progs
@@ -171,12 +176,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
-%define                _soundsdir      /usr/share/sounds
-%define                _wallpapersdir  /usr/share/wallpapers
 %define                _themesdir      /usr/share/themes
 %define                _wmpropsdir     /usr/share/wm-properties
 %define                _xsessdir       /usr/share/xsessions
-%define                _wmstylesdir    /etc/sysconfig/wmstyle
 %define                _libx11dir      %{_prefix}/lib/X11
 %define                _appdefsdir     %{_libx11dir}/app-defaults
 
@@ -840,10 +842,10 @@ Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
 # -libs already required by -OpenGL-libGL
 %endif
 
-%description driver-r128
+%description driver-r128-dri
 DRI modules for ATI Rage 128 video driver.
 
-%description driver-r128 -l pl
+%description driver-r128-dri -l pl
 Modu³y DRI dla sterownika do kart ATI Rage 128.
 
 %package driver-radeon
@@ -939,20 +941,6 @@ Non-accelerated video driver for framebuffer device.
 %description driver-fbdev -l pl
 Nieakcelerowany sterownik korzystaj±cy z framebuffera.
 
-%package driver-ffb
-Summary:       Video driver for DRI sparc framebuffer device
-Summary(pl):   Sterownik do framebuffera DRI na sparc
-Group:         X11/Servers
-Requires:      %{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires:      %{name}-modules = %{epoch}:%{version}-%{release}
-Obsoletes:     XFree86-driver-ffb
-
-%description driver-ffb
-Video driver for DRI sparc framebuffer device.
-
-%description driver-ffb -l pl
-Sterownik do framebuffera DRI na sparc.
-
 %package driver-glide
 Summary:       3Dfx Voodoo1 and Voodoo2 video driver
 Summary(pl):   Sterownik do kart 3Dfx Voodoo1 i Voodoo2
@@ -1902,6 +1890,7 @@ Summary(ru):      
 Summary(uk):   ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
 Group:         X11/Window Managers
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      filesystem >= 2.0-1
 Provides:      twm = %{epoch}:%{version}-%{release}
 Obsoletes:     XFree86-twm
 Obsoletes:     twm
@@ -1966,6 +1955,7 @@ Obsoletes:        XFree86-xdm
 Obsoletes:     entrance
 Obsoletes:     gdm
 Obsoletes:     kdm
+Obsoletes:     slim
 Obsoletes:     wdm
 Obsoletes:     xdm
 
@@ -2046,7 +2036,9 @@ X11-libs.
 %setup -qc -a1 -a2 -a7
 cd xc
 %patch0 -p0
+%patch64 -p1
 %patch33 -p0
+%patch35 -p0
 cd ..
 %patch34 -p1
 %patch1 -p1
@@ -2084,6 +2076,7 @@ rm -f xc/config/cf/host.def
 %patch30 -p0
 %patch31 -p0
 %patch32 -p0
+%patch36 -p0
 %patch50 -p1
 %patch60 -p0
 # FIXME
@@ -2123,7 +2116,7 @@ PWD=`pwd`
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig} \
        $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs \
        $RPM_BUILD_ROOT%{_appdefsdir}/{cs,da,de,es,fr,hu,it,ja,ko,nl,pl,pt,ru,sk,zh_CN.gb2312,zh_TW.big5} \
        $RPM_BUILD_ROOT%{_datadir}/misc \
@@ -2131,8 +2124,8 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfi
        $RPM_BUILD_ROOT/usr/{bin,include,lib} \
        $RPM_BUILD_ROOT/var/{log,lib/xkb} \
        $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir},%{_pixmapsdir}/mini} \
-       $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce,Metal,Industrial}} \
-       $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \
+       $RPM_BUILD_ROOT{%{_wmpropsdir},%{_themesdir}/{ThinIce,Metal,Industrial}} \
+       $RPM_BUILD_ROOT%{_xsessdir} \
        $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 PWD=`pwd`
@@ -2374,7 +2367,6 @@ fi
 %attr(755,root,root) %{_libx11dir}/xinit
 %attr(755,root,root) %{_libx11dir}/xsm
 
-%dir /etc/X11/xinit
 %dir /etc/X11/lbxproxy
 /etc/X11/lbxproxy/*
 %dir /etc/X11/proxymngr
@@ -3145,9 +3137,6 @@ fi
 %files libs
 %defattr(644,root,root,755)
 /etc/ld.so.conf.d/*.conf
-%dir %{_sysconfdir}/xdg
-%dir %{_themesdir}
-%dir %{_themesdir}/Default
 %dir %{_themesdir}/ThinIce
 %dir %{_themesdir}/Metal
 %dir %{_themesdir}/Industrial
@@ -3181,14 +3170,7 @@ fi
 /usr/include/X11
 %dir %{_sbindir}
 %dir %{_datadir}/misc
-%dir %{_iconsdir}
-%dir %{_pixmapsdir}
 %dir %{_pixmapsdir}/mini
-%dir %{_soundsdir}
-%dir %{_wallpapersdir}
-%dir %{_wmpropsdir}
-%dir %{_xsessdir}
-%dir %{_wmstylesdir}
 %attr(755,root,root) %{_libdir}/libFS.so.*.*
 %attr(755,root,root) %{_libdir}/lib*XvMC*.so.*.*
 %attr(755,root,root) %{_libdir}/libICE.so.*.*