X Strike Force XFree86 SVN commit: r2264 - in trunk/debian: . patches
Author: branden
Date: 2005-05-17 13:09:25 -0500 (Tue, 17 May 2005)
New Revision: 2264
Modified:
trunk/debian/CHANGESETS
trunk/debian/patches/099za_libxpm_spopen_fix.diff
Log:
Delete patch that:
* is redundant with existing patch #200;
* regresses the ident line;
* has nothing to do with the s_popen() security fix.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-05-17 18:06:17 UTC (rev 2263)
+++ trunk/debian/CHANGESETS 2005-05-17 18:09:25 UTC (rev 2264)
@@ -10,6 +10,6 @@
Backport libxpm from X.org stable release (099za_libxpm_spopen_fix.diff).
(Closes: #308783)
- 2259, 2262, 2263
+ 2259, 2262, 2263, 2264
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/patches/099za_libxpm_spopen_fix.diff
===================================================================
--- trunk/debian/patches/099za_libxpm_spopen_fix.diff 2005-05-17 18:06:17 UTC (rev 2263)
+++ trunk/debian/patches/099za_libxpm_spopen_fix.diff 2005-05-17 18:09:25 UTC (rev 2264)
@@ -649,23 +649,3 @@
/* backward compatibility */
-diff -ruN xc-old/extras/Xpm/lib/XpmI.h xc/extras/Xpm/lib/XpmI.h
---- xc-old/extras/Xpm/lib/XpmI.h 2005-05-14 15:57:06.000000000 -0400
-+++ xc/extras/Xpm/lib/XpmI.h 2005-05-14 16:16:52.000000000 -0400
-@@ -22,7 +22,7 @@
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from GROUPE BULL.
- */
--/* $XFree86: xc/extras/Xpm/lib/XpmI.h,v 1.8 2002/01/07 19:40:23 dawes Exp $ */
-+/* $XFree86: xc/extras/Xpm/lib/XpmI.h,v 1.7 2001/11/01 23:35:25 dawes Exp $ */
-
- /*****************************************************************************\
- * XpmI.h: *
-@@ -60,6 +60,7 @@
-
- #include <X11/Xos.h>
- #include <X11/Xfuncs.h>
-+#include <X11/Xmd.h>
-
- #ifdef VMS
- #include <unixio.h>
Reply to: