rpms/xorg-x11-server/FC-5 xorg-server-1.0.1-keymap-overflow.patch, NONE, 1.1 xorg-x11-server.spec, 1.46, 1.47

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29287

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-server-1.0.1-keymap-overflow.patch 
Log Message:
- Fix small overflow that causes crash on vt switch on ppc.
  Patch by David Woodhouse (bug 187083).


xorg-server-1.0.1-keymap-overflow.patch:
 lnx_KbdMap.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-server-1.0.1-keymap-overflow.patch ---
--- xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c	2005-07-03 11:51:16.000000000 +0100
+++ xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c	2006-04-02 17:37:10.000000000 +0100
@@ -180,7 +180,7 @@ static KeySym linux_to_x[256] = {
 /*
  * Maps the AT keycodes to Linux keycodes
  */
-static unsigned char at2lnx[NUM_KEYCODES] =
+static unsigned char at2lnx[] =
 {
 	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
 	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xorg-x11-server.spec	1 Apr 2006 18:36:49 -0000	1.46
+++ xorg-x11-server.spec	9 Apr 2006 16:26:07 -0000	1.47
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   9
+Release:   9.fc5
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -27,6 +27,8 @@
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=185084
 Patch8:    xorg-server-1.0.1-CVE-2006-0745.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=187083
+Patch9:    xorg-server-1.0.1-keymap-overflow.patch
 
 # Patches taken from xserver/xorg CVS HEAD, post-1.0.1
 Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
@@ -246,6 +248,7 @@
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
 %patch8 -p1 -b .CVE-2006-0745
+%patch9 -p1 -b .keymap-overflow
 
 %patch100 -p2 -b .fbpict-fix-rounding
 %patch101 -p2 -b .SEGV-on-null-interface
@@ -525,6 +528,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Sun Apr  9 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-9.fc5
+- Fix small overflow that causes crash on vt switch on ppc.
+  Patch by David Woodhouse (bug 187083).
+
 * Wed Mar 15 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-9
 - CVE-2006-0745 (bug 185084)