kbd: Update to 2.5.1

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kbd/kbd.nm b/kbd/kbd.nm
index fbc57c7e6cb4ca42addbb7aec268f37cffb3114f..4625a1c65c2efe80ef1f6ce9cedc8e83dbad330c 100644 (file)
--- a/kbd/kbd.nm
+++ b/kbd/kbd.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = kbd
-version    = 1.15.3
-release    = 2
+version    = 2.5.1
+release    = 1
 
 groups     = System/Base
-url        = http://ftp.altlinux.org/pub/people/legion/kbd
+url        = http://www.kbd-project.org/
 license    = GPLv2+
 summary    = Tools for configuring the console (keyboard, virtual terminals, etc.).
 
@@ -18,15 +18,17 @@ description
        fonts, the virtual terminals and font files.
 end
 
-source_dl  =
-sources   += kbd-latarcyrheb-16-fixed.tar.bz2
-sources   += kbd-latsun-fonts.tar.bz2
+source_dl  = https://github.com/legionus/kbd/archive/refs/tags/v%{version}.tar.gz/#
+sources    = %{thisapp}.tar.gz
 
 build
        requires
+               autoconf
+               automake
                bison
                flex
-               gettext
+               gettext-devel
+               pam-devel
        end
 
        configure_options += \
@@ -35,15 +37,8 @@ build
                --enable-nls
 
        prepare_cmds
-               # Adding our own fonts.
-               cd %{DIR_APP}
-               %{MACRO_EXTRACT} %{DIR_DL}/kbd-latarcyrheb-16-fixed.tar.bz2
-               %{MACRO_EXTRACT} %{DIR_DL}/kbd-latsun-fonts.tar.bz2
-
                # 7-bit maps are obsolete; so are non-euro maps
                cd %{DIR_APP}/data/keymaps/i386
-               mv qwerty/fi.map qwerty/fi-old.map
-               cp qwerty/fi-latin9.map qwerty/fi.map
                cp qwerty/pt-latin9.map qwerty/pt.map
                cp qwerty/sv-latin1.map qwerty/se-latin1.map
                mv azerty/fr.map azerty/fr-old.map
@@ -51,7 +46,6 @@ build
                cp azerty/fr-latin9.map azerty/fr-latin0.map
 
                # Rename conflicting keymaps
-               mv dvorak/no.map dvorak/no-dvorak.map
                mv fgGIod/trf.map fgGIod/trf-fgGIod.map
                mv olpc/es.map olpc/es-olpc.map
                mv olpc/pt.map olpc/pt-olpc.map
@@ -60,6 +54,9 @@ build
                # remove obsolete "gr" translation
                cd %{DIR_APP}/po
                rm -f gr.po gr.gmo
+
+               # Run autogen
+               cd %{DIR_APP} && ./autogen.sh
        end
 end
 

diff --git a/kbd/patches/kbd-1.15-defkeymap.patch b/kbd/patches/kbd-1.15-defkeymap.patch
deleted file mode 100644 (file)
index 5e604b7..0000000
--- a/kbd/patches/kbd-1.15-defkeymap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kbd-1.15/src/paths.h.orig kbd-1.15/src/paths.h
---- kbd-1.15/src/paths.h.orig  2010-06-07 15:26:21.787315778 +0200
-+++ kbd-1.15/src/paths.h       2010-06-07 15:26:49.353336391 +0200
-@@ -19,7 +19,7 @@
- # define DEFMAP "sunkeymap.kmap"
- # define KERNDIR "/usr/src/linux/drivers/sbus/char"
- #else
--# define DEFMAP "defkeymap.kmap"
-+# define DEFMAP "defkeymap.map"
- # define KERNDIR "/usr/src/linux/drivers/char"
- #endif
- 

diff --git a/kbd/patches/kbd-1.15-keycodes-man.patch b/kbd/patches/kbd-1.15-keycodes-man.patch
deleted file mode 100644 (file)
index d18a8c8..0000000
--- a/kbd/patches/kbd-1.15-keycodes-man.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1
---- kbd-1.15/man/man1/showkey.1_old    2008-03-13 17:46:23.000000000 +0100
-+++ kbd-1.15/man/man1/showkey.1        2008-12-10 12:31:38.000000000 +0100
-@@ -80,6 +80,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-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8
---- kbd-1.15/man/man8/setkeycodes.8_old        2008-12-10 12:31:56.000000000 +0100
-+++ kbd-1.15/man/man8/setkeycodes.8    2008-12-10 12:37:36.000000000 +0100
-@@ -41,6 +41,10 @@ to showkey(1), the command
- will assign the keycode 112 to it, and then 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.
-+
- .SH "2.6 KERNELS"
- In 2.6 kernels key codes lie in the range 1-255, instead of 1-127.
- (It might be best to confine oneself to the range 1-239.)
-@@ -54,6 +58,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"
- .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)"
- 

diff --git a/kbd/patches/kbd-1.15-resizecon-x86_64.patch b/kbd/patches/kbd-1.15-resizecon-x86_64.patch
deleted file mode 100644 (file)
index 5e8350a..0000000
--- a/kbd/patches/kbd-1.15-resizecon-x86_64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up kbd-1.15/configure_old kbd-1.15/configure
---- kbd-1.15/configure_old     2009-01-08 15:11:04.000000000 +0100
-+++ kbd-1.15/configure 2009-01-08 15:11:45.000000000 +0100
-@@ -7637,8 +7637,9 @@ fi
- 
- 
- case $host_cpu in
--      i?86*) RESIZECONS_PROGS=yes ;;
--      *)     RESIZECONS_PROGS=no ;;
-+      i?86*)   RESIZECONS_PROGS=yes ;;
-+      x86_64*) RESIZECONS_PROGS=yes ;;
-+      *)       RESIZECONS_PROGS=no ;;
- esac
-  if test "$RESIZECONS_PROGS" = "yes"; then
-   RESIZECONS_PROGS_TRUE=

diff --git a/kbd/patches/kbd-1.15-unicode_start.patch b/kbd/patches/kbd-1.15-unicode_start.patch
deleted file mode 100644 (file)
index 41827cc..0000000
--- a/kbd/patches/kbd-1.15-unicode_start.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start
---- kbd-1.15/src/unicode_start_old     2009-01-08 13:34:10.000000000 +0100
-+++ kbd-1.15/src/unicode_start 2009-01-08 14:02:12.000000000 +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/kbd/patches/kbd-1.15.3-dumpkeys-man.patch b/kbd/patches/kbd-1.15.3-dumpkeys-man.patch
deleted file mode 100644 (file)
index e77718b..0000000
--- a/kbd/patches/kbd-1.15.3-dumpkeys-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up kbd-1.15.3/man/man1/dumpkeys.1.in.orig kbd-1.15.3/man/man1/dumpkeys.1.in
---- kbd-1.15.3/man/man1/dumpkeys.1.in.orig     2011-08-23 13:06:16.905892768 +0200
-+++ kbd-1.15.3/man/man1/dumpkeys.1.in  2011-08-23 13:15:18.264853435 +0200
-@@ -156,6 +156,14 @@ output of
- .BR dumpkeys .
- .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 \-\-funcs-only
- When this option is given,
- .B dumpkeys

diff --git a/kbd/patches/kbd-1.15.3-fix-es-translation.patch b/kbd/patches/kbd-1.15.3-fix-es-translation.patch
deleted file mode 100644 (file)
index 9d43d8d..0000000
--- a/kbd/patches/kbd-1.15.3-fix-es-translation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kbd-1.15.3/po/es.po.orig kbd-1.15.3/po/es.po
---- kbd-1.15.3/po/es.po.orig   2011-08-22 15:18:35.262343023 +0200
-+++ kbd-1.15.3/po/es.po        2011-08-22 15:19:14.844340262 +0200
-@@ -1363,7 +1363,7 @@ msgstr "No se encontró nada que guardar
- #: src/setfont.c:682
- #, c-format
- msgid "Saved %d-char %dx%d font file on %s\n"
--msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
-+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
- 
- #: src/setkeycodes.c:21
- #, c-format

diff --git a/kbd/patches/kbd-2.5.1-backspace-1.patch b/kbd/patches/kbd-2.5.1-backspace-1.patch
new file mode 100644 (file)
index 0000000..8fec171
--- /dev/null
+++ b/kbd/patches/kbd-2.5.1-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 <ken at linuxfromscratch dot org>.
+Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
+
+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 <Enter> 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 <Enter> 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 <kjetilho@ifi.uio.no>
+ 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/kbd/vlock.pamd b/kbd/vlock.pamd
new file mode 100644 (file)
index 0000000..d2d47e5
--- /dev/null
+++ b/kbd/vlock.pamd
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth       include      system-auth
+account    required     pam_permit.so