x11-drivers/xf86-input-keyboard: Don't query console keymap

This seems to be useless and doesn't work anymore with vt(4), due to the
use of Unicode codepoints in vt(4). The new patch remove the related
code. This fixes a segmentation fault during X.Org server startup.

PR:		191459
Submitted by:	Claude Buisson <clbuisson@orange.fr> (earlier version)


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1506 058c260c-8361-11dd-a0ac-aa2bafec7d09

2 files changed, 221 insertions, 1 deletions

diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 59c26b5..6c5b142 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-keyboard
 PORTVERSION=	1.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_KbdMap.c b/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_KbdMap.c
new file mode 100644
index 0000000..8c4c545
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_KbdMap.c
@@ -0,0 +1,220 @@
+--- src/bsd_KbdMap.c.orig	2013-10-28 01:44:15.000000000 +0100
++++ src/bsd_KbdMap.c	2014-09-08 19:22:28.000000000 +0200
+@@ -27,168 +27,6 @@
+ #include "xf86Keymap.h"
+ #include "bsd_kbd.h"
+ 
+-#if (defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT)) && defined(GIO_KEYMAP)
+-#define KD_GET_ENTRY(i,n) \
+-  eascii_to_x[((keymap.key[i].spcl << (n+1)) & 0x100) + keymap.key[i].map[n]]
+-
+-static unsigned char remap[NUM_KEYCODES] = {
+-     0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,   /* 0x00 - 0x07 */
+-  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,   /* 0x08 - 0x0f */
+-  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,   /* 0x10 - 0x17 */
+-  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,   /* 0x18 - 0x1f */
+-  0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,   /* 0x20 - 0x27 */
+-  0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,   /* 0x28 - 0x2f */
+-  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,    0,   /* 0x30 - 0x37 */
+-  0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,   /* 0x38 - 0x3f */
+-  0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46,    0,   /* 0x40 - 0x47 */
+-     0,    0,    0,    0,    0,    0,    0,    0,   /* 0x48 - 0x4f */
+-     0,    0,    0,    0,    0,    0, 0x56, 0x57,   /* 0x50 - 0x57 */
+-  0x58,    0,    0,    0,    0,    0,    0,    0,   /* 0x58 - 0x5f */
+-     0,    0,    0,    0,    0,    0,    0,    0,   /* 0x60 - 0x67 */
+-     0,    0,    0,    0,    0,    0,    0,    0,   /* 0x68 - 0x6f */
+-     0,    0, 0x69, 0x65,    0,    0,    0,    0,   /* 0x70 - 0x77 */
+-     0,    0,    0,    0,    0,    0,    0,    0,   /* 0x78 - 0x7f */
+-};
+-
+-/* This table assumes the ibm code page 437 coding for characters 
+- * > 0x80. They are returned in this form by PCVT */
+-static KeySym eascii_to_x[512] = {
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	XK_BackSpace,	XK_Tab,		XK_Linefeed,	NoSymbol,
+-	NoSymbol,	XK_Return,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	XK_Escape,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	XK_space,	XK_exclam,	XK_quotedbl,	XK_numbersign,
+-	XK_dollar,	XK_percent,	XK_ampersand,	XK_apostrophe,
+-	XK_parenleft,	XK_parenright,	XK_asterisk,	XK_plus,
+-	XK_comma,	XK_minus,	XK_period,	XK_slash,
+-	XK_0,		XK_1,		XK_2,		XK_3,
+-	XK_4,		XK_5,		XK_6,		XK_7,
+-	XK_8,		XK_9,		XK_colon,	XK_semicolon,
+-	XK_less,	XK_equal,	XK_greater,	XK_question,
+-	XK_at,		XK_A,		XK_B,		XK_C,
+-	XK_D,		XK_E,		XK_F,		XK_G,
+-	XK_H,		XK_I,		XK_J,		XK_K,
+-	XK_L,		XK_M,		XK_N,		XK_O,
+-	XK_P,		XK_Q,		XK_R,		XK_S,
+-	XK_T,		XK_U,		XK_V,		XK_W,
+-	XK_X,		XK_Y,		XK_Z,		XK_bracketleft,
+-	XK_backslash,	XK_bracketright,XK_asciicircum,	XK_underscore,
+-	XK_grave,	XK_a,		XK_b,		XK_c,
+-	XK_d,		XK_e,		XK_f,		XK_g,
+-	XK_h,		XK_i,		XK_j,		XK_k,
+-	XK_l,		XK_m,		XK_n,		XK_o,
+-	XK_p,		XK_q,		XK_r,		XK_s,
+-	XK_t,		XK_u,		XK_v,		XK_w,
+-	XK_x,		XK_y,		XK_z,		XK_braceleft,
+-	XK_bar,		XK_braceright,	XK_asciitilde,	XK_Delete,
+-	XK_Ccedilla,	XK_udiaeresis,	XK_eacute,	XK_acircumflex,
+-	XK_adiaeresis,	XK_agrave,	XK_aring,	XK_ccedilla,
+-	XK_ecircumflex,	XK_ediaeresis,	XK_egrave,	XK_idiaeresis,
+-	XK_icircumflex,	XK_igrave,	XK_Adiaeresis,	XK_Aring,
+-	XK_Eacute,	XK_ae,		XK_AE,		XK_ocircumflex,
+-	XK_odiaeresis,	XK_ograve,	XK_ucircumflex,	XK_ugrave,
+-	XK_ydiaeresis,	XK_Odiaeresis,	XK_Udiaeresis,	XK_cent,
+-	XK_sterling,	XK_yen,		XK_paragraph,	XK_section,
+-	XK_aacute,	XK_iacute,	XK_oacute,	XK_uacute,
+-	XK_ntilde,	XK_Ntilde,	XK_ordfeminine,	XK_masculine,
+-	XK_questiondown,XK_hyphen,	XK_notsign,	XK_onehalf,
+-	XK_onequarter,	XK_exclamdown,	XK_guillemotleft,XK_guillemotright,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	XK_Greek_alpha,	XK_ssharp,	XK_Greek_GAMMA,	XK_Greek_pi,
+-	XK_Greek_SIGMA,	XK_Greek_sigma,	XK_mu,	        XK_Greek_tau,
+-	XK_Greek_PHI,	XK_Greek_THETA,	XK_Greek_OMEGA,	XK_Greek_delta,
+-	XK_infinity,	XK_Ooblique,	XK_Greek_epsilon, XK_intersection,
+-	XK_identical,	XK_plusminus,	XK_greaterthanequal, XK_lessthanequal,
+-	XK_topintegral,	XK_botintegral,	XK_division,	XK_similarequal,
+-	XK_degree,	NoSymbol,	NoSymbol,	XK_radical,
+-	XK_Greek_eta,	XK_twosuperior,	XK_periodcentered, NoSymbol,
+-
+-	/* 
+-	 * special marked entries (256 + x)
+-	 */
+-
+-	/* This has been checked against what syscons actually does */
+-	NoSymbol,	NoSymbol,	XK_Shift_L,	XK_Shift_R,
+-	XK_Caps_Lock,	XK_Num_Lock,	XK_Scroll_Lock,	XK_Alt_L,
+-	XK_ISO_Left_Tab,XK_Control_L,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	XK_F1,
+-	XK_F2,		XK_F3,		XK_F4,		XK_F5,
+-	XK_F6,		XK_F7,		XK_F8,		XK_F9,
+-	XK_F10,		XK_F11,		XK_F12,		NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	XK_Control_R,	XK_Alt_R,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
+-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol
+-};
+-
+ #ifdef SYSCONS_SUPPORT
+ static
+ unsigned char sysconsCODEMap[] = {
+@@ -205,7 +43,6 @@
+     sysconsCODEMap
+ };
+ #endif
+-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+ 
+ #ifdef WSCONS_SUPPORT
+ 
+@@ -1245,40 +1082,6 @@
+   KeySym        *k;
+   int           i;
+ 
+-#ifndef __bsdi__
+-  switch (pKbd->consType) {
+-
+-/*
+- * XXX wscons has no GIO_KEYMAP
+- */
+-#if (defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)) && defined(GIO_KEYMAP)
+-  case SYSCONS:
+-  case PCVT:
+-    {
+-      keymap_t keymap;
+-    
+-      if (ioctl(pInfo->fd, GIO_KEYMAP, &keymap) != -1) {
+-	for (i = 0; i < keymap.n_keys && i < NUM_KEYCODES; i++)
+-	  if (remap[i]) {
+-	    k = map + (remap[i] << 2);
+-	    k[0] = KD_GET_ENTRY(i,0);           /* non-shifed */
+-	    k[1] = KD_GET_ENTRY(i,1);	      /* shifted */
+-	    k[2] = KD_GET_ENTRY(i,4);	      /* alt */
+-	    k[3] = KD_GET_ENTRY(i,5);	      /* alt - shifted */
+-	    if (k[3] == k[2]) k[3] = NoSymbol;
+-	    if (k[2] == k[1]) k[2] = NoSymbol;
+-	    if (k[1] == k[0]) k[1] = NoSymbol;
+-	    if (k[0] == k[2] && k[1] == k[3])
+-	      k[2] = k[3] = NoSymbol;
+-	  }
+-      }
+-    }
+-    break;
+-#endif /* SYSCONS || PCVT */
+-    
+-  } 
+-#endif /* !bsdi */
+-
+   /*
+    * compute the modifier map
+    */