Reviewed-by: Michael Tremer > On 20 May 2024, at 14:35, Adolf Belka wrote: > > - Update from version 2.5.1 to 2.6.4 > - Update of rootfile > - Changelog > 2.6.4 > Use AX_ADD_FORTIFY_SOURCE to avoid redefining _FORTIFY_SOURCE by > @thesamesam in #103 > Do not look up include files in the current working directory by > @DaanDeMeyer in #105 > 2.6.3 > libkfont: > Don't look for fonts in the current directory. > showkey: > Add parameter to allow to change timeout. > po: > Update po files. > 2.6.2 > loadkeys: > Don't look for keymap in the current directory. > keymaps: > Add colemak mod-dh keymaps. > 2.6.1 > libkfont: > Fix font saving from linux kernel if KD_FONT_OP_GET_TALL is available. > Respect font height when writing psf2 header. > keymaps: > Create new 'mac-fr' layout for contemporary French Macs. > 2.6.0 > libkfont: > Leverage KD_FONT_OP_GET/SET_TALL font operations. The new > KD_FONT_OP_GET/SET_TALL font operations allow to load fonts taller > than 32 pixels by dropping the VGA-specific vertical pitch limitation > (requires kernel 6.2 or later). > Use threadsafe strtok_r. > Increase soname version. > setvtrgb: > Fix read from pipe. The pipe is not rewindable, but we don't really > need to rewind() but we need to unread one character. > keymaps: > i386/dvorak/dvorak-de.map: Add dvorak-de.map from console-data. > i386/qwerty/is-latin1.map: the circumflex should also be available in > its original level-3 position. > i386/qwerty/la-latin1.map: Convert the characters expressed in Latin-1 > to the named constants, to ease up transition to Unicode. > pine/en.map: New version of pinephone keyboard map file. > unimaps: > Add mapping for U+25CF. The unicode maps in font files like > eurlatgr.psfu and cp850-8x16.psfu have an entry for U+25CF, but the > plaintext unimap files do not. > tests: > Use strace to track syscalls. Now strace is powerful enough to show > ioctls specific to console configuration. > po: > Update translations (from translationproject.org). > > Signed-off-by: Adolf Belka > --- > config/rootfiles/common/kbd | 12 ++++++++++++ > lfs/kbd | 6 +++--- > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd > index a50a252a9..98c677a6a 100644 > --- a/config/rootfiles/common/kbd > +++ b/config/rootfiles/common/kbd > @@ -332,9 +332,20 @@ lib/kbd/keymaps/i386 > #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/colemak/mod-dh-ansi-us-awing.map.gz > +#lib/kbd/keymaps/i386/colemak/mod-dh-ansi-us-fatz-wide.map.gz > +#lib/kbd/keymaps/i386/colemak/mod-dh-ansi-us-fatz.map.gz > +#lib/kbd/keymaps/i386/colemak/mod-dh-ansi-us-wide.map.gz > +#lib/kbd/keymaps/i386/colemak/mod-dh-ansi-us.map.gz > +#lib/kbd/keymaps/i386/colemak/mod-dh-iso-uk-wide.map.gz > +#lib/kbd/keymaps/i386/colemak/mod-dh-iso-uk.map.gz > +#lib/kbd/keymaps/i386/colemak/mod-dh-iso-us-wide.map.gz > +#lib/kbd/keymaps/i386/colemak/mod-dh-iso-us.map.gz > +#lib/kbd/keymaps/i386/colemak/mod-dh-matrix-us.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-de.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 > @@ -550,6 +561,7 @@ lib/kbd/keymaps/include > #lib/kbd/keymaps/mac/all/mac-dvorak.map.gz > #lib/kbd/keymaps/mac/all/mac-es.map.gz > #lib/kbd/keymaps/mac/all/mac-fi-latin1.map.gz > +#lib/kbd/keymaps/mac/all/mac-fr-legacy.map.gz > #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 > diff --git a/lfs/kbd b/lfs/kbd > index 9dbd0f421..5b250482e 100644 > --- a/lfs/kbd > +++ b/lfs/kbd > @@ -1,7 +1,7 @@ > ############################################################################### > # # > # IPFire.org - A linux based firewall # > -# Copyright (C) 2007-2022 IPFire Team # > +# Copyright (C) 2007-2024 IPFire Team # > # # > # 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 # > @@ -24,7 +24,7 @@ > > include Config > > -VER = 2.5.1 > +VER = 2.6.4 > > THISAPP = kbd-$(VER) > DL_FILE = $(THISAPP).tar.xz > @@ -42,7 +42,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > 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)_BLAKE2 = aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae > +$(DL_FILE)_BLAKE2 = 25e55be0210c206c1f5eb0d85045bb1cbb2442cf88fb7eb28f7bbb8dd0d86473f48444fd9d80dfc624ce7ba8b39bfe1152ee6cf1877fab444e09600e93dae0ee > kbd-latarcyrheb-16-fixed.tar.bz2_BLAKE2 = d5c701333b9eae7e0c467aebee5b2217c3225dee615622f77e501569f1464a8c32380b2d4a522730db74a909e1ea746e660ea6849bbf48195af22bda73858d1b > kbd-latsun-fonts.tar.bz2_BLAKE2 = c3def1192331a65f3edcf608ca164370d2db0c61444f71fc83bf35cb86d417ae92582180ace853a3cf93e569a83a42fca054fbadbf7f5986a1abd17e8bb6691f > > -- > 2.44.0 >