X Strike Force XFree86 SVN commit: r2176 - in trunk/debian: . patches
Author: branden
Date: 2005-02-09 02:21:42 -0500 (Wed, 09 Feb 2005)
New Revision: 2176
Modified:
trunk/debian/CHANGESETS
trunk/debian/patches/071_nonexecutable_malloced_mem.diff
trunk/debian/patches/600_amd64_support.diff
Log:
Correct an inaccuracy in, and update, some patch annotations.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-02-09 07:12:47 UTC (rev 2175)
+++ trunk/debian/CHANGESETS 2005-02-09 07:21:42 UTC (rev 2176)
@@ -9,7 +9,7 @@
files anywhere.)
Miscellaneous cosmetic fixes.
- 2126, 2138, 2147, 2148, 2164, 2168, 2175
+ 2126, 2138, 2147, 2148, 2164, 2168, 2175, 2176
The loading of srvr_ctrl(xfree86) symbol definitions for Sun keyboards
was broken and made such keyboards unusable. (Closes: #286268)
Modified: trunk/debian/patches/071_nonexecutable_malloced_mem.diff
===================================================================
--- trunk/debian/patches/071_nonexecutable_malloced_mem.diff 2005-02-09 07:12:47 UTC (rev 2175)
+++ trunk/debian/patches/071_nonexecutable_malloced_mem.diff 2005-02-09 07:21:42 UTC (rev 2176)
@@ -9,6 +9,10 @@
Ron Murray, Admar Schoonen, Jurij Smakov, Dieter Jurzitza, and Richard
Mortimer for their analysis which helped uncover the other two instances.
+Also see Debian #277699.
+
+Not submitted to XFree86 or X.Org yet.
+
diff -u 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-12-02 21:54:11.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c 2004-12-02 22:01:41.000000000 -0500
Modified: trunk/debian/patches/600_amd64_support.diff
===================================================================
--- trunk/debian/patches/600_amd64_support.diff 2005-02-09 07:12:47 UTC (rev 2175)
+++ trunk/debian/patches/600_amd64_support.diff 2005-02-09 07:21:42 UTC (rev 2176)
@@ -15,8 +15,6 @@
In the XFree86 X server's ELF object loader:
* Stop conditionally #including <sys/mman.h> since it is unconditionally
imported earlier in the file.
-* Perform an mprotect() for AMD64 Linux systems as well as OpenBSD to
- prevent SEGVs on NX-enabled kernels (see Debian #277699).
* Fix a problem with parentheses when using the preprocessor.
This patch by Andreas Jochens and Branden Robinson.
Reply to: