+# SECURITY: CAN-2004-0083 CAN-2004-0084 CAN-2004-0106 CAN-2004-0419
+
# _without_tdfx disables tdfx build
%define _sver %(echo %{version} | tr -d .)
Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
Version: 4.2.1
-Release: 5
+Release: 13
License: MIT
Group: X11/XFree86
Source0: ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/X420src-1.tgz
-Source1: ftp://ftp.pld.org.pl/software/xinit/xdm-xinitrc-0.2.tar.bz2
-Source2: xdm.pamd
-Source3: xserver.pamd
-Source4: xdm.init
-Source5: xfs.init
-Source6: xfs.config
-Source7: XTerm.ad-pl
-Source8: xdm.sysconfig
-Source9: xfs.sysconfig
-Source10: twm.desktop
-Source11: xclipboard.desktop
-Source12: xconsole.desktop
-Source13: xterm.desktop
-Source14: xlogo64.png
-Source15: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
-Source16: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
+# Source0-md5: ad43a8e9e39703322005cd6f7145b77f
+Source1: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
+# Source1-md5: 0a15b1c374256b5cad7961807baa3896
+Source2: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
+# Source2-md5: 8d43c01d364576c195a5294279f92566
+Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
+# Source3-md5: a184106bb83cb27c6963944d9243ac3f
+Source4: xdm.pamd
+Source5: xserver.pamd
+Source6: xdm.init
+Source7: xfs.init
+Source8: xfs.config
+Source9: XTerm.ad-pl
+Source10: xdm.sysconfig
+Source11: xfs.sysconfig
+Source20: twm.desktop
+Source21: xeyes.desktop
+Source22: xedit.desktop
+Source23: xterm.desktop
+Source24: xclipboard.desktop
+Source25: xclock.desktop
+Source26: oclock.desktop
+Source27: xconsole.desktop
+Source30: xlogo64.png
+Source31: xeyes.png
+Source32: xedit.png
+Source33: xterm.png
+Source34: xclipboard.png
+Source35: xclock.png
+Source36: oclock.png
+Source37: xconsole.png
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
Patch37: %{name}-clearrts.patch
Patch38: %{name}-mga020414.patch
Patch39: %{name}-trident-9397.patch
-Patch40: %{name}-i815m.patch
+Patch40: %{name}-4.2.0-i810-driver-update-cvs-20020617.patch.bz2
Patch41: %{name}-nv020414.patch
Patch42: %{name}-fix-07-s3trio64v2gx+netfinity.patch
Patch43: %{name}-prosavage.patch
# Original from: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/fixes/4.2.1-mit-shm-security.patch
Patch58: %{name}-4.2.1-mit-shm-security.patch
Patch59: %{name}-disable_glide.patch
+Patch60: %{name}-xterm-can-2003-0063.patch
+Patch61: %{name}-xlclocale-overflow.patch
+Patch62: %{name}-xterm-DECUDK-security-fix.patch
+Patch63: %{name}-font-overflows.patch
+Patch64: %{name}-bison.patch
+URL: http://www.xfree86.org/
BuildRequires: bison
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.0
Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
%description driver-ati.2
-ATI video driver (ATI.2).
+ATI video driver (ATI.2) from gatos
+(http://gatos.sourceforge.net/).
%description driver-ati.2 -l pl
-Sterownik do kart ATI (ATI.2).
+Sterownik do kart ATI (ATI.2) projektu gatos
+(http://gatos.sourceforge.net/).
%package driver-r128.2
Summary: ATI Rage 128 video driver (ATI.2)
Obsoletes: XFree86-Rage128
%description driver-r128.2
-ATI Rage 128 video driver (ATI.2).
+ATI Rage 128 video driver (ATI.2) from gatos
+(http://gatos.sourceforge.net/).
%description driver-r128.2 -l pl
-Sterownik do kart ATI Rage 128 (ATI.2).
+Sterownik do kart ATI Rage 128 (ATI.2) projektu gatos
+(http://gatos.sourceforge.net/).
%package driver-radeon.2
Summary: ATI Radeon video driver (ATI.2)
Conflicts: XFree86-driver-nvidia
%description driver-radeon.2
-ATI Radeon video driver (ATI.2).
+ATI Radeon video driver (ATI.2) from gatos
+(http://gatos.sourceforge.net/).
%description driver-radeon.2 -l pl
-Sterownik do kart ATI Radeon (ATI.2).
+Sterownik do kart ATI Radeon (ATI.2) projektu gatos
+(http://gatos.sourceforge.net/).
%package driver-chips
Summary: Chips and Technologies video driver
Summary(ru): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X
Summary(uk): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X
Group: X11/XFree86
+PreReq: rc-scripts
+Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{version}
Requires: pam >= 0.71
Requires: %{name}-libs = %{version}
Requires: sessreg = %{version}
Requires: /usr/X11R6/bin/sessreg
Provides: XDM
-PreReq: chkconfig
Obsoletes: XFree86-xdm
Obsoletes: gdm
Obsoletes: kdm
Group: X11/XFree86
Requires: %{name}-libs = %{version}
Requires: XFree86-fonts-base
-PreReq: chkconfig
+PreReq: rc-scripts
Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/useradd
Requires(pre): /usr/sbin/groupadd
+Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Obsoletes: xfsft XFree86-xfs
%patch37 -p1
%patch38 -p1
#%patch39 -p1
-%patch40 -p1
+%patch40 -p0
%patch41 -p1
%patch42 -p1
%patch43 -p1
%{!?debug:%patch57 -p1}
%patch58 -p0
%{?_without_tdfx:%patch59 -p0}
+%patch60 -p1
+%patch61 -p0
+%patch62 -p0
+%patch63 -p1
+%patch64 -p1
rm -f xc/config/cf/host.def
# New ATI drivers
cd xc/programs/Xserver/hw/xfree86/drivers
-bzcat %{SOURCE16} | tar x
+bzcat %{SOURCE2} | tar x
# ati.2 directory
#--- %build --------------------------
$RPM_BUILD_ROOT%{_sbindir} \
$RPM_BUILD_ROOT/usr/{bin,include,lib} \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
- $RPM_BUILD_ROOT{%{_applnkdir}/{Utilities,Terminals},%{_pixmapsdir}/mini} \
- $RPM_BUILD_ROOT%{_wmpropsdir}
+ $RPM_BUILD_ROOT%{_applnkdir}/{Amusements,Editors,Utilities,Terminals} \
+ $RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_wmpropsdir}}
%{__make} -C xc "DESTDIR=$RPM_BUILD_ROOT" \
"DOCDIR=/usr/share/doc/%{name}-%{version}" \
install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps
install xdm-xinitrc-*/{*Console,Xaccess,Xsession,Xsetup*} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xdm
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/xserver
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
-install %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl/XTerm
-
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/xdm
-install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/xfs
-
-install %{SOURCE10} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
-install %{SOURCE11} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE12} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE13} $RPM_BUILD_ROOT%{_applnkdir}/Terminals
-
-install %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
-bzip2 -dc %{SOURCE15} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/xdm
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/xserver
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
+install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
+install %{SOURCE9} $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl/XTerm
+
+install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/xdm
+install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/xfs
+
+install %{SOURCE20} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
+install %{SOURCE21} $RPM_BUILD_ROOT%{_applnkdir}/Amusements
+install %{SOURCE22} $RPM_BUILD_ROOT%{_applnkdir}/Editors
+install %{SOURCE23} $RPM_BUILD_ROOT%{_applnkdir}/Terminals
+install %{SOURCE24} %{SOURCE25} %{SOURCE26} %{SOURCE27} \
+ $RPM_BUILD_ROOT%{_applnkdir}/Utilities
+install %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} \
+ %{SOURCE36} %{SOURCE37} \
+ $RPM_BUILD_ROOT%{_pixmapsdir}
+
+bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
%post -n xdm
/sbin/chkconfig --add xdm
if [ -f /var/lock/subsys/xdm ]; then
- /etc/rc.d/init.d/xdm restart >&2
+ echo "Run \"/etc/rc.d/init.d/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
fi
%{_libdir}/X11/app-defaults/Xditview-chrtr
%{_applnkdir}/Utilities/xclipboard.desktop
+%{_applnkdir}/Utilities/oclock.desktop
+%{_applnkdir}/Utilities/xclock.desktop
+%{_applnkdir}/Editors/xedit.desktop
+%{_applnkdir}/Amusements/xeyes.desktop
%files -n imake
%defattr(644,root,root,755)
projects / packages / XFree86.git / blobdiff