kbd: Update to 2.2.0

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd
index 5f694ff0c900070fcb661fa8baf9e1e9402704ec..7f32965599c0b57570d11af564d2ef5d0fea216c 100644 (file)
--- a/config/rootfiles/common/kbd
+++ b/config/rootfiles/common/kbd
@@ -26,11 +26,15 @@ bin/setfont
 #lib/kbd/consolefonts/GohaClassic-12.psfu.gz
 #lib/kbd/consolefonts/GohaClassic-14.psfu.gz
 #lib/kbd/consolefonts/GohaClassic-16.psfu.gz
+#lib/kbd/consolefonts/Lat2-Terminus16.psfu.gz
 #lib/kbd/consolefonts/LatArCyrHeb-08.psfu.gz
 #lib/kbd/consolefonts/LatArCyrHeb-14.psfu.gz
 lib/kbd/consolefonts/LatArCyrHeb-16+.psfu.gz
 lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
 #lib/kbd/consolefonts/LatArCyrHeb-19.psfu.gz
+#lib/kbd/consolefonts/LatGrkCyr-12x22.psfu.gz
+#lib/kbd/consolefonts/LatGrkCyr-8x16.psfu.gz
+#lib/kbd/consolefonts/LatKaCyrHeb-14.psfu.gz
 #lib/kbd/consolefonts/Mik_8x16.gz
 #lib/kbd/consolefonts/README.12x22
 #lib/kbd/consolefonts/README.Arabic
@@ -38,13 +42,22 @@ lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
 #lib/kbd/consolefonts/README.Ethiopic
 #lib/kbd/consolefonts/README.Greek
 #lib/kbd/consolefonts/README.Hebrew
+#lib/kbd/consolefonts/README.Lat2-Terminus16
+#lib/kbd/consolefonts/README.LatGrkCyr
+#lib/kbd/consolefonts/README.Sun
 #lib/kbd/consolefonts/README.cp1250
 #lib/kbd/consolefonts/README.cybercafe
 #lib/kbd/consolefonts/README.drdos
+#lib/kbd/consolefonts/README.eurlatgr
+#lib/kbd/consolefonts/README.eurlatgr.mappings
 #lib/kbd/consolefonts/README.lat0
 #lib/kbd/consolefonts/README.lat7
 #lib/kbd/consolefonts/README.lat9
 #lib/kbd/consolefonts/README.psfu
+#lib/kbd/consolefonts/UniCyrExt_8x16.psf.gz
+#lib/kbd/consolefonts/UniCyr_8x14.psf.gz
+#lib/kbd/consolefonts/UniCyr_8x16.psf.gz
+#lib/kbd/consolefonts/UniCyr_8x8.psf.gz
 #lib/kbd/consolefonts/alt-8x14.gz
 #lib/kbd/consolefonts/alt-8x16.gz
 #lib/kbd/consolefonts/alt-8x8.gz
@@ -72,6 +85,7 @@ lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
 #lib/kbd/consolefonts/drdos8x16.psfu.gz
 #lib/kbd/consolefonts/drdos8x6.psfu.gz
 #lib/kbd/consolefonts/drdos8x8.psfu.gz
+#lib/kbd/consolefonts/eurlatgr.psfu.gz
 #lib/kbd/consolefonts/gr737a-8x8.psfu.gz
 #lib/kbd/consolefonts/gr737a-9x14.psfu.gz
 #lib/kbd/consolefonts/gr737a-9x16.psfu.gz
@@ -191,6 +205,8 @@ lib/kbd/consolefonts/lat5-16.psfu.gz
 #lib/kbd/consolefonts/lat9w-14.psfu.gz
 #lib/kbd/consolefonts/lat9w-16.psfu.gz
 lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz
+#lib/kbd/consolefonts/latarcyrheb-sun32.psfu.gz
+#lib/kbd/consolefonts/pancyrillic.f16.psfu.gz
 #lib/kbd/consolefonts/partialfonts
 #lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.08.gz
 #lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.14.gz
@@ -307,10 +323,29 @@ lib/kbd/keymaps/i386
 #lib/kbd/keymaps/i386/azerty/fr.map.gz
 #lib/kbd/keymaps/i386/azerty/wangbe.map.gz
 #lib/kbd/keymaps/i386/azerty/wangbe2.map.gz
+#lib/kbd/keymaps/i386/bepo
+#lib/kbd/keymaps/i386/bepo/fr-bepo-latin9.map.gz
+#lib/kbd/keymaps/i386/bepo/fr-bepo.map.gz
+#lib/kbd/keymaps/i386/carpalx
+#lib/kbd/keymaps/i386/carpalx/carpalx-full.map.gz
+#lib/kbd/keymaps/i386/carpalx/carpalx.map.gz
+#lib/kbd/keymaps/i386/colemak
+#lib/kbd/keymaps/i386/colemak/en-latin9.map.gz
 #lib/kbd/keymaps/i386/dvorak
 #lib/kbd/keymaps/i386/dvorak/ANSI-dvorak.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-ca-fr.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-es.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-fr.map.gz
 #lib/kbd/keymaps/i386/dvorak/dvorak-l.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-la.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-no.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-programmer.map.gz
 #lib/kbd/keymaps/i386/dvorak/dvorak-r.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-ru.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-sv-a1.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-sv-a5.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-uk.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-ukp.map.gz
 #lib/kbd/keymaps/i386/dvorak/dvorak.map.gz
 #lib/kbd/keymaps/i386/fgGIod
 #lib/kbd/keymaps/i386/fgGIod/tr_f-latin5.map.gz
@@ -319,6 +354,7 @@ lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/include/applkey.map.gz
 #lib/kbd/keymaps/i386/include/azerty-layout.inc
 #lib/kbd/keymaps/i386/include/backspace.map.gz
+#lib/kbd/keymaps/i386/include/compose.inc
 #lib/kbd/keymaps/i386/include/ctrl.map.gz
 #lib/kbd/keymaps/i386/include/euro.map.gz
 #lib/kbd/keymaps/i386/include/euro1.inc
@@ -334,7 +370,11 @@ lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/include/qwertz-layout.inc
 #lib/kbd/keymaps/i386/include/unicode.map.gz
 #lib/kbd/keymaps/i386/include/windowkeys.map.gz
+#lib/kbd/keymaps/i386/olpc
+#lib/kbd/keymaps/i386/olpc/es.map.gz
+#lib/kbd/keymaps/i386/olpc/pt.map.gz
 #lib/kbd/keymaps/i386/qwerty
+#lib/kbd/keymaps/i386/qwerty/bashkir.map.gz
 #lib/kbd/keymaps/i386/qwerty/bg-cp1251.map.gz
 #lib/kbd/keymaps/i386/qwerty/bg-cp855.map.gz
 #lib/kbd/keymaps/i386/qwerty/bg_bds-cp1251.map.gz
@@ -345,7 +385,9 @@ lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwerty/br-abnt2.map.gz
 #lib/kbd/keymaps/i386/qwerty/br-latin1-abnt2.map.gz
 #lib/kbd/keymaps/i386/qwerty/br-latin1-us.map.gz
+#lib/kbd/keymaps/i386/qwerty/by-cp1251.map.gz
 #lib/kbd/keymaps/i386/qwerty/by.map.gz
+#lib/kbd/keymaps/i386/qwerty/bywin-cp1251.map.gz
 #lib/kbd/keymaps/i386/qwerty/cf.map.gz
 #lib/kbd/keymaps/i386/qwerty/cz-cp1250.map.gz
 #lib/kbd/keymaps/i386/qwerty/cz-lat2-prog.map.gz
@@ -361,8 +403,7 @@ lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwerty/es.map.gz
 #lib/kbd/keymaps/i386/qwerty/et-nodeadkeys.map.gz
 #lib/kbd/keymaps/i386/qwerty/et.map.gz
-#lib/kbd/keymaps/i386/qwerty/fi-latin1.map.gz
-#lib/kbd/keymaps/i386/qwerty/fi-latin9.map.gz
+#lib/kbd/keymaps/i386/qwerty/fa.map.gz
 #lib/kbd/keymaps/i386/qwerty/fi.map.gz
 #lib/kbd/keymaps/i386/qwerty/gr-pc.map.gz
 #lib/kbd/keymaps/i386/qwerty/gr.map.gz
@@ -377,10 +418,15 @@ lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwerty/it.map.gz
 #lib/kbd/keymaps/i386/qwerty/it2.map.gz
 #lib/kbd/keymaps/i386/qwerty/jp106.map.gz
+#lib/kbd/keymaps/i386/qwerty/kazakh.map.gz
+#lib/kbd/keymaps/i386/qwerty/ky_alt_sh-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/kyrgyz.map.gz
 #lib/kbd/keymaps/i386/qwerty/la-latin1.map.gz
 #lib/kbd/keymaps/i386/qwerty/lt.baltic.map.gz
 #lib/kbd/keymaps/i386/qwerty/lt.l4.map.gz
 #lib/kbd/keymaps/i386/qwerty/lt.map.gz
+#lib/kbd/keymaps/i386/qwerty/lv-tilde.map.gz
+#lib/kbd/keymaps/i386/qwerty/lv.map.gz
 #lib/kbd/keymaps/i386/qwerty/mk-cp1251.map.gz
 #lib/kbd/keymaps/i386/qwerty/mk-utf.map.gz
 #lib/kbd/keymaps/i386/qwerty/mk.map.gz
@@ -392,9 +438,14 @@ lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwerty/no.map.gz
 #lib/kbd/keymaps/i386/qwerty/pc110.map.gz
 #lib/kbd/keymaps/i386/qwerty/pl.map.gz
+#lib/kbd/keymaps/i386/qwerty/pl1.map.gz
 #lib/kbd/keymaps/i386/qwerty/pl2.map.gz
+#lib/kbd/keymaps/i386/qwerty/pl3.map.gz
+#lib/kbd/keymaps/i386/qwerty/pl4.map.gz
 #lib/kbd/keymaps/i386/qwerty/pt-latin1.map.gz
 #lib/kbd/keymaps/i386/qwerty/pt-latin9.map.gz
+#lib/kbd/keymaps/i386/qwerty/ro.map.gz
+#lib/kbd/keymaps/i386/qwerty/ro_std.map.gz
 #lib/kbd/keymaps/i386/qwerty/ro_win.map.gz
 #lib/kbd/keymaps/i386/qwerty/ru-cp1251.map.gz
 #lib/kbd/keymaps/i386/qwerty/ru-ms.map.gz
@@ -405,6 +456,19 @@ lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwerty/ru3.map.gz
 #lib/kbd/keymaps/i386/qwerty/ru4.map.gz
 #lib/kbd/keymaps/i386/qwerty/ru_win.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_alt-CP1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_alt-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_cplk-CP1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ct_sh-CP1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ct_sh-KOI8-R.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ct_sh-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ctrl-CP1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ctrl-KOI8-R.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ctrl-UTF-8.map.gz
 #lib/kbd/keymaps/i386/qwerty/se-fi-ir209.map.gz
 #lib/kbd/keymaps/i386/qwerty/se-fi-lat6.map.gz
 #lib/kbd/keymaps/i386/qwerty/se-ir209.map.gz
@@ -413,9 +477,16 @@ lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwerty/sk-qwerty.map.gz
 #lib/kbd/keymaps/i386/qwerty/sr-cy.map.gz
 #lib/kbd/keymaps/i386/qwerty/sv-latin1.map.gz
+#lib/kbd/keymaps/i386/qwerty/tj_alt-UTF8.map.gz
 #lib/kbd/keymaps/i386/qwerty/tr_q-latin5.map.gz
 #lib/kbd/keymaps/i386/qwerty/tralt.map.gz
+#lib/kbd/keymaps/i386/qwerty/trf.map.gz
 #lib/kbd/keymaps/i386/qwerty/trq.map.gz
+#lib/kbd/keymaps/i386/qwerty/ttwin_alt-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ttwin_cplk-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ttwin_ct_sh-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ttwin_ctrl-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ua-cp1251.map.gz
 #lib/kbd/keymaps/i386/qwerty/ua-utf-ws.map.gz
 #lib/kbd/keymaps/i386/qwerty/ua-utf.map.gz
 #lib/kbd/keymaps/i386/qwerty/ua-ws.map.gz
@@ -426,10 +497,13 @@ lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwertz
 #lib/kbd/keymaps/i386/qwertz/croat.map.gz
 #lib/kbd/keymaps/i386/qwertz/cz-us-qwertz.map.gz
+#lib/kbd/keymaps/i386/qwertz/cz.map.gz
 #lib/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz
 #lib/kbd/keymaps/i386/qwertz/de-latin1.map.gz
+#lib/kbd/keymaps/i386/qwertz/de-mobii.map.gz
 #lib/kbd/keymaps/i386/qwertz/de.map.gz
 #lib/kbd/keymaps/i386/qwertz/de_CH-latin1.map.gz
+#lib/kbd/keymaps/i386/qwertz/de_alt_UTF-8.map.gz
 #lib/kbd/keymaps/i386/qwertz/fr_CH-latin1.map.gz
 #lib/kbd/keymaps/i386/qwertz/fr_CH.map.gz
 #lib/kbd/keymaps/i386/qwertz/hu.map.gz
@@ -439,6 +513,7 @@ lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwertz/sk-prog-qwertz.map.gz
 #lib/kbd/keymaps/i386/qwertz/sk-qwertz.map.gz
 #lib/kbd/keymaps/i386/qwertz/slovene.map.gz
+#lib/kbd/keymaps/i386/qwertz/sr-latin.map.gz
 lib/kbd/keymaps/include
 #lib/kbd/keymaps/include/compose.8859_7
 #lib/kbd/keymaps/include/compose.8859_8
@@ -450,6 +525,11 @@ lib/kbd/keymaps/include
 #lib/kbd/keymaps/include/vim-compose.latin1
 #lib/kbd/keymaps/mac
 #lib/kbd/keymaps/mac/all
+#lib/kbd/keymaps/mac/all/apple-a1048-sv.map.gz
+#lib/kbd/keymaps/mac/all/apple-a1243-sv-fn-reverse.map.gz
+#lib/kbd/keymaps/mac/all/apple-a1243-sv.map.gz
+#lib/kbd/keymaps/mac/all/apple-internal-0x0253-sv-fn-reverse.map.gz
+#lib/kbd/keymaps/mac/all/apple-internal-0x0253-sv.map.gz
 #lib/kbd/keymaps/mac/all/mac-be.map.gz
 #lib/kbd/keymaps/mac/all/mac-de-latin1-nodeadkeys.map.gz
 #lib/kbd/keymaps/mac/all/mac-de-latin1.map.gz
@@ -461,14 +541,20 @@ lib/kbd/keymaps/include
 #lib/kbd/keymaps/mac/all/mac-fr.map.gz
 #lib/kbd/keymaps/mac/all/mac-fr_CH-latin1.map.gz
 #lib/kbd/keymaps/mac/all/mac-it.map.gz
+#lib/kbd/keymaps/mac/all/mac-no-latin1.map.gz
+#lib/kbd/keymaps/mac/all/mac-pl.map.gz
 #lib/kbd/keymaps/mac/all/mac-pt-latin1.map.gz
 #lib/kbd/keymaps/mac/all/mac-se.map.gz
 #lib/kbd/keymaps/mac/all/mac-template.map.gz
 #lib/kbd/keymaps/mac/all/mac-uk.map.gz
 #lib/kbd/keymaps/mac/all/mac-us.map.gz
 #lib/kbd/keymaps/mac/include
+#lib/kbd/keymaps/mac/include/apple-a1048-base.inc
+#lib/kbd/keymaps/mac/include/apple-a1243-fn-reverse.inc
+#lib/kbd/keymaps/mac/include/apple-a1243-fn.inc
 #lib/kbd/keymaps/mac/include/mac-azerty-layout.inc
 #lib/kbd/keymaps/mac/include/mac-euro.map.gz
+#lib/kbd/keymaps/mac/include/mac-euro2.map.gz
 #lib/kbd/keymaps/mac/include/mac-linux-keys-bare.inc
 #lib/kbd/keymaps/mac/include/mac-qwerty-layout.inc
 #lib/kbd/keymaps/mac/include/mac-qwertz-layout.inc
@@ -489,6 +575,65 @@ lib/kbd/keymaps/include
 #lib/kbd/keymaps/sun/sunt5-ru.map.gz
 #lib/kbd/keymaps/sun/sunt5-uk.map.gz
 #lib/kbd/keymaps/sun/sunt5-us-cz.map.gz
+#lib/kbd/keymaps/sun/sunt6-uk.map.gz
+#lib/kbd/locale
+#lib/kbd/locale/cs
+#lib/kbd/locale/cs/LC_MESSAGES
+#lib/kbd/locale/cs/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/da
+#lib/kbd/locale/da/LC_MESSAGES
+#lib/kbd/locale/da/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/de
+#lib/kbd/locale/de/LC_MESSAGES
+#lib/kbd/locale/de/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/el
+#lib/kbd/locale/el/LC_MESSAGES
+#lib/kbd/locale/el/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/eo
+#lib/kbd/locale/eo/LC_MESSAGES
+#lib/kbd/locale/eo/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/es
+#lib/kbd/locale/es/LC_MESSAGES
+#lib/kbd/locale/es/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/fr
+#lib/kbd/locale/fr/LC_MESSAGES
+#lib/kbd/locale/fr/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/gr
+#lib/kbd/locale/gr/LC_MESSAGES
+#lib/kbd/locale/gr/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/id
+#lib/kbd/locale/id/LC_MESSAGES
+#lib/kbd/locale/id/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/it
+#lib/kbd/locale/it/LC_MESSAGES
+#lib/kbd/locale/it/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/nl
+#lib/kbd/locale/nl/LC_MESSAGES
+#lib/kbd/locale/nl/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/pl
+#lib/kbd/locale/pl/LC_MESSAGES
+#lib/kbd/locale/pl/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/ro
+#lib/kbd/locale/ro/LC_MESSAGES
+#lib/kbd/locale/ro/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/ru
+#lib/kbd/locale/ru/LC_MESSAGES
+#lib/kbd/locale/ru/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/sv
+#lib/kbd/locale/sv/LC_MESSAGES
+#lib/kbd/locale/sv/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/tr
+#lib/kbd/locale/tr/LC_MESSAGES
+#lib/kbd/locale/tr/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/uk
+#lib/kbd/locale/uk/LC_MESSAGES
+#lib/kbd/locale/uk/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/vi
+#lib/kbd/locale/vi/LC_MESSAGES
+#lib/kbd/locale/vi/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/zh_CN
+#lib/kbd/locale/zh_CN/LC_MESSAGES
+#lib/kbd/locale/zh_CN/LC_MESSAGES/kbd.mo
 lib/kbd/unimaps
 #lib/kbd/unimaps/8859-1.a0-ff.uni
 #lib/kbd/unimaps/8859-10.a0-ff.uni
@@ -559,7 +704,7 @@ usr/bin/deallocvt
 usr/bin/dumpkeys
 usr/bin/fgconsole
 usr/bin/getkeycodes
-usr/bin/getunimap
+usr/bin/kbdinfo
 #usr/bin/kbdrate
 usr/bin/loadunimap
 #usr/bin/mapscrn
