- 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 0486beea8894f1fa039428e23da70b644f5ec4d1..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:       4
+Release:       9
 Epoch:         1
 License:       MIT/X Consortium/BSD (see README)
 Group:         X11
@@ -76,7 +75,9 @@ Source50:     xcalc.png
 Source51:      xload.png
 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
@@ -109,12 +110,14 @@ Patch29:  %{name}-radeon-entervt.patch
 Patch30:       %{name}-acpi_event_loop_fix.patch
 # updated from http://dl.sourceforge.net/i810fb/i810fb-xfree86-420.tar.bz2 : i810fb-xfree420.diff
 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
 Patch62:       %{name}-sparc64-v9fix.patch
 Patch63:       %{name}-pci-build.patch
-Patch64:       %{name}-xkbcomp-level.patch
 # 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
@@ -147,7 +150,7 @@ BuildRequires:      libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
 BuildRequires: pam-devel
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: utempter-devel
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
@@ -689,7 +692,6 @@ Provides:   xrender-devel = 0.8.4
 #Provides:     libXdamage-devel
 #Provides:     libXfixes-devel
 #Provides:     libXrender-devel
-Obsoletes:     libXvMCW-devel
 %ifarch sparc sparc64 sparcv9
 Obsoletes:     X11R6.1-devel
 %endif
@@ -700,6 +702,7 @@ Obsoletes:  XFree86-xft-devel
 Obsoletes:     XFree86-xft2-devel
 Obsoletes:     XFree86-xrender-devel
 Obsoletes:     Xft-devel
+Obsoletes:     libXvMCW-devel
 Obsoletes:     render
 Obsoletes:     xcursor-devel
 Obsoletes:     xft-devel
@@ -1452,6 +1455,7 @@ Summary(ru):      
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4)
 Group:         X11/Libraries
 Requires(post,postun): /sbin/ldconfig
+Requires(triggerpostun):       sed >= 4.0
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      glibc >= 6:2.3.5-7.6
 Provides:      XFree86-libs = %{epoch}:%{version}-%{release}
@@ -1464,7 +1468,6 @@ Provides: xcursor = 1.1.2
 Provides:      xft = 2.1.6
 Provides:      xpm
 Provides:      xrender = 0.8.4
-Obsoletes:     libXvMCW
 %ifarch sparc sparc64 sparcv9
 Obsoletes:     X11R6.1-libs
 %endif
@@ -1474,6 +1477,7 @@ Obsoletes:        XFree86-xft
 Obsoletes:     XFree86-xft2
 Obsoletes:     XFree86-xrender
 Obsoletes:     Xft
+Obsoletes:     libXvMCW
 Obsoletes:     xcursor
 Obsoletes:     xft
 Obsoletes:     xorg-x11-libs-data
@@ -1955,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
@@ -1989,14 +1997,13 @@ rm -f xc/config/cf/host.def
 %patch29 -p1
 %patch30 -p0
 %patch31 -p0
-# ankry, FIXME :)
-# %patch50 -p1
+%patch32 -p0
+%patch50 -p1
 %patch60 -p0
 # FIXME
 # %patch61 -p1
 %patch62 -p1
 %patch63 -p1
-%patch64 -p1
 
 # FIXME, is this still needed?
 # %patch69 -p0
@@ -2170,6 +2177,8 @@ echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/X11-%{_lib}.conf
 
 chmod -R u+w $RPM_BUILD_ROOT
 
+cp -a %{SOURCE54} $RPM_BUILD_ROOT%{_sysconfdir}/X11/XvMCConfig
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -2204,18 +2213,16 @@ sed -i -e "/^%(echo %{_libdir} | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf
 %post xdm
 /sbin/chkconfig --add xdm
 if [ -f /var/lock/subsys/xdm ]; then
-       echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
+       echo "Run \"/sbin/service xdm restart\" to restart xdm." >&2
        echo "WARNING: it will terminate all sessions opened from xdm!" >&2
 else
-       echo "Run \"/etc/rc.d/init.d/xdm start\" to start xdm." >&2
+       echo "Run \"/sbin/service xdm start\" to start xdm." >&2
 fi
 
 %preun xdm
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/xdm ]; then
-               /etc/rc.d/init.d/xdm stop >&2
-       fi
        /sbin/chkconfig --del xdm
+       %service xdm stop
 fi
 
 %pre xfs
@@ -2224,17 +2231,11 @@ fi
 
 %post xfs
 /sbin/chkconfig --add xfs
-if [ -f /var/lock/subsys/xfs ]; then
-       /etc/rc.d/init.d/xfs restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/xfs start\" to start font server." >&2
-fi
+%service xfs restart "font server"
 
 %preun xfs
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/xfs ]; then
-               /etc/rc.d/init.d/xfs stop >&2
-       fi
+       %service xfs stop
        /sbin/chkconfig --del xfs
 fi
 
@@ -2251,7 +2252,7 @@ fi
 %groupadd -P %{name}-xfs -g 56 -r -f xfs
 %useradd -P %{name}-xfs -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs
 /sbin/chkconfig --add xfs
-/etc/rc.d/init.d/xfs start >&2
+/sbin/service xfs start >&2
 
 %triggerpostun Xserver -- XFree86-Xserver
 if [ -s /etc/X11/XF86Config.rpmsave ]; then
@@ -2618,6 +2619,7 @@ fi
 %{_libx11dir}/getconfig
 
 %config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/XvMCConfig
 %attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/xserver
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
 %config(missingok) /etc/security/console.apps/xserver