X Strike Force X.Org X11 SVN commit: r273 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-06-26 13:06:11 -0500 (Sun, 26 Jun 2005)
New Revision: 273
Modified:
trunk/debian/TODO
trunk/debian/patches/005_rgb.txt_in_etc_X11.diff
trunk/debian/patches/011_SECURITY_makedepend_safer.diff
Log:
- Update TODO for patch audit. This audit courtesy of Nathanael Nerode.
Thank you!
- break out things which need to be backported from upstream
- 011_SECURITY_makedepend_safer.diff present unchanged. Comments updated
by me because Dawes references are unnecessary now.
- 011a_recognize_glibc_2.3.2_locale_names.diff needs serious porting.
- 005_rgb.txt_in_etc_X11.diff comments fixed; references to Dawes are
quite irrelevant now.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-06-26 17:54:43 UTC (rev 272)
+++ trunk/debian/TODO 2005-06-26 18:06:11 UTC (rev 273)
@@ -18,15 +18,6 @@
Probably replaced by 000_stolen_from_linuxwacom_wacom_driver.diff.
Unfortunately that patch does not say which upstream version was taken,
unlike the old patch. That should be fixed.
-000_stolen_from_xorg.diff -- upstream except
- xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c @ 1.4
- -- part of new 000_stolen_from_HEAD
- xc/include/extensions/xf86mscstr.h @ 1.3
- xc/programs/Xserver/Xext/xf86misc.c @ 1.2
- xc/programs/Xserver/Xext/xf86misc.c @ 1.3
- xc/programs/Xserver/hw/xfree86/common/compiler.h @ 1.5
- xc/programs/Xserver/hw/xfree86/loader/elfloader.c @ 1.5
- -- NEED PORTING to new 000_stolen_from_HEAD
002_xdm_fixes.diff -- most changes NEED PORTING
-- except non-user-visible whitespace changes, which can be dropped
* xc/config/cf/gnu.cf:
@@ -49,8 +40,8 @@
-- The xfree86 version looks more up-to-date than the xorg version.
But it's possible that the xorg version is the xfree86 version with parts
deliberately removed. I need to know. :-)
-011_SECURITY_makedepend_safer.diff
011a_recognize_glibc_2.3.2_locale_names.diff
+ -- needs porting. Ubuntu version lost a lot. [neroden]
024_ati_r128_and_radeon_enable_build_without_vgahw.diff
026_xc_programs_manpage_overhaul.diff
027_ati_driver_message_cleanups.diff
@@ -160,8 +151,16 @@
* patches to xc/programs/Xserver/hw/xfree86/drivers/{mga,rendition}/Imakefile
now in patch 908
-914_debian_Xserver_send_bugs_to_us.diff - needs porting?
+914_debian_Xserver_send_bugs_to_us.diff - needs porting
+ + The following need to be backported from upstream (upstream CVS revisions
+ noted):
+ xc/include/extensions/xf86mscstr.h @ 1.3
+ xc/programs/Xserver/Xext/xf86misc.c @ 1.2
+ xc/programs/Xserver/Xext/xf86misc.c @ 1.3
+ xc/programs/Xserver/hw/xfree86/common/compiler.h @ 1.5
+ xc/programs/Xserver/hw/xfree86/loader/elfloader.c @ 1.5
+
+ Grab Thomas Winischhofer's post-6.8.2 fixes to MiscPassMessage() from CVS
(see Debian #285807).
Modified: trunk/debian/patches/005_rgb.txt_in_etc_X11.diff
===================================================================
--- trunk/debian/patches/005_rgb.txt_in_etc_X11.diff 2005-06-26 17:54:43 UTC (rev 272)
+++ trunk/debian/patches/005_rgb.txt_in_etc_X11.diff 2005-06-26 18:06:11 UTC (rev 273)
@@ -1,10 +1,11 @@
-$Id: 005_rgb.txt_in_etc_X11.diff 491 2003-09-10 08:31:58Z branden $
+$Id$
This patch by Branden Robinson.
-Need to generalize this, deal with the db version of rgb, etc, then
-resubmit per David Dawes.
+Need to generalize this, deal with the db version of rgb, etc.
+Not submitted upstream.
+
--- xc/programs/rgb/Imakefile.orig Tue Aug 15 17:38:09 2000
+++ xc/programs/rgb/Imakefile Tue Aug 15 17:43:54 2000
@@ -54,7 +54,7 @@
Modified: trunk/debian/patches/011_SECURITY_makedepend_safer.diff
===================================================================
--- trunk/debian/patches/011_SECURITY_makedepend_safer.diff 2005-06-26 17:54:43 UTC (rev 272)
+++ trunk/debian/patches/011_SECURITY_makedepend_safer.diff 2005-06-26 18:06:11 UTC (rev 273)
@@ -1,14 +1,11 @@
-$Id: 011_SECURITY_makedepend_safer.diff 51 2004-10-18 14:29:56Z fabbione $
+$Id$
This patch by Branden Robinson.
makedepend still isn't really safe. This makes it much safer.
-I think this should go into xf-4_0_2-branch if it passes scrutiny.
+Not submitted upstream.
-[UPDATE] David Dawes is of the opinion that makedepend is safe enough since
-it writes to pwd. That's why this patch isn't upstream.
-
diff -ruN xc-old/config/util/mdepend.cpp xc/config/util/mdepend.cpp
--- xc-old/config/util/mdepend.cpp 2004-04-23 20:42:00.000000000 +0200
+++ xc/config/util/mdepend.cpp 2004-10-18 13:21:29.772427816 +0200
Reply to: