diff --git a/system/base/kbd/actions.py b/system/base/kbd/actions.py index 0e422845..d908479a 100644 --- a/system/base/kbd/actions.py +++ b/system/base/kbd/actions.py @@ -8,7 +8,8 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): - autotools.configure("--enable-nls \ + autotools.configure("--disable-vlock \ + --enable-nls \ --prefix=/usr \ --datadir=/usr/share/kbd \ --localedir=/usr/share/locale/kbd \ diff --git a/system/base/kbd/files/blfs/kbd-2.2.0-backspace-1.patch b/system/base/kbd/files/blfs/kbd-2.2.0-backspace-1.patch index 8fec1718..bce3b1de 100644 --- a/system/base/kbd/files/blfs/kbd-2.2.0-backspace-1.patch +++ b/system/base/kbd/files/blfs/kbd-2.2.0-backspace-1.patch @@ -39,14 +39,14 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/ --- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23 20:03:58.000000000 +0100 +++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03 22:40:32.000000000 +0000 @@ -51,7 +51,7 @@ - alt keycode 12 = Meta_minus - keycode 13 = minus underscore - alt keycode 13 = Meta_equal --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab + alt keycode 12 = Meta_minus + keycode 13 = minus underscore + alt keycode 13 = Meta_equal +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Meta_Tab + alt keycode 15 = Meta_Tab diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map --- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23 20:03:59.000000000 +0100 +++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03 22:42:14.000000000 +0000 @@ -58,9 +58,9 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymap + Delete Delete Delete Delete \ Delete Delete Delete Delete \ Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ - Meta_Delete Meta_Delete Meta_Delete Meta_Delete + Meta_Delete Meta_Delete Meta_Delete Meta_Delete @@ -506,7 +506,7 @@ - + # Edit this if you want strict VT100 emulation. string F111 = "\033[3$" -keycode 111 = Delete F111 Delete F111 \ @@ -79,9 +79,9 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i + Delete Delete Delete Delete \ Delete Delete Delete Delete \ Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ - Meta_Delete Meta_Delete Meta_Delete Meta_Delete + Meta_Delete Meta_Delete Meta_Delete Meta_Delete @@ -505,7 +505,7 @@ - + # Edit this if you want strict VT100 emulation. string F111 = "\033[3$" -keycode 111 = Delete F111 Delete F111 \ @@ -99,13 +99,13 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/ke - plain keycode 111 = Delete # "Remove" originally, weird... + plain keycode 111 = Remove strings as usual - + keycode 1 = Escape diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map --- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23 20:03:59.000000000 +0100 +++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03 22:45:32.000000000 +0000 @@ -143,8 +143,8 @@ - + # The keycode "0xFF" is too dangerous for many programs (including emacs). # So let it be bracket instead of Hard Sign. -# altgr keycode 27 = +0xDF @@ -125,8 +125,8 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/ - keycode 14 = BackSpace BackSpace BackSpace BackSpace + keycode 14 = Delete Delete Delete Delete alt keycode 14 = Meta_Delete - keycode 15 = Tab Tab Tab Tab - alt keycode 15 = Meta_Tab + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map --- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23 20:03:59.000000000 +0100 +++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03 22:47:12.000000000 +0000 @@ -138,7 +138,7 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/ke + keycode 14 = Delete alt keycode 14 = Meta_Delete keycode 15 = Tab - alt keycode 15 = Meta_Tab + alt keycode 15 = Meta_Tab diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map --- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23 20:03:59.000000000 +0100 +++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03 22:48:10.000000000 +0000 @@ -152,7 +152,7 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymap + keycode 14 = Delete Delete Delete Delete alt keycode 14 = Meta_Delete altgr alt keycode 14 = Meta_Delete - keycode 15 = Tab Tab Tab Tab + keycode 15 = Tab Tab Tab Tab diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map --- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23 20:03:59.000000000 +0100 +++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03 22:49:17.000000000 +0000 @@ -163,27 +163,27 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keyma - keycode 14 = BackSpace BackSpace BackSpace BackSpace + keycode 14 = Delete Delete Delete Delete alt keycode 14 = Meta_Delete - keycode 15 = Tab Tab Tab Tab - alt keycode 15 = Meta_Tab + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map --- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23 20:03:59.000000000 +0100 +++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03 22:50:18.000000000 +0000 @@ -345,7 +345,7 @@ keycode 109 = Next Scroll_Forward keycode 110 = Insert - + - keycode 111 = Delete # "Remove" originally, weird... + keycode 111 = Remove control alt keycode 111 = Boot control altgr keycode 111 = Boot - + diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map --- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23 20:03:59.000000000 +0100 +++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03 22:50:44.000000000 +0000 @@ -374,6 +374,6 @@ keycode 109 = Next Scroll_Forward keycode 110 = Insert - + - keycode 111 = Delete # "Remove" originally, weird... + keycode 111 = Remove control alt keycode 111 = Boot @@ -207,10 +207,10 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i shift ctrll ctrlr keycode 13 = plus alt ctrll ctrlr keycode 13 = Meta_equal shift alt ctrll ctrlr keycode 13 = Meta_plus --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete ctrlr keycode 14 = BackSpace diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map --- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23 20:03:59.000000000 +0100 @@ -219,10 +219,10 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keyma shift ctrll ctrlr keycode 13 = plus alt ctrll ctrlr keycode 13 = Meta_equal shift alt ctrll ctrlr keycode 13 = Meta_plus --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete ctrlr keycode 14 = BackSpace diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map --- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23 20:03:59.000000000 +0100 @@ -231,10 +231,10 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/ke shift ctrll ctrlr keycode 13 = plus alt ctrll ctrlr keycode 13 = Meta_equal shift alt ctrll ctrlr keycode 13 = Meta_plus --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete ctrlr keycode 14 = BackSpace diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map --- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23 20:03:59.000000000 +0100 @@ -243,8 +243,8 @@ diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymap shift ctrll ctrlr keycode 13 = plus alt ctrll ctrlr keycode 13 = Meta_equal shift alt ctrll ctrlr keycode 13 = Meta_plus --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete ctrlr keycode 14 = BackSpace diff --git a/system/base/kbd/files/blfs/kbd-2.4.0-backspace-1.patch b/system/base/kbd/files/blfs/kbd-2.4.0-backspace-1.patch new file mode 100644 index 00000000..8fec1718 --- /dev/null +++ b/system/base/kbd/files/blfs/kbd-2.4.0-backspace-1.patch @@ -0,0 +1,250 @@ +Submitted By: Matt Burgess +Date: 2008-12-06 +Initial Package Version: 1.15 +Upstream Status: Not submitted, possibly incomplete +Description: Makes Backspace and Delete keys consistent in all i386 keymaps. +Makes the Backspace key send character code 127, and Delete send a well known +escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386. + +Original patch for 1.12 by Alexander Patrakov. +Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map, +ru-cp1251.map) by Ken Moffat . +Re-diffed against 1.15 by Matt Burgess . + +diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map +--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map 2008-06-20 12:36:01.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map 2008-12-03 22:27:55.000000000 +0000 +@@ -43,7 +43,7 @@ + keycode 11 = three numbersign + keycode 12 = two at + keycode 13 = one exclam +- keycode 14 = BackSpace Delete ++ keycode 14 = Delete Delete + ! -------------------------------------------------------------------------- + ! Row 3 + ! -------------------------------------------------------------------------- +diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map +--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map 2008-06-20 12:36:01.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map 2008-12-03 22:28:13.000000000 +0000 +@@ -43,7 +43,7 @@ + keycode 11 = slash question + keycode 12 = bracketleft braceleft + keycode 13 = bracketright braceright +- keycode 14 = BackSpace Delete ++ keycode 14 = Delete Delete + ! -------------------------------------------------------------------------- + ! Row 3 + ! -------------------------------------------------------------------------- +diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map +--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23 20:03:58.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03 22:40:32.000000000 +0000 +@@ -51,7 +51,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = minus underscore + alt keycode 13 = Meta_equal +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Meta_Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03 22:42:14.000000000 +0000 +@@ -205,7 +205,7 @@ + # edit this if you want the key above to delete symbols above + # cursor, not before. + keycode 14 = \ +- BackSpace BackSpace BackSpace BackSpace \ ++ Delete Delete Delete Delete \ + Delete Delete Delete Delete \ + Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete +@@ -506,7 +506,7 @@ + + # Edit this if you want strict VT100 emulation. + string F111 = "\033[3$" +-keycode 111 = Delete F111 Delete F111 \ ++keycode 111 = Remove F111 Remove F111 \ + Remove Remove Remove Remove \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ + Boot Boot Boot Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/lt.map 2008-12-03 22:42:58.000000000 +0000 +@@ -204,7 +204,7 @@ + # edit this if you want the key above to delete symbols above + # cursor, not before. + keycode 14 = \ +- BackSpace BackSpace BackSpace BackSpace \ ++ Delete Delete Delete Delete \ + Delete Delete Delete Delete \ + Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete +@@ -505,7 +505,7 @@ + + # Edit this if you want strict VT100 emulation. + string F111 = "\033[3$" +-keycode 111 = Delete F111 Delete F111 \ ++keycode 111 = Remove F111 Remove F111 \ + Remove Remove Remove Remove \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ + Boot Boot Boot Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map 2008-06-20 12:36:00.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map 2008-12-03 22:44:25.000000000 +0000 +@@ -3,7 +3,7 @@ + # Send comments to Kjetil T. Homme + include "linux-with-alt-and-altgr" + plain keycode 83 = KP_Comma +- plain keycode 111 = Delete # "Remove" originally, weird... ++ plain keycode 111 = Remove + strings as usual + + keycode 1 = Escape +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03 22:45:32.000000000 +0000 +@@ -143,8 +143,8 @@ + + # The keycode "0xFF" is too dangerous for many programs (including emacs). + # So let it be bracket instead of Hard Sign. +-# altgr keycode 27 = +0xDF +-# altgr shift keycode 27 = +0xFF ++altgr keycode 27 = +0xDF ++altgr shift keycode 27 = +0xFF + control keycode 27 = Control_bracketright + altgr control keycode 27 = Control_bracketright + alt keycode 27 = Meta_bracketright +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map 2008-12-03 22:46:15.000000000 +0000 +@@ -46,7 +46,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03 22:47:12.000000000 +0000 +@@ -39,7 +39,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace ++ keycode 14 = Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03 22:48:10.000000000 +0000 +@@ -89,8 +89,8 @@ + altgr alt keycode 13 = Meta_equal + shift alt keycode 13 = Meta_plus + altgr shift alt keycode 13 = Meta_plus +- keycode 14 = BackSpace BackSpace BackSpace BackSpace +-# keycode 14 = Delete Delete Delete Delete ++# keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + altgr alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03 22:49:17.000000000 +0000 +@@ -42,7 +42,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03 22:50:18.000000000 +0000 +@@ -345,7 +345,7 @@ + keycode 109 = Next Scroll_Forward + keycode 110 = Insert + +- keycode 111 = Delete # "Remove" originally, weird... ++ keycode 111 = Remove + control alt keycode 111 = Boot + control altgr keycode 111 = Boot + +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03 22:50:44.000000000 +0000 +@@ -374,6 +374,6 @@ + keycode 109 = Next Scroll_Forward + keycode 110 = Insert + +- keycode 111 = Delete # "Remove" originally, weird... ++ keycode 111 = Remove + control alt keycode 111 = Boot + control altgr keycode 111 = Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-12-03 22:52:09.000000000 +0000 +@@ -49,7 +49,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = minus underscore + alt keycode 13 = Meta_equal +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Meta_Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua.map 2008-12-03 22:52:52.000000000 +0000 +@@ -249,7 +249,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map 2008-12-03 22:53:36.000000000 +0000 +@@ -250,7 +250,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-12-03 22:54:06.000000000 +0000 +@@ -260,7 +260,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map 2008-12-03 22:54:23.000000000 +0000 +@@ -260,7 +260,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace diff --git a/system/base/kbd/files/mandriva/kbd-1.15-keycodes-man.patch b/system/base/kbd/files/mandriva/kbd-1.15-keycodes-man.patch new file mode 100644 index 00000000..e400c9df --- /dev/null +++ b/system/base/kbd/files/mandriva/kbd-1.15-keycodes-man.patch @@ -0,0 +1,52 @@ +diff -up kbd-2.3.0/docs/man/man1/showkey.1.orig kbd-2.3.0/docs/man/man1/showkey.1 +--- kbd-2.3.0/docs/man/man1/showkey.1.orig 2020-07-08 19:25:47.000000000 +0200 ++++ kbd-2.3.0/docs/man/man1/showkey.1 2020-07-16 08:56:15.970254183 +0200 +@@ -84,6 +84,19 @@ corresponds to what the keyboard hardwar + to know the scan codes sent by various keys it is better to boot a + 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0 + that tells the 2.6 kernel to return the actual scan codes. ++ ++.SH NOTES ++The raw scan codes are available only on AT and PS/2 keyboards, ++and even then they are disabled unless the ++.B atkbd.softraw=0 ++kernel parameter is used. ++When the raw scan codes are not available, the kernel uses a fixed built-in ++table to produce scan codes from keycodes. Thus, ++.BR setkeycodes (8) ++can affect the output of ++.B showkey ++in scan code dump mode. ++ + .SH "SEE ALSO" + .BR loadkeys (1), + .BR dumpkeys (1), +diff -up kbd-2.3.0/docs/man/man8/setkeycodes.8.orig kbd-2.3.0/docs/man/man8/setkeycodes.8 +--- kbd-2.3.0/docs/man/man8/setkeycodes.8.orig 2020-07-08 19:35:35.000000000 +0200 ++++ kbd-2.3.0/docs/man/man8/setkeycodes.8 2020-07-16 08:57:52.293900997 +0200 +@@ -42,6 +42,10 @@ the command + will assign the keycode 112 to it, and then + .BR loadkeys (1) + can be used to define the function of this key. ++ ++USB keyboards have standardized keycodes and ++.B setkeycodes ++doesn't affect them at all. + .LP + Some older kernels might hardwire a low scancode range to the + equivalent keycodes; setkeycodes will fail when you try to remap +@@ -60,6 +64,14 @@ None. + .SH BUGS + The keycodes of X have nothing to do with those of Linux. + Unusual keys can be made visible under Linux, but not under X. ++ ++.B setkeycodes ++affects only the "first" input device ++that has modifiable scancode-to-keycode mapping. ++If there is more than one such device, ++.B setkeycodes ++cannot change the mapping of other devices than the "first" one. ++ + .SH "SEE ALSO" + .BR dumpkeys (1), + .BR loadkeys (1), diff --git a/system/base/kbd/files/mandriva/kbd-1.15-sparc.patch b/system/base/kbd/files/mandriva/kbd-1.15-sparc.patch new file mode 100644 index 00000000..3fbc0fb6 --- /dev/null +++ b/system/base/kbd/files/mandriva/kbd-1.15-sparc.patch @@ -0,0 +1,62 @@ +diff -up kbd-2.1.0/docs/man/man8/kbdrate.8.orig kbd-2.1.0/docs/man/man8/kbdrate.8 +--- kbd-2.1.0/docs/man/man8/kbdrate.8.orig 2019-06-21 10:08:17.000000000 +0200 ++++ kbd-2.1.0/docs/man/man8/kbdrate.8 2019-07-17 10:36:19.876499648 +0200 +@@ -19,7 +19,7 @@ Using + without any options will reset the repeat rate to 10.9 characters per second (cps) + and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems. + These are the IBM defaults. On SPARC-based systems it will reset the repeat rate +-to 5 cps and the delay to 200 ms. ++to 20 cps and the delay to 200 ms. + + .SH OPTIONS + .TP +diff -up kbd-2.1.0/src/kbdrate.c.orig kbd-2.1.0/src/kbdrate.c +--- kbd-2.1.0/src/kbdrate.c.orig 2019-07-02 17:44:57.000000000 +0200 ++++ kbd-2.1.0/src/kbdrate.c 2019-07-17 11:07:04.732486323 +0200 +@@ -114,9 +114,12 @@ static int print_only = 0; + static int + KDKBDREP_ioctl_ok(double rate, int delay, int silent) + { ++#if defined(KDKBDREP) && !defined(__sparc__) + /* + * This ioctl is defined in but is not + * implemented anywhere - must be in some m68k patches. ++ * We cannot blindly try unimplemented ioctls on sparc64 - ++ * the 32<->64bit transition layer does not like it. + * Since 2.4.9 also on i386. + */ + struct my_kbd_repeat kbdrep_s; +@@ -181,6 +184,9 @@ KDKBDREP_ioctl_ok(double rate, int delay + } + + return 1; /* success! */ ++#else /* no KDKBDREP or __sparc__ */ ++ return 0; ++#endif /* KDKBDREP */ + } + + #ifdef KIOCSRATE +@@ -251,6 +257,9 @@ ioport_set(double rate, int delay, int s + + /* https://wiki.osdev.org/PS/2_Keyboard */ + ++ /* The ioport way - will crash on sparc */ ++ ++#ifndef __sparc__ + for (i = 0; i < (int) RATE_COUNT; i++) + if (rate * 10 >= valid_rates[i]) { + value &= 0x60; +@@ -304,11 +313,12 @@ ioport_set(double rate, int delay, int s + valid_rates[value & 0x1f] / 10.0, + valid_delays[(value & 0x60) >> 5]); + ++#endif + return 1; + } + + #ifdef __sparc__ +-double rate = 5.0; /* Default rate */ ++double rate = 20.0; /* Default rate */ + int delay = 200; /* Default delay */ + #else + double rate = 10.9; /* Default rate */ diff --git a/system/base/kbd/files/mandriva/kbd-1.15-unicode_start.patch b/system/base/kbd/files/mandriva/kbd-1.15-unicode_start.patch new file mode 100644 index 00000000..119fe78d --- /dev/null +++ b/system/base/kbd/files/mandriva/kbd-1.15-unicode_start.patch @@ -0,0 +1,21 @@ +diff -up kbd-1.15.2/src/unicode_start.orig kbd-1.15.2/src/unicode_start +--- kbd-1.15.2/src/unicode_start.orig 2011-01-05 13:28:22.079662644 +0100 ++++ kbd-1.15.2/src/unicode_start 2011-01-05 13:29:01.327353698 +0100 +@@ -72,6 +72,9 @@ stty iutf8 + # have a Unicode map attached, or explicitly specified, e.g., + # by giving `def.uni' as a second argument. + ++DEFAULT_UNICODE_FONT=latarcyrheb-sun16 ++# Also drdos8x16 is a good candidate. ++ + case "$#" in + 2) + setfont "$1" -u "$2" +@@ -80,6 +83,7 @@ case "$#" in + setfont "$1" + ;; + 0) ++ setfont $DEFAULT_UNICODE_FONT + ;; + *) + echo "usage: unicode_start [font [unicode map]]" diff --git a/system/base/kbd/files/mandriva/kbd-1.15.3-dumpkeys-man.patch b/system/base/kbd/files/mandriva/kbd-1.15.3-dumpkeys-man.patch new file mode 100644 index 00000000..fc904128 --- /dev/null +++ b/system/base/kbd/files/mandriva/kbd-1.15.3-dumpkeys-man.patch @@ -0,0 +1,18 @@ +diff -up kbd-2.0.4/docs/man/man1/dumpkeys.1.in.orig kbd-2.0.4/docs/man/man1/dumpkeys.1.in +--- kbd-2.0.4/docs/man/man1/dumpkeys.1.in.orig 2017-01-11 11:12:22.884029413 +0100 ++++ kbd-2.0.4/docs/man/man1/dumpkeys.1.in 2017-01-11 11:12:47.537040194 +0100 +@@ -164,6 +164,14 @@ output of + .BI \-S shape " " " " \-\-shape= shape + .LP + .TP ++.B \-1 \-\-separate-lines ++This forces ++.B dumpkeys ++to write one line per (modifier,keycode) pair. It prefixes the word ++.I plain ++for plain keycodes. ++.LP ++.TP + .B \-t \-\-funcs-only + When this option is given, + .B dumpkeys diff --git a/system/base/kbd/files/mandriva/kbd-1.15.5-loadkeys-search-path.patch b/system/base/kbd/files/mandriva/kbd-1.15.5-loadkeys-search-path.patch new file mode 100644 index 00000000..16beb3da --- /dev/null +++ b/system/base/kbd/files/mandriva/kbd-1.15.5-loadkeys-search-path.patch @@ -0,0 +1,24 @@ +diff -up kbd-2.3.0/src/loadkeys.c.orig kbd-2.3.0/src/loadkeys.c +--- kbd-2.3.0/src/loadkeys.c.orig 2020-06-02 12:16:45.000000000 +0200 ++++ kbd-2.3.0/src/loadkeys.c 2020-07-16 09:02:50.398864688 +0200 +@@ -28,6 +28,8 @@ + static const char *const dirpath1[] = { + "", + DATADIR "/" KEYMAPDIR "/**", ++ DATADIR "/" XKBKEYMAPDIR "/", ++ DATADIR "/" LEGACYKEYMAPDIR "/**", + KERNDIR "/", + NULL + }; +diff -up kbd-2.3.0/src/paths.h.orig kbd-2.3.0/src/paths.h +--- kbd-2.3.0/src/paths.h.orig 2020-07-16 09:02:59.243010909 +0200 ++++ kbd-2.3.0/src/paths.h 2020-07-16 09:03:23.446410942 +0200 +@@ -5,6 +5,8 @@ + * The following five subdirectories are defined: + */ + #define KEYMAPDIR "keymaps" ++#define XKBKEYMAPDIR "keymaps/xkb" ++#define LEGACYKEYMAPDIR "keymaps/legacy" + #define UNIMAPDIR "unimaps" + #define TRANSDIR "consoletrans" + #define VIDEOMODEDIR "videomodes" diff --git a/system/base/kbd/files/mandriva/kbd-1.15.5-sg-decimal-separator.patch b/system/base/kbd/files/mandriva/kbd-1.15.5-sg-decimal-separator.patch new file mode 100644 index 00000000..cb7398d5 --- /dev/null +++ b/system/base/kbd/files/mandriva/kbd-1.15.5-sg-decimal-separator.patch @@ -0,0 +1,12 @@ +diff -up kbd-1.15.5/data/keymaps/i386/qwertz/sg.map.orig kbd-1.15.5/data/keymaps/i386/qwertz/sg.map +--- kbd-1.15.5/data/keymaps/i386/qwertz/sg.map.orig 2013-02-21 15:54:39.362799094 +0100 ++++ kbd-1.15.5/data/keymaps/i386/qwertz/sg.map 2013-02-21 15:54:46.448838554 +0100 +@@ -1,7 +1,7 @@ + keymaps 0-2,4-6,8,12 + include "qwertz-layout" + include "linux-with-alt-and-altgr.inc" +- plain keycode 83 = KP_Comma ++ plain keycode 83 = KP_Period + strings as usual + + keycode 1 = Escape Escape diff --git a/system/base/kbd/files/mandriva/kbd-1.15.5-vlock-more-pam.patch b/system/base/kbd/files/mandriva/kbd-1.15.5-vlock-more-pam.patch new file mode 100644 index 00000000..ba342550 --- /dev/null +++ b/system/base/kbd/files/mandriva/kbd-1.15.5-vlock-more-pam.patch @@ -0,0 +1,61 @@ +--- a/src/vlock/auth.c ++++ b/src/vlock/auth.c +@@ -4,7 +4,7 @@ + PAM authentication routine for vlock, the VT locking program for linux. + + Copyright (C) 1994-1998 Michael K. Johnson +- Copyright (C) 2002, 2005 Dmitry V. Levin ++ Copyright (C) 2002, 2005, 2013 Dmitry V. Levin + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -36,6 +36,25 @@ + /* Unrecognized PAM error timeout. */ + #define ERROR_TIMEOUT 10 + ++static int ++do_account_password_management (pam_handle_t *pamh) ++{ ++ int rc; ++ ++ /* Whether the authenticated user is allowed to log in? */ ++ rc = pam_acct_mgmt (pamh, 0); ++ ++ /* Do we need to prompt the user for a new password? */ ++ if (rc == PAM_NEW_AUTHTOK_REQD) ++ rc = pam_chauthtok (pamh, PAM_CHANGE_EXPIRED_AUTHTOK); ++ ++ /* Extend the lifetime of the existing credentials. */ ++ if (rc == PAM_SUCCESS) ++ rc = pam_setcred (pamh, PAM_REFRESH_CRED); ++ ++ return rc; ++} ++ + int + get_password (pam_handle_t * pamh, const char *username, const char *tty) + { +@@ -84,6 +103,23 @@ get_password (pam_handle_t * pamh, const char *username, const char *tty) + switch (rc) + { + case PAM_SUCCESS: ++ rc = do_account_password_management (pamh); ++ ++ if (rc != PAM_SUCCESS) ++ { ++ /* ++ * The user was authenticated but ++ * either account or password management ++ * returned an error. ++ */ ++ printf ("%s.\n\n\n", ++ pam_strerror (pamh, rc)); ++ fflush (stdout); ++ pam_end (pamh, rc); ++ pamh = 0; ++ break; ++ } ++ + pam_end (pamh, rc); + /* Log the fact of console unlocking. */ + syslog (LOG_NOTICE, diff --git a/system/base/kbd/files/mandriva/kbd-2.0.2-unicode-start-font.patch b/system/base/kbd/files/mandriva/kbd-2.0.2-unicode-start-font.patch new file mode 100644 index 00000000..72d47f40 --- /dev/null +++ b/system/base/kbd/files/mandriva/kbd-2.0.2-unicode-start-font.patch @@ -0,0 +1,15 @@ +diff -up kbd-2.0.2/src/unicode_start.orig kbd-2.0.2/src/unicode_start +--- kbd-2.0.2/src/unicode_start.orig 2014-08-12 14:47:53.019028849 +0200 ++++ kbd-2.0.2/src/unicode_start 2014-08-12 14:54:42.631427602 +0200 +@@ -72,7 +72,10 @@ stty iutf8 + # have a Unicode map attached, or explicitly specified, e.g., + # by giving `def.uni' as a second argument. + +-DEFAULT_UNICODE_FONT=latarcyrheb-sun16 ++# Source /etc/vconsole.conf to get default font ++. /etc/vconsole.conf ++ ++DEFAULT_UNICODE_FONT=$FONT + # Also drdos8x16 is a good candidate. + + case "$#" in diff --git a/system/base/kbd/files/mandriva/kbd-2.0.4-covscan-fixes.patch b/system/base/kbd/files/mandriva/kbd-2.0.4-covscan-fixes.patch new file mode 100644 index 00000000..53601411 --- /dev/null +++ b/system/base/kbd/files/mandriva/kbd-2.0.4-covscan-fixes.patch @@ -0,0 +1,11 @@ +diff -up kbd-2.3.0/src/libkfont/kdmapop.c.orig kbd-2.3.0/src/libkfont/kdmapop.c +--- kbd-2.3.0/src/libkfont/kdmapop.c.orig 2020-04-27 17:53:01.000000000 +0200 ++++ kbd-2.3.0/src/libkfont/kdmapop.c 2020-07-16 09:06:45.246742724 +0200 +@@ -166,6 +166,7 @@ kfont_get_unicodemap(struct kfont_contex + + if (ioctl(fd, GIO_UNIMAP, &ud)) { + KFONT_ERR(ctx, "ioctl(GIO_UNIMAP): %m"); ++ free(ud.entries); + return -1; + } + if (ct != ud.entry_ct) diff --git a/system/base/kbd/pspec.xml b/system/base/kbd/pspec.xml index a8a86fc2..25dcc666 100644 --- a/system/base/kbd/pspec.xml +++ b/system/base/kbd/pspec.xml @@ -12,10 +12,10 @@ app:console Keyboard and console utilities The kbd package contains keytable files and keyboard utilities compatible with kernel version 1.1.54 and later. - https://www.kernel.org/pub/linux/utils/kbd/kbd-2.3.0.tar.xz - https://sourceforge.net/projects/pisilinux/files/source/kbd-latarcyrheb-16-fixed.tar.bz2 - https://sourceforge.net/projects/pisilinux/files/source/kbd-latsun-fonts.tar.bz2 - https://sourceforge.net/projects/pisilinux/files/source/ro_maps.tar.bz2 + https://www.kernel.org/pub/linux/utils/kbd/kbd-2.4.0.tar.xz + https://sourceforge.net/projects/pisilinux/files/source/kbd-latarcyrheb-16-fixed.tar.bz2 + https://sourceforge.net/projects/pisilinux/files/source/kbd-latsun-fonts.tar.bz2 + https://sourceforge.net/projects/pisilinux/files/source/ro_maps.tar.bz2 gettext gzip @@ -24,13 +24,23 @@ - blfs/kbd-2.2.0-backspace-1.patch + blfs/kbd-2.4.0-backspace-1.patch - mandriva/kbd-1.15-mandriva.patch + + + mandriva/kbd-1.15-keycodes-man.patch + mandriva/kbd-1.15-sparc.patch + mandriva/kbd-1.15-unicode_start.patch + mandriva/kbd-1.15.3-dumpkeys-man.patch + mandriva/kbd-1.15.5-loadkeys-search-path.patch + mandriva/kbd-1.15.5-sg-decimal-separator.patch + mandriva/kbd-2.0.2-unicode-start-font.patch + mandriva/kbd-2.0.4-covscan-fixes.patch + @@ -38,7 +48,7 @@ - pisilinux/unicode_start-default-font.patch + pisilinux/tr-keypad-comma.patch pisilinux/tr-no-meta_space.patch pisilinux/trq-capslock-fix.patch @@ -57,6 +67,7 @@ /bin /usr/bin + /usr/lib /usr/share/doc /usr/share/man @@ -78,6 +89,13 @@ + + 2021-06-12 + 2.4.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-12-09 2.3.0