SPECS: XFree86.spec - up to 4.7.0 (fixes CVE-2006-0747 CVE-2006-18...
qboosh
qboosh at pld-linux.org
Mon Dec 3 19:27:03 CET 2007
Author: qboosh Date: Mon Dec 3 18:27:03 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 4.7.0 (fixes CVE-2006-0747 CVE-2006-1861 CVE-2006-2661 CVE-2006-6101
CVE-2006-6102 CVE-2006-6103 CVE-2007-1003 CVE-2007-1351 CVE-2007-1352
CVE-2007-1667 CVE-2007-2754)
- removed obsolete fix-01,freetype-nointernals patches
- updated PLD,Xwrapper,elfloader-linux-non-exec-stack,xterm-256colors patches
- added -driver-pnozz subpackage (sparc-only)
---- Files affected:
SPECS:
XFree86.spec (1.639 -> 1.640)
---- Diffs:
================================================================
Index: SPECS/XFree86.spec
diff -u SPECS/XFree86.spec:1.639 SPECS/XFree86.spec:1.640
--- SPECS/XFree86.spec:1.639 Sun Dec 2 14:21:02 2007
+++ SPECS/XFree86.spec Mon Dec 3 19:26:58 2007
@@ -2,7 +2,7 @@
#
# TODO:
# - separate XFS to be standalone - is it possible without duplicated files?
-# - unpacked files
+# - unpackaged files
#
# Conditional build:
%bcond_without glide # don't build glide driver
@@ -21,17 +21,17 @@
Summary(uk.UTF-8): Базові шрифти, програми та документація для робочої станції під X
Summary(zh_CN.UTF-8): XFree86 窗口系统服务器和基本程序
Name: XFree86
-Version: 4.6.0
-Release: 0.2
+Version: 4.7.0
+Release: 0.1
Epoch: 1
License: XFree86 1.1
Group: X11
-Source0: ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/%{name}-%{version}-src-1.tgz
-# Source0-md5: 6c05f3486f088d01584f4517540e8d18
-Source1: ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/%{name}-%{version}-src-2.tgz
-# Source1-md5: f084d12aa734c9cd83e8d2a3a4eb3e32
-Source2: ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/%{name}-%{version}-src-3.tgz
-# Source2-md5: 05450997f1876098d791a4cf9db21af8
+Source0: ftp://ftp.xfree86.org/pub/XFree86/4.7.0/source/%{name}-%{version}-src-1.tgz
+# Source0-md5: e452e53240d16091abdc4f4bd2967ebd
+Source1: ftp://ftp.xfree86.org/pub/XFree86/4.7.0/source/%{name}-%{version}-src-2.tgz
+# Source1-md5: db68bab296cff797c1ae399f683905f2
+Source2: ftp://ftp.xfree86.org/pub/XFree86/4.7.0/source/%{name}-%{version}-src-3.tgz
+# Source2-md5: 4787c740ee8ae61a294f488606ced230
Source7: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
# Source7-md5: 0a15b1c374256b5cad7961807baa3896
Source8: xdm.pamd
@@ -96,8 +96,7 @@
Patch22: %{name}-neomagic_swcursor.patch
Patch23: %{name}-mga-busmstr.patch
Patch24: %{name}-agpgart-load.patch
-# ftp://ftp.xfree86.org/pub/XFree86/4.6.0/fixes/fix-01 (CVE-2006-3739, CVE-2006-3740)
-Patch25: %{name}-fix-01.patch
+
Patch26: %{name}-HasFreetype2.patch
Patch28: %{name}-sparc_pci_domains.patch
Patch29: %{name}-XTerm.ad.patch
@@ -121,7 +120,7 @@
# Small (maybe buggy) patch to resolve problems with totem 0.97.0
Patch46: %{name}-lock.patch
Patch47: %{name}-sparc-kbd.patch
-Patch48: %{name}-freetype-nointernals.patch
+
Patch50: %{name}-xterm-256colors.patch
Patch52: %{name}-kernel_headers.patch
Patch53: %{name}-stdint.patch
@@ -377,7 +376,7 @@
Summary(pl.UTF-8): Biblioteki OpenGL dla systemu X11R6
Group: X11/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Provides: OpenGL = 1.4
+Provides: OpenGL = 1.5
Provides: OpenGL-GLU = 1.3
Provides: OpenGL-GLX = 1.4
Obsoletes: Mesa
@@ -413,7 +412,7 @@
Requires: OpenGL-devel-base
Provides: OpenGL-GLU-devel = 1.3
Provides: OpenGL-GLX-devel = 1.4
-Provides: OpenGL-devel = 1.4
+Provides: OpenGL-devel = 1.5
Obsoletes: Mesa-devel
Obsoletes: XFree86-OpenGL-doc
Obsoletes: glxMesa-devel
@@ -780,46 +779,6 @@
%description driver-ati -l pl.UTF-8
Sterownik do kart ATI.
-%package driver-r128
-Summary: ATI Rage 128 video driver
-Summary(pl.UTF-8): Sterownik do kart ATI Rage 128
-Group: X11/Servers
-Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
-# for dri
-Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
-Obsoletes: XFree86-Rage128
-
-%description driver-r128
-ATI Rage 128 video driver.
-
-%description driver-r128 -l pl.UTF-8
-Sterownik do kart ATI Rage 128.
-
-%package driver-radeon
-Summary: ATI Radeon video driver
-Summary(pl.UTF-8): Sterownik do kart ATI Radeon
-Group: X11/Servers
-Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release}
-Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
-# for dri
-Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
-
-%description driver-radeon
-ATI Radeon video driver.
-
-%description driver-radeon -l pl.UTF-8
-Sterownik do kart ATI Radeon.
-
%package driver-chips
Summary: Chips and Technologies video driver
Summary(pl.UTF-8): Sterownik do kart na układach Chips and Technologies
@@ -1051,6 +1010,61 @@
%description driver-nv -l pl.UTF-8
Sterownik do kart na układach firmy nVidia: Riva128, RivaTNT, GeForce.
+%package driver-pnozz
+Summary: Weitek POWER 9100 video driver
+Summary(pl.UTF-8): Sterownik do karty Weitek POWER 9100
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-pnozz
+Weitek POWER 9100 video driver, for SBus adapter which can be found
+in some SPARC laptops.
+
+%description driver-pnozz -l pl.UTF-8
+Sterownik do karty SBuusWeitek POWER 9100, spotykanej w niektórych
+laptopach z procesorem SPARC.
+
+%package driver-r128
+Summary: ATI Rage 128 video driver
+Summary(pl.UTF-8): Sterownik do kart ATI Rage 128
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+Obsoletes: XFree86-Rage128
+
+%description driver-r128
+ATI Rage 128 video driver.
+
+%description driver-r128 -l pl.UTF-8
+Sterownik do kart ATI Rage 128.
+
+%package driver-radeon
+Summary: ATI Radeon video driver
+Summary(pl.UTF-8): Sterownik do kart ATI Radeon
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+
+%description driver-radeon
+ATI Radeon video driver.
+
+%description driver-radeon -l pl.UTF-8
+Sterownik do kart ATI Radeon.
+
%package driver-rendition
Summary: Rendition video driver
Summary(pl.UTF-8): Sterownik do kart Rendition
@@ -1855,7 +1869,6 @@
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p0
%patch26 -p1
%ifarch sparc sparc64
#%patch28 -p1 -- needs update
@@ -1877,7 +1890,6 @@
%patch45 -p1
%patch46 -p0
%patch47 -p1
-%patch48 -p1
%patch50 -p0
%patch52 -p1
%patch53 -p0
@@ -1965,7 +1977,7 @@
cp -f %{SOURCE53} $RPM_BUILD_ROOT/usr/include/GL/glext.h
# don't include shared version due to Motif issues
-rm -f $RPM_BUILD_ROOT%{_libdir}/libGLw.so*
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libGLw.so*
# collect Xserver headers and make symlinks
for f in `cat %{SOURCE44}`; do
@@ -2384,7 +2396,7 @@
%attr(755,root,root) %{_bindir}/glxgears
%attr(755,root,root) %{_libdir}/libGLU.so.*.*
# to be fixed: it contains unresolved symbols and would need -lXm
-#%attr(755,root,root) %{_libdir}/libGLw.so.*.*
+%attr(755,root,root) %{_libdir}/libGLw.so.*.*
%attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
# Linux OpenGL ABI compatibility symlink
%attr(755,root,root) /usr/%{_lib}/libGLU.so.1
@@ -2607,6 +2619,10 @@
%attr(755,root,root) %{_libdir}/modules/drivers/aspeed_drv.o
%endif
+%files driver-ati
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
+
# Devel: sparc sparc64
%ifarch %{ix86} ia64 %{x8664} mips ppc arm
%files driver-chips
@@ -2731,9 +2747,12 @@
%{_mandir}/man4/nv.4*
%endif
-%files driver-ati
+%ifarch sparc sparc64
+%files driver-pnozz
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/pnozz_drv.o
+%{_mandir}/man4/pnozz.4*
+%endif
%files driver-r128
%defattr(644,root,root,755)
@@ -3306,6 +3325,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.640 2007-12-03 18:26:58 qboosh
+- up to 4.7.0 (fixes CVE-2006-0747 CVE-2006-1861 CVE-2006-2661 CVE-2006-6101
+ CVE-2006-6102 CVE-2006-6103 CVE-2007-1003 CVE-2007-1351 CVE-2007-1352
+ CVE-2007-1667 CVE-2007-2754)
+- removed obsolete fix-01,freetype-nointernals patches
+- updated PLD,Xwrapper,elfloader-linux-non-exec-stack,xterm-256colors patches
+- added -driver-pnozz subpackage (sparc-only)
+
Revision 1.639 2007-12-02 13:21:02 qboosh
- oops
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/XFree86.spec?r1=1.639&r2=1.640&f=u
More information about the pld-cvs-commit
mailing list