X Strike Force X.Org X11 SVN commit: r127 - trunk/debian/patches
Author: dnusinow
Date: 2005-05-19 22:15:18 -0500 (Thu, 19 May 2005)
New Revision: 127
Removed:
trunk/debian/patches/0000_backport_from_upstream.diff
Log:
Actually svn deleting 0000_backport_from_upstream.diff, which is obsolete.
Deleted: trunk/debian/patches/0000_backport_from_upstream.diff
===================================================================
--- trunk/debian/patches/0000_backport_from_upstream.diff 2005-05-20 03:14:23 UTC (rev 126)
+++ trunk/debian/patches/0000_backport_from_upstream.diff 2005-05-20 03:15:18 UTC (rev 127)
@@ -1,111 +0,0 @@
-$Id$
-
-Change descriptions are taken from xc/ChangeLog, 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-03-06 Branden Robinson <branden@debian.org>
-
- * xc/config/cf/linux.cf
- Shut up (tons of) Imake warnings on Debian systems by testing for
- variable being defined before testing its value. (Presumably the
- fallback definition of NothingOutsideProjectRoot in Imake.tmpl was
- 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
-retrieving revision 1.23
-retrieving revision 1.24
-diff -u -r1.23 -r1.24
---- xc/config/cf/linux.cf 1 Feb 2005 02:02:31 -0000 1.23
-+++ xc/config/cf/linux.cf 6 Mar 2005 01:05:00 -0000 1.24
-@@ -95,13 +95,13 @@
- XCOMM binutils: (LinuxBinUtilsMajorVersion)
-
- #if LinuxDistribution == LinuxDebian
--# if !NothingOutsideProjectRoot
-+# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
- # define SystemManDirectory /usr/share/man
- # endif
- # define HasPam YES
- /* un-comment this when it is un-broken */
- /* # define JoystickSupport YES */
--# if !NothingOutsideProjectRoot
-+# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
- # define XAppLoadDir EtcX11Directory/app-defaults
- # define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
- /* the relative symlink created by this rule causes problems for us */
-@@ -112,7 +112,7 @@
- # define InstallAppDefaultsLong(file,class) @@\
- InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
- # endif /* InstallAppDefFiles */
--# endif /* !NothingOutsideProjectRoot */
-+# endif /* !defined(NotingOutsideProjectRoot) || !NothingOutsideProjectRoot */
- # 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++)
Reply to: