Author: branden
Date: 2004-02-09 00:52:13 -0500 (Mon, 09 Feb 2004)
New Revision: 1010
Added:
branches/4.3.0/sid/debian/patches/064_remove_duplicate_XShm_prototype.diff
branches/4.3.0/sid/debian/patches/070_fbdevhw_device_node_warnings.diff
branches/4.3.0/sid/debian/patches/071_nonexecutable_malloced_mem.diff
Modified:
branches/4.3.0/sid/debian/TODO
Log:
Forward-port more lost patches from the trunk (thanks to Nathanael Nerode
for the assistance!).
Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2004-02-09 04:38:34 UTC (rev 1009)
+++ branches/4.3.0/sid/debian/TODO 2004-02-09 05:52:13 UTC (rev 1010)
@@ -7,9 +7,6 @@
http://lists.debian.org/debian-x/2004/debian-x-200401/msg00475.html
* PATCH APPLIED, FIX NEEDS TESTING
* Investigate/forward-port the following patches from trunk:
- + 049_remove_duplicate_XShm_prototype
- + 067_nonexecutable_malloced_mem.diff
- + 070_fbdevhw_device_node_warnings.diff
+ 083_i810_do_not_reference_undefined_functions.diff
+ 201_alpha_truetype_gcc_bugfix.diff
+ 203_Xpm_wordsize.diff
Added:
branches/4.3.0/sid/debian/patches/064_remove_duplicate_XShm_prototype.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/064_remove_duplicate_XShm_prototype.diff
2004-02-09 04:38:34 UTC (rev 1009)
+++ branches/4.3.0/sid/debian/patches/064_remove_duplicate_XShm_prototype.diff
2004-02-09 05:52:13 UTC (rev 1010)
@@ -0,0 +1,27 @@
+$Id$
+
+This patch by Branden Robinson.
+
+Submitted upstream as #5656 (as a suggestion to revert a previous CVS
+revision).
+
+Applied upstream in revision 1.11.
+
+ 33. Remove duplicate XShmGetEventBase() declaration (#5656,
+ Branden Robinson).
+
+--- 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
+ );
Property changes on:
branches/4.3.0/sid/debian/patches/064_remove_duplicate_XShm_prototype.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Added: branches/4.3.0/sid/debian/patches/070_fbdevhw_device_node_warnings.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/070_fbdevhw_device_node_warnings.diff
2004-02-09 04:38:34 UTC (rev 1009)
+++ branches/4.3.0/sid/debian/patches/070_fbdevhw_device_node_warnings.diff
2004-02-09 05:52:13 UTC (rev 1010)
@@ -0,0 +1,22 @@
+$Id$
+
+This patch by Branden Robinson.
+
+When no /dev/fb* devices can be successfully opened, report this fact.
+
+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
Property changes on:
branches/4.3.0/sid/debian/patches/070_fbdevhw_device_node_warnings.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Added: branches/4.3.0/sid/debian/patches/071_nonexecutable_malloced_mem.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/071_nonexecutable_malloced_mem.diff
2004-02-09 04:38:34 UTC (rev 1009)
+++ branches/4.3.0/sid/debian/patches/071_nonexecutable_malloced_mem.diff
2004-02-09 05:52:13 UTC (rev 1010)
@@ -0,0 +1,21 @@
+$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;
Property changes on:
branches/4.3.0/sid/debian/patches/071_nonexecutable_malloced_mem.diff
___________________________________________________________________
Name: svn:keywords
+ Id