@@ -570,9 +715,8 @@ usr/bin/loadunimap
 #usr/bin/resizecons
 usr/bin/setkeycodes
 usr/bin/setleds
-usr/bin/setlogcons
 usr/bin/setmetamode
-usr/bin/setvesablank
+usr/bin/setvtrgb
 usr/bin/showconsolefont
 usr/bin/showkey
 usr/bin/unicode_start
@@ -582,6 +726,7 @@ usr/bin/unicode_stop
 #usr/share/man/man1/dumpkeys.1
 #usr/share/man/man1/fgconsole.1
 #usr/share/man/man1/kbd_mode.1
+#usr/share/man/man1/kbdinfo.1
 #usr/share/man/man1/loadkeys.1
 #usr/share/man/man1/openvt.1
 #usr/share/man/man1/psfaddtable.1
@@ -595,12 +740,11 @@ usr/bin/unicode_stop
 #usr/share/man/man1/unicode_stop.1
 #usr/share/man/man5/keymaps.5
 #usr/share/man/man8/getkeycodes.8
-#usr/share/man/man8/getunimap.8
 #usr/share/man/man8/kbdrate.8
 #usr/share/man/man8/loadunimap.8
 #usr/share/man/man8/mapscrn.8
 #usr/share/man/man8/resizecons.8
 #usr/share/man/man8/setfont.8
 #usr/share/man/man8/setkeycodes.8
-#usr/share/man/man8/setvesablank.8
+#usr/share/man/man8/setvtrgb.8
 #usr/share/man/man8/showconsolefont.8

diff --git a/lfs/kbd b/lfs/kbd
index b126f27a7d5aa0b225c1773ed4a5da2d39d52501..590f8afe702a3ccbb734f53fbebe2d4fe2a7ef7d 100644 (file)
--- a/lfs/kbd
+++ b/lfs/kbd
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.12
+VER        = 2.2.0
 
 THISAPP    = kbd-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -35,16 +35,14 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch \
+objects = $(DL_FILE) \
        kbd-latarcyrheb-16-fixed.tar.bz2 kbd-latsun-fonts.tar.bz2
 
 $(DL_FILE)                            = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-more-programs-1.patch      = $(DL_FROM)/kbd-$(VER)-more-programs-1.patch
 kbd-latarcyrheb-16-fixed.tar.bz2      = $(DL_FROM)/kbd-latarcyrheb-16-fixed.tar.bz2
 kbd-latsun-fonts.tar.bz2              = $(DL_FROM)/kbd-latsun-fonts.tar.bz2
 
-$(DL_FILE)_MD5                        = 069d1175b4891343b107a8ac2b4a39f6
-$(THISAPP)-more-programs-1.patch_MD5  = dc70180a6bc0afa2b741cd38e3cc2e18
+$(DL_FILE)_MD5                        = d1d7ae0b5fb875dc082731e09cd0c8bc
 kbd-latarcyrheb-16-fixed.tar.bz2_MD5  = 884fdbb0b952b2e3e8389a0c40a3e301
 kbd-latsun-fonts.tar.bz2_MD5          = e22ee88353968df8d4a4b1bf1fa8fc31
 
@@ -75,18 +73,19 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-more-programs-1.patch
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-backspace-1.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-1.patch
 
        # Extract our own fonts
        cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latarcyrheb-16-fixed.tar.bz2
        cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latsun-fonts.tar.bz2
 
-       cd $(DIR_APP) && ./configure --datadir=/lib/kbd --disable-nls
+       cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/lib/kbd --disable-vlock
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin
+
+       # Move some tools to /bin
+       mv -v /usr/bin/{loadkeys,kbd_mode,openvt,setfont} /bin
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/patches/kbd-2.2.0-backspace-1.patch b/src/patches/kbd-2.2.0-backspace-1.patch
new file mode 100644 (file)
index 0000000..8fec171
--- /dev/null
+++ b/src/patches/kbd-2.2.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 <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