* [PATCH] kbd: Update to 2.5.1
@ 2022-08-07 9:44 Peter Müller
0 siblings, 0 replies; 2+ messages in thread
From: Peter Müller @ 2022-08-07 9:44 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 8481 bytes --]
Changes since 2.2.0 can be obtained from https://github.com/legionus/kbd/releases.
See also: #12857
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
config/rootfiles/common/kbd | 96 +++++++++++++++----------------------
lfs/kbd | 8 ++--
2 files changed, 42 insertions(+), 62 deletions(-)
diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd
index 7f3296559..3c18ff27e 100644
--- a/config/rootfiles/common/kbd
+++ b/config/rootfiles/common/kbd
@@ -249,6 +249,7 @@ lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz
#lib/kbd/consolefonts/partialfonts/none.00-17.16.gz
#lib/kbd/consolefonts/ruscii_8x16.psfu.gz
#lib/kbd/consolefonts/ruscii_8x8.psfu.gz
+#lib/kbd/consolefonts/solar24x32.psfu.gz
#lib/kbd/consolefonts/sun12x22.psfu.gz
#lib/kbd/consolefonts/t.fnt.gz
#lib/kbd/consolefonts/t850b.fnt.gz
@@ -370,6 +371,14 @@ 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/neo
+#lib/kbd/keymaps/i386/neo/3l.map.gz
+#lib/kbd/keymaps/i386/neo/README.md
+#lib/kbd/keymaps/i386/neo/adnw.map.gz
+#lib/kbd/keymaps/i386/neo/bone.map.gz
+#lib/kbd/keymaps/i386/neo/koy.map.gz
+#lib/kbd/keymaps/i386/neo/neo.map.gz
+#lib/kbd/keymaps/i386/neo/neoqwertz.map.gz
#lib/kbd/keymaps/i386/olpc
#lib/kbd/keymaps/i386/olpc/es.map.gz
#lib/kbd/keymaps/i386/olpc/pt.map.gz
@@ -388,6 +397,7 @@ lib/kbd/keymaps/i386/include
#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/ca.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
@@ -409,6 +419,7 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/qwerty/gr.map.gz
#lib/kbd/keymaps/i386/qwerty/hu101.map.gz
#lib/kbd/keymaps/i386/qwerty/hypermap.m4
+#lib/kbd/keymaps/i386/qwerty/ie.map.gz
#lib/kbd/keymaps/i386/qwerty/il-heb.map.gz
#lib/kbd/keymaps/i386/qwerty/il-phonetic.map.gz
#lib/kbd/keymaps/i386/qwerty/il.map.gz
@@ -494,6 +505,7 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/qwerty/uk.map.gz
#lib/kbd/keymaps/i386/qwerty/us-acentos.map.gz
#lib/kbd/keymaps/i386/qwerty/us.map.gz
+#lib/kbd/keymaps/i386/qwerty/us1.map.gz
#lib/kbd/keymaps/i386/qwertz
#lib/kbd/keymaps/i386/qwertz/croat.map.gz
#lib/kbd/keymaps/i386/qwertz/cz-us-qwertz.map.gz
@@ -558,6 +570,8 @@ lib/kbd/keymaps/include
#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
+#lib/kbd/keymaps/pine
+#lib/kbd/keymaps/pine/en.map.gz
#lib/kbd/keymaps/ppc
#lib/kbd/keymaps/sun
#lib/kbd/keymaps/sun/sun-pl-altgraph.map.gz
@@ -576,64 +590,6 @@ lib/kbd/keymaps/include
#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
@@ -721,6 +677,30 @@ usr/bin/showconsolefont
usr/bin/showkey
usr/bin/unicode_start
usr/bin/unicode_stop
+#usr/share/locale/cs/LC_MESSAGES/kbd.mo
+#usr/share/locale/da/LC_MESSAGES/kbd.mo
+#usr/share/locale/de/LC_MESSAGES/kbd.mo
+#usr/share/locale/el/LC_MESSAGES/kbd.mo
+#usr/share/locale/eo/LC_MESSAGES/kbd.mo
+#usr/share/locale/es/LC_MESSAGES/kbd.mo
+#usr/share/locale/fr/LC_MESSAGES/kbd.mo
+#usr/share/locale/gr
+#usr/share/locale/gr/LC_MESSAGES
+#usr/share/locale/gr/LC_MESSAGES/kbd.mo
+#usr/share/locale/id/LC_MESSAGES/kbd.mo
+#usr/share/locale/it/LC_MESSAGES/kbd.mo
+#usr/share/locale/nl/LC_MESSAGES/kbd.mo
+#usr/share/locale/pl/LC_MESSAGES/kbd.mo
+#usr/share/locale/pt/LC_MESSAGES/kbd.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/kbd.mo
+#usr/share/locale/ro/LC_MESSAGES/kbd.mo
+#usr/share/locale/ru/LC_MESSAGES/kbd.mo
+#usr/share/locale/sr/LC_MESSAGES/kbd.mo
+#usr/share/locale/sv/LC_MESSAGES/kbd.mo
+#usr/share/locale/tr/LC_MESSAGES/kbd.mo
+#usr/share/locale/uk/LC_MESSAGES/kbd.mo
+#usr/share/locale/vi/LC_MESSAGES/kbd.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/kbd.mo
#usr/share/man/man1/chvt.1
#usr/share/man/man1/deallocvt.1
#usr/share/man/man1/dumpkeys.1
diff --git a/lfs/kbd b/lfs/kbd
index 460673721..9dbd0f421 100644
--- a/lfs/kbd
+++ b/lfs/kbd
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
# #
# 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.2.0
+VER = 2.5.1
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 = d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6
+$(DL_FILE)_BLAKE2 = aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae
kbd-latarcyrheb-16-fixed.tar.bz2_BLAKE2 = d5c701333b9eae7e0c467aebee5b2217c3225dee615622f77e501569f1464a8c32380b2d4a522730db74a909e1ea746e660ea6849bbf48195af22bda73858d1b
kbd-latsun-fonts.tar.bz2_BLAKE2 = c3def1192331a65f3edcf608ca164370d2db0c61444f71fc83bf35cb86d417ae92582180ace853a3cf93e569a83a42fca054fbadbf7f5986a1abd17e8bb6691f
@@ -74,7 +74,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@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/kbd-2.2.0-backspace-1.patch
# Extract our own fonts
cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latarcyrheb-16-fixed.tar.bz2
--
2.35.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] kbd: Update to 2.5.1
@ 2023-02-26 12:44 Stefan Schantl
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Schantl @ 2023-02-26 12:44 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 14245 bytes --]
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
kbd/kbd.nm | 13 +++--
kbd/patches/kbd-1.15-defkeymap.patch | 12 -----
kbd/patches/kbd-1.15-keycodes-man.patch | 36 +++++++-------
kbd/patches/kbd-1.15-resizecon-x86_64.patch | 15 ------
kbd/patches/kbd-1.15-unicode_start.patch | 6 +--
kbd/patches/kbd-1.15.3-dumpkeys-man.patch | 18 -------
.../kbd-1.15.3-fix-es-translation.patch | 12 -----
.../kbd-1.15.5-loadkeys-search-path.patch | 24 +++++++++
.../kbd-1.15.5-sg-decimal-separator.patch | 12 +++++
.../kbd-2.0.2-unicode-start-font.patch | 15 ++++++
kbd/patches/kbd-2.4.0-covscan-fixes.patch | 49 +++++++++++++++++++
11 files changed, 127 insertions(+), 85 deletions(-)
delete mode 100644 kbd/patches/kbd-1.15-defkeymap.patch
delete mode 100644 kbd/patches/kbd-1.15-resizecon-x86_64.patch
delete mode 100644 kbd/patches/kbd-1.15.3-dumpkeys-man.patch
delete mode 100644 kbd/patches/kbd-1.15.3-fix-es-translation.patch
create mode 100644 kbd/patches/kbd-1.15.5-loadkeys-search-path.patch
create mode 100644 kbd/patches/kbd-1.15.5-sg-decimal-separator.patch
create mode 100644 kbd/patches/kbd-2.0.2-unicode-start-font.patch
create mode 100644 kbd/patches/kbd-2.4.0-covscan-fixes.patch
diff --git a/kbd/kbd.nm b/kbd/kbd.nm
index fbc57c7e6..af829cbc0 100644
--- 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 = https://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 =
+source_dl = https://www.kernel.org/pub/linux/utils/kbd/
sources += kbd-latarcyrheb-16-fixed.tar.bz2
sources += kbd-latsun-fonts.tar.bz2
build
requires
+ automake
bison
flex
gettext
+ pam-devel
end
configure_options += \
@@ -42,8 +44,6 @@ build
# 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 +51,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
diff --git a/kbd/patches/kbd-1.15-defkeymap.patch b/kbd/patches/kbd-1.15-defkeymap.patch
deleted file mode 100644
index 5e604b71e..000000000
--- 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
index d18a8c8b5..e400c9df6 100644
--- a/kbd/patches/kbd-1.15-keycodes-man.patch
+++ b/kbd/patches/kbd-1.15-keycodes-man.patch
@@ -1,7 +1,7 @@
-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
+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.
@@ -21,21 +21,21 @@ diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1
.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.
-
+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.
-+
- .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.
+ .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.
@@ -48,5 +48,5 @@ diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8
+cannot change the mapping of other devices than the "first" one.
+
.SH "SEE ALSO"
- .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)"
-
+ .BR dumpkeys (1),
+ .BR loadkeys (1),
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
index 5e8350a86..000000000
--- 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
index 41827ccd4..119fe78d8 100644
--- a/kbd/patches/kbd-1.15-unicode_start.patch
+++ b/kbd/patches/kbd-1.15-unicode_start.patch
@@ -1,6 +1,6 @@
-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
+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.
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
index e77718b47..000000000
--- 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
index 9d43d8d15..000000000
--- 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-1.15.5-loadkeys-search-path.patch b/kbd/patches/kbd-1.15.5-loadkeys-search-path.patch
new file mode 100644
index 000000000..16beb3da8
--- /dev/null
+++ b/kbd/patches/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/kbd/patches/kbd-1.15.5-sg-decimal-separator.patch b/kbd/patches/kbd-1.15.5-sg-decimal-separator.patch
new file mode 100644
index 000000000..cb7398d57
--- /dev/null
+++ b/kbd/patches/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/kbd/patches/kbd-2.0.2-unicode-start-font.patch b/kbd/patches/kbd-2.0.2-unicode-start-font.patch
new file mode 100644
index 000000000..72d47f40f
--- /dev/null
+++ b/kbd/patches/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/kbd/patches/kbd-2.4.0-covscan-fixes.patch b/kbd/patches/kbd-2.4.0-covscan-fixes.patch
new file mode 100644
index 000000000..c7ddf27b9
--- /dev/null
+++ b/kbd/patches/kbd-2.4.0-covscan-fixes.patch
@@ -0,0 +1,49 @@
+diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffontop.c
+--- kbd-2.4.0/src/libkfont/psffontop.c.orig 2020-04-27 17:53:01.000000000 +0200
++++ kbd-2.4.0/src/libkfont/psffontop.c 2021-04-27 09:59:14.170153676 +0200
+@@ -235,6 +235,7 @@ kfont_read_psffont(struct kfont_context
+
+ if (psfhdr->mode > PSF1_MAXMODE) {
+ KFONT_ERR(ctx, _("Unsupported psf file mode (%d)"), psfhdr->mode);
++ free(psfhdr);
+ return -EX_DATAERR;
+ }
+ fontlen = ((psfhdr->mode & PSF1_MODE512) ? 512 : 256);
+@@ -251,6 +252,7 @@ kfont_read_psffont(struct kfont_context
+
+ if (psfhdr.version > PSF2_MAXVERSION) {
+ KFONT_ERR(ctx, _("Unsupported psf version (%d)"), psfhdr.version);
++ free(inputbuf);
+ return -EX_DATAERR;
+ }
+ fontlen = assemble_uint32((unsigned char *)&psfhdr.length);
+@@ -260,16 +262,20 @@ kfont_read_psffont(struct kfont_context
+ ftoffset = assemble_uint32((unsigned char *)&psfhdr.headersize);
+ fontwidth = assemble_uint32((unsigned char *)&psfhdr.width);
+ utf8 = 1;
+- } else
++ } else {
++ free(inputbuf);
+ return -EX_DATAERR; /* not psf */
++ }
+
+ /* tests required - we divide by these */
+ if (fontlen == 0) {
+ KFONT_ERR(ctx, _("zero input font length?"));
++ free(inputbuf);
+ return -EX_DATAERR;
+ }
+ if (charsize == 0) {
+ KFONT_ERR(ctx, _("zero input character size?"));
++ free(inputbuf);
+ return -EX_DATAERR;
+ }
+
+@@ -277,6 +283,7 @@ kfont_read_psffont(struct kfont_context
+
+ if (i > inputlth || (!hastable && i != inputlth)) {
+ KFONT_ERR(ctx, _("Input file: bad input length (%d)"), inputlth);
++ free(inputbuf);
+ return -EX_DATAERR;
+ }
+
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-26 12:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-07 9:44 [PATCH] kbd: Update to 2.5.1 Peter Müller
2023-02-26 12:44 Stefan Schantl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox