Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2020-09-21 17:05:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbd"
Mon Sep 21 17:05:53 2020 rev:98 rq:835310 version:2.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-09-10 22:47:05.139770762
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new.4249/kbd.changes 2020-09-21
17:08:31.131196922 +0200
@@ -1,0 +2,11 @@
+Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec <sbra...@suse.com>
+
+- Make kbdsettings working in both bash and dash (boo#1175040).
+
+-------------------------------------------------------------------
+Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec <sbra...@suse.com>
+
+- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps
+ (boo#1176302).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kbd-1.15.5-loadkeys-search-path.patch ++++++
--- /var/tmp/diff_new_pack.GBLdCW/_old 2020-09-21 17:08:34.931200338 +0200
+++ /var/tmp/diff_new_pack.GBLdCW/_new 2020-09-21 17:08:34.935200341 +0200
@@ -7,7 +7,7 @@
#include "keymap.h"
-static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**",
KERNDIR "/", 0 };
-+static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**",
DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0
};
++static const char *const dirpath1[] = { "", DATADIR "/" XKBKEYMAPDIR "/",
DATADIR "/" LEGACYKEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0
};
static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
static void __attribute__((noreturn))
++++++ kbdsettings ++++++
--- /var/tmp/diff_new_pack.GBLdCW/_old 2020-09-21 17:08:34.967200370 +0200
+++ /var/tmp/diff_new_pack.GBLdCW/_new 2020-09-21 17:08:34.967200370 +0200
@@ -7,11 +7,12 @@
for i in NUM SCR CAPS; do
conf=$(eval echo KBD_${i}LOCK)
- [ -z ${!conf} ] && continue
- param=$(echo ${i,,} | sed 's/scr/scroll/')
+ eval confval=\"\$$conf\"
+ [ -z "$confval" ] && continue
+ param=$(echo $i | tr A-Z a-z | sed 's/scr/scroll/')
for tty in ${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}; do
- case "${!conf}" in
+ case "$confval" in
yes)
if [ $param = "num" ]; then
touch /run/numlock-on
@@ -35,11 +36,11 @@
/usr/bin/setleds -D -$param < /dev/$tty
fi
else
- echo "Value ${!conf} invalid for $conf"
+ echo "Value $confval invalid for $conf"
fi
;;
*)
- echo "error: unknown value ${!conf} in $conf"
+ echo "error: unknown value $confval in $conf"
;;
esac
done
