debian/patches: my forward-ports of three of the 'unmerged' patches
These are untested, but they *did* pass 'debian/rules patch-audit'.
(I used the 'orig' tarball from the current version in experimental, on the
assumption that that wasn't going to change.)
The forward-porting seemed relatively straightforward, so I figured I might
as well just do it.
070_fbdevhw_device_node_warnings.diff -- the former patch of the same name
064_remove_duplicate_XShm_prototype.diff -- the former 049
071_nonexecutable_malloced_mem.diff -- the former 067
--
Nathanael Nerode <neroden at gcc.gnu.org>
US citizens: if you're considering voting for Bush, look at these first:
http://www.misleader.org/ http://www.cbc.ca/news/background/arar/
http://www.house.gov/reform/min/politicsandscience/
$Id$
This patch by Branden Robinson.
When there aren't any /dev/fb* devices, issue a more generic error message
instead of one X_ERROR for each device file that we try to open.
Not submitted upstream yet.
diff -urN xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c xc.new/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c
--- xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c 2004-02-07 18:25:01.000000000 -0500
+++ xc.new/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c 2004-02-07 18:20:44.000000000 -0500
@@ -298,7 +298,10 @@
}
if (namep)
*namep = NULL;
+ xf86DrvMsg(-1, X_ERROR,
+ "Unable to find a valid framebuffer device\n");
return -1;
+
}
static int
$Id$
This patch by Branden Robinson.
Submitted upstream as #5656 (as a suggestion to revert a previous CVS
revision).
--- xc/include/extensions/XShm.h~ 2003-02-28 16:18:10.000000000 -0500
+++ xc/include/extensions/XShm.h 2003-02-28 16:18:32.000000000 -0500
@@ -79,12 +79,6 @@
int XShmGetEventBase(
#if NeedFunctionPrototypes
- Display* /* dpy */
-#endif
-);
-
-int XShmGetEventBase(
-#if NeedFunctionPrototypes
Display* /* dpy */
#endif
);
$Id$
This patch fixes the assumption that data returned by malloc() is executable.
In upstream revision 1.43, the assumption was fixed for ia64 only.
We understand it is Linus' position that programs that assume data to be
executable are broken, so we enable this code for all Linux platforms.
Original patch (before upstream applied its own version) was by David Mosberger.
diff -urN xc/programs/Xserver/hw/xfree86/loader/elfloader.c xc.new/programs/Xserver/hw/xfree86/loader/elfloader.c
--- xc/programs/Xserver/hw/xfree86/loader/elfloader.c 2004-02-07 17:33:29.000000000 -0500
+++ xc.new/programs/Xserver/hw/xfree86/loader/elfloader.c 2004-02-07 17:29:03.000000000 -0500
@@ -957,7 +957,7 @@
ErrorF( "ELFCreateGOT() Unable to reallocate memory!!!!\n" );
return FALSE;
}
-# if defined(linux) && defined(__ia64__) || defined(__OpenBSD__)
+# if defined(linux) || defined(__OpenBSD__)
{
unsigned long page_size = getpagesize();
unsigned long round;
Reply to: