Cleanup on xorg-x11/debian/patches/000* [#2]
Second "patch audit"-related patch from me, since the first is committed.
This does two things:
* avoids the presence of duplicate copies of the Xpm/lib patches
* cleans up and improves the commentary in the first two patches in the
directory
Index: 0000_backport_from_upstream.diff
===================================================================
--- 0000_backport_from_upstream.diff (revision 150)
+++ 0000_backport_from_upstream.diff (working copy)
@@ -16,16 +16,6 @@
intended to prevent this, but it apparently is not in effect yet
when linux.cf is parsed.)
-2005-02-21 Matthieu Herrb <matthieu.herrb@laas.fr>
-
- * extras/Xpm/lib/create.c:
- * extras/Xpm/lib/scan.c:
- Avoid inifite loops. From Chris Gilbert in bug #1920.
-
- [Fixes CAN-2005-0605: scan.c for LibXPM may allow attackers to
- execute arbitrary code via a negative bitmap_unit value that leads
- to a buffer overflow.]
-
Index: xc/config/cf/linux.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/linux.cf,v
@@ -59,53 +49,3 @@
# define SharedLibXdmGreet NO
# define LinkGLToUsrInclude NO
# define LinkGLToUsrLib NO
-Index: xc/extras/Xpm/lib/create.c
-===================================================================
-RCS file: /cvs/xorg/xc/extras/Xpm/lib/create.c,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- xc/extras/Xpm/lib/create.c 25 Nov 2004 21:19:11 -0000 1.4
-+++ xc/extras/Xpm/lib/create.c 21 Feb 2005 20:52:32 -0000 1.5
-@@ -1215,10 +1215,10 @@
- register char *src;
- register char *dst;
- register unsigned int *iptr;
-- register unsigned int x, y, i;
-+ register unsigned int x, y;
- register char *data;
- Pixel pixel, px;
-- int nbytes, depth, ibu, ibpp;
-+ int nbytes, depth, ibu, ibpp, i;
-
- data = image->data;
- iptr = pixelindex;
-Index: xc/extras/Xpm/lib/scan.c
-===================================================================
-RCS file: /cvs/xorg/xc/extras/Xpm/lib/scan.c,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- xc/extras/Xpm/lib/scan.c 25 Nov 2004 21:19:11 -0000 1.4
-+++ xc/extras/Xpm/lib/scan.c 21 Feb 2005 20:52:32 -0000 1.5
-@@ -621,8 +621,8 @@
- char *dst;
- unsigned int *iptr;
- char *data;
-- unsigned int x, y, i;
-- int bits, depth, ibu, ibpp, offset;
-+ unsigned int x, y;
-+ int bits, depth, ibu, ibpp, offset, i;
- unsigned long lbt;
- Pixel pixel, px;
-
-@@ -633,6 +633,9 @@
- ibpp = image->bits_per_pixel;
- offset = image->xoffset;
-
-+ if (image->bitmap_unit < 0)
-+ return (XpmNoMemory);
-+
- if ((image->bits_per_pixel | image->depth) == 1) {
- ibu = image->bitmap_unit;
- for (y = 0; y < height; y++)
Index: 000_stolen_from_HEAD.diff
===================================================================
--- 000_stolen_from_HEAD.diff (revision 150)
+++ 000_stolen_from_HEAD.diff (working copy)
@@ -1,3 +1,25 @@
+Change descriptions are taken from xc/ChangeLog or the CVS logs,
+with comments in [brackets] added by Debian where necessary for further
+explanation or context.
+
+Diffs from CVS may have hunks that change only RCS/CVS keyword lines
+elided so that they apply cleanly.
+
+2005-02-21 Matthieu Herrb <matthieu.herrb@laas.fr>
+
+ * extras/Xpm/lib/create.c: [@ 1.5]
+ * extras/Xpm/lib/scan.c: [@ 1.5]
+ Avoid inifite loops. From Chris Gilbert in bug #1920.
+
+ [Fixes CAN-2005-0605: scan.c for LibXPM may allow attackers to
+ execute arbitrary code via a negative bitmap_unit value that leads
+ to a buffer overflow.]
+
+xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c @ 1.4
+ Bug #2004: Make DDC delay slightly longer. (Thomas J. Moore)
+
+
+
diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
--- xc.orig/config/cf/linux.cf 2005-03-29 00:50:32.412972192 +1000
+++ xc/config/cf/linux.cf 2005-03-29 00:52:27.671450240 +1000
--
This space intentionally left blank.
Reply to: