X Strike Force XFree86 SVN commit: r1874 - trunk/debian
Author: branden
Date: 2004-09-27 16:28:06 -0500 (Mon, 27 Sep 2004)
New Revision: 1874
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
Log:
(cosmetic) Resync changelog and CHANGESETS files with each other and with
commit logs.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-09-27 20:53:22 UTC (rev 1873)
+++ trunk/debian/CHANGESETS 2004-09-27 21:28:06 UTC (rev 1874)
@@ -9,7 +9,7 @@
files anywhere.)
Miscellaneous cosmetic fixes.
- 1811, 1812, 1815, 1816, 1828, 1829, 1830, 1842, 1846, 1869, 1873
+ 1811, 1812, 1815, 1816, 1828, 1829, 1830, 1842, 1846, 1869, 1873, 1874
Update Danish debconf template translations (thanks, Claus Hindsgaul).
1806
@@ -66,15 +66,38 @@
cosmetic issues in recent translation updates.
1844
-Security update. Resolves the following issues:
-CAN-2004-0687: stack overflows in libXpm
-CAN-2004-0688: integer overflows in libXpm
+Security update (patch #087). Resolves the following issues:
++ CAN-2004-0687: stack overflows in libXpm
++ CAN-2004-0688: integer overflows in libXpm
+(Closes: #272493)
1851
-Backport nv driver from X.org (merged from people/fabbione/nv-driver-backport)
+Update nv driver and some support code, and grab an XVideo bugfix from
+X.Org CVS as of 2004-09-15:
++ Update 000_post430.diff:
+ - Drop nv_setup.c bits.
++ Update 000_stolen_from_HEAD.diff:
+ - Include xf86xv.c Xv fix for little-endian machines.
++ Update 000_stolen_from_HEAD_nv_driver.diff:
+ - Full nv driver from X.org.
+ - Removed 2 references to XORG_VERSION_CURRENT since it is not defined.
++ Update 000_stolen_from_freedesktop.org.diff:
+ - Add xaa bits required to compile the new nv driver.
+ - Add fbdevhw bits required to compile the new nv driver.
++ Update 030_Xserver_and_driver_region_primitive_fixups.diff:
+ - REGION_EQUAL backport from X.org.
+ - Fix call to REGION_EQUAL in Xv autopaint initialization error
+ introduced in 4.3.0.dfsg.1-7.
++ Drop 098_nv_xvideo_fullscreen_fix.diff:
+ - Now included upstream.
++ Rediff 911_debian_XF86Config_to_XF86Config-4.diff.
++ Update MANIFEST and xserver-xfree86.install files to reflect the new
+ riva128.o submodule.
+(Closes: #269025, #268759, #271235, #270228, #271071, #270714)
1867, 1871, 1872
Update Czech debconf template translations (thanks, Miroslav Kure).
+(Closes: #273516)
1868
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-09-27 20:53:22 UTC (rev 1873)
+++ trunk/debian/changelog 2004-09-27 21:28:06 UTC (rev 1874)
@@ -46,19 +46,17 @@
* Create debian/tmp/usr/X11R6/lib/X11/doc when NOT_BUILDING_XFREE86_X_SERVER
is defined. Fixes FTBFS on s390.
- * Security update. Resolves the following issues:
+ * Security update (patch #087). Resolves the following issues:
+ CAN-2004-0687: stack overflows in libXpm
+ CAN-2004-0688: integer overflows in libXpm
- + Add debian/patches/087_SECURITY_libXpm_vulnerabilities.diff
(Closes: #272493)
- * Update nv driver from X.org:
- + Update MANIFEST and xserver-xfree86.install files to reflect the new
- riva128.o submodule.
+ * Update nv driver and some support code, and grab an XVideo bugfix from
+ X.Org CVS as of 2004-09-15:
+ Update 000_post430.diff:
- Drop nv_setup.c bits.
+ Update 000_stolen_from_HEAD.diff:
- - Include xf86xv.c Xv fix for little endian machines.
+ - Include xf86xv.c Xv fix for little-endian machines.
+ Update 000_stolen_from_HEAD_nv_driver.diff:
- Full nv driver from X.org.
- Removed 2 references to XORG_VERSION_CURRENT since it is not defined.
@@ -72,6 +70,8 @@
+ Drop 098_nv_xvideo_fullscreen_fix.diff:
- Now included upstream.
+ Rediff 911_debian_XF86Config_to_XF86Config-4.diff.
+ + Update MANIFEST and xserver-xfree86.install files to reflect the new
+ riva128.o submodule.
(Closes: #269025, #268759, #271235, #270228, #271071, #270714)
* Update Czech debconf template translations (thanks, Miroslav Kure).
Reply to: