Author: dnusinow
Date: 2005-06-09 19:01:12 -0500 (Thu, 09 Jun 2005)
New Revision: 174
Modified:
trunk/debian/changelog
trunk/debian/patches/0000_backport_from_upstream.diff
trunk/debian/patches/002_xdm_fixes.diff
trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
trunk/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
Log:
Fixed patches to apply properly without fuzz
- Edited 0000_backport_from_upstream.diff
- Removed redundant patches that are also in 000_stolen_from_HEAD.diff
- Edited 002_xdm_fixes.diff, 003_linux.cf_and_xfree86.cf.diff, and
068_fix_InstallAppDefFiles_screwage.diff to allow them to apply properly
with no fuzz
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-09 21:44:03 UTC (rev 173)
+++ trunk/debian/changelog 2005-06-10 00:01:12 UTC (rev 174)
@@ -72,9 +72,13 @@
- Branding edit and merges to debian/rules
- Patch Audit
- - Deleted 0000_backport_from_upstream.diff (obsolete)
+ - Edited 0000_backport_from_upstream.diff
+ - Removed redundant patches that are also in 000_stolen_from_HEAD.diff
- Edited 000_stolen_from_HEAD.diff
- Re-diffed Xpm's create.c fix to get it to apply properly
+ - Edited 002_xdm_fixes.diff, 003_linux.cf_and_xfree86.cf.diff, and
+ 068_fix_InstallAppDefFiles_screwage.diff to allow them to apply
+ properly with no fuzz
* Update FAQ to refer to X.Org instead of freedesktop.org where appropriate.
(Closes: #309811)
Modified: trunk/debian/patches/0000_backport_from_upstream.diff
===================================================================
--- trunk/debian/patches/0000_backport_from_upstream.diff 2005-06-09
21:44:03 UTC (rev 173)
+++ trunk/debian/patches/0000_backport_from_upstream.diff 2005-06-10
00:01:12 UTC (rev 174)
@@ -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 <[EMAIL PROTECTED]>
-
- * 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
@@ -55,57 +45,7 @@
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
# endif /* InstallAppDefFiles */
-# endif /* !NothingOutsideProjectRoot */
-+# endif /* !defined(NotingOutsideProjectRoot) || !NothingOutsideProjectRoot */
++# endif /* !defined(NothingOutsideProjectRoot) || !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++)
Modified: trunk/debian/patches/002_xdm_fixes.diff
===================================================================
--- trunk/debian/patches/002_xdm_fixes.diff 2005-06-09 21:44:03 UTC (rev
173)
+++ trunk/debian/patches/002_xdm_fixes.diff 2005-06-10 00:01:12 UTC (rev
174)
@@ -38,5 +38,5 @@
+#endif
+
#if LinuxDistribution == LinuxDebian
- # if !NothingOutsideProjectRoot
+ # if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
# define SystemManDirectory /usr/share/man
Modified: trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
===================================================================
--- trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2005-06-09
21:44:03 UTC (rev 173)
+++ trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2005-06-10
00:01:12 UTC (rev 174)
@@ -34,7 +34,7 @@
+# ifndef NothingOutsideProjectRoot
+# define NothingOutsideProjectRoot NO
+# endif
- # if !NothingOutsideProjectRoot
+ # if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
# define SystemManDirectory /usr/share/man
# endif
+
@@ -47,13 +47,13 @@
-/* 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)
@@ -119,12 +129,10 @@
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
# endif /* InstallAppDefFiles */
- # endif /* !NothingOutsideProjectRoot */
+ # endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
*/
+
# define SharedLibXdmGreet NO
# define LinkGLToUsrInclude NO
Modified: trunk/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
===================================================================
--- trunk/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
2005-06-09 21:44:03 UTC (rev 173)
+++ trunk/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
2005-06-10 00:01:12 UTC (rev 174)
@@ -28,5 +28,4 @@
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
+# endif
# endif /* InstallAppDefFiles */
- # endif /* !NothingOutsideProjectRoot */
-
+ # endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
*/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
