Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2020-09-10 22:47:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbd" Thu Sep 10 22:47:01 2020 rev:97 rq:832929 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-04-27 23:29:27.338478260 +0200 +++ /work/SRC/openSUSE:Factory/.kbd.new.4249/kbd.changes 2020-09-10 22:47:05.139770762 +0200 @@ -1,0 +2,5 @@ +Thu Aug 20 11:34:32 UTC 2020 - Jiri Slaby <[email protected]> + +- add libkeymap-Fix-mk_mapname-for-the-plain-map.patch + +------------------------------------------------------------------- New: ---- libkeymap-Fix-mk_mapname-for-the-plain-map.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.eALscq/_old 2020-09-10 22:47:08.855774186 +0200 +++ /var/tmp/diff_new_pack.eALscq/_new 2020-09-10 22:47:08.859774190 +0200 @@ -69,6 +69,7 @@ Patch14: kbdsettings-nox86.patch # PATCH-FIX-SLE kbd-unicode-fxxx.patch [email protected] bsc1085432 -- Do not cause error on UNICODE characters >= 0xF000 (e. g. ligature fi) Patch15: kbd-unicode-fxxx.patch +Patch16: libkeymap-Fix-mk_mapname-for-the-plain-map.patch BuildRequires: automake BuildRequires: bison BuildRequires: check-devel @@ -133,6 +134,7 @@ %patch14 -p0 %endif %patch15 -p1 +%patch16 -p1 %build for i in `find data/keymaps/mac -type f` ; do ++++++ libkeymap-Fix-mk_mapname-for-the-plain-map.patch ++++++ From: Alexey Gladkov <[email protected]> Date: Sun, 23 Feb 2020 18:24:59 +0100 Subject: libkeymap: Fix mk_mapname for the plain map Patch-mainline: 2.3 Git-commit: 88ae58fe8a223d11307accc36cc293133a18e7ac mk_mapname did not correctly return "plain" for the plain map (no modifier set) if it had already been called, as it did not correctly reset the static buffer that it uses for the map name. When mk_mapname is called for the first time from the first loop in lk_dump_ctable, all is fine, since buf has not been used yet and it is initialised to 0. However, when it is called again for the plain map from the second loop in lk_dump_ctable, buf already contains a value (left over from the last iteration in the first loop), and then strcat appends "plain" to that value instead of overwriting it, resulting in a bogus value. Reported-by: Javier Pello <[email protected]> Signed-off-by: Alexey Gladkov <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- src/libkeymap/dump.c | 2 +- tests/data/dumpkeys-mktable/defkeymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c index 8531b5aa3d91..d67eefaada54 100644 --- a/src/libkeymap/dump.c +++ b/src/libkeymap/dump.c @@ -101,7 +101,7 @@ mk_mapname(char modifier) int i; if (!modifier) { - strcat(buf, "plain"); + strcpy(buf, "plain"); return buf; } buf[0] = 0; diff --git a/tests/data/dumpkeys-mktable/defkeymap.c b/tests/data/dumpkeys-mktable/defkeymap.c index e831316a1ff3..5d9a3aaeff8c 100644 --- a/tests/data/dumpkeys-mktable/defkeymap.c +++ b/tests/data/dumpkeys-mktable/defkeymap.c @@ -565,7 +565,7 @@ static unsigned short shift_altgr_ctrl_alt_map[NR_KEYS] = { }; ushort *key_maps[MAX_NR_KEYMAPS] = { - shift_altgr_ctrl_altplain_map, shift_map, altgr_map, shift_altgr_map, + plain_map, shift_map, altgr_map, shift_altgr_map, ctrl_map, shift_ctrl_map, altgr_ctrl_map, shift_altgr_ctrl_map, alt_map, shift_alt_map, altgr_alt_map, shift_altgr_alt_map, ctrl_alt_map, shift_ctrl_alt_map, altgr_ctrl_alt_map, shift_altgr_ctrl_alt_map, 0 -- 2.28.0
