Star1
2
代码
代码
Issues1
Pull Requests1
项目讨论
Wiki
分析
Star1
2
已合并
kbd：update to 2.2.0 #1
AtomGit-Bot创建于 2020年1月11日
kbd：update to 2.2.0 #1
已合并
AtomGit-Bot创建于 2020年1月11日
从refs/pull/1/head合入到master
共 16 个文件变更+15-463
DCheck-existance-of-map-before-dumping-it.patch+0-42
@@ -1,42 +0,0 @@
1-From 7e665ed238d01917e40430680b1181c668772756 Mon Sep 17 00:00:00 2001
2-From: Oleg Bulatov <obulatov@redhat.com>
3-Date: Wed, 25 Apr 2018 18:19:42 +0200
4-Subject: [PATCH] Check existance of map before dumping it
5- 
6----
7- src/libkeymap/dump.c | 12 ++++++++----
8- 1 file changed, 8 insertions(+), 4 deletions(-)
9- 
10-diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
11-index c4e2513..8bc5d70 100644
12---- a/src/libkeymap/dump.c
13-+++ b/src/libkeymap/dump.c
14-@@ -520,8 +520,10 @@ no_shorthands:
15- defs[j] = K(KT_META, KVAL(defs[j - 8]));
16-
17- for (j = 0; j < keymapnr; j++) {
18-- if ((j >= 16 && buf[j] != K_HOLE) || (j < 16 && buf[j] != defs[j]))
19-- goto unexpected;
20-+ if (lk_map_exists(ctx, j)) {
21-+ if ((j >= 16 && buf[j] != K_HOLE) || (j < 16 && buf[j] != defs[j]))
22-+ goto unexpected;
23-+ }
24- }
25-
26- isasexpected = 1;
27-@@ -577,8 +579,10 @@ no_shorthands:
28- fprintf(fd, "\n");
29-
30- for (j = 1; j < keymapnr; j++) {
31-- if (buf[j] != buf[0] && !zapped[j]) {
32-- print_bind(ctx, fd, buf[j], i, j, numeric);
33-+ if (lk_map_exists(ctx, j)) {
34-+ if (buf[j] != buf[0] && !zapped[j]) {
35-+ print_bind(ctx, fd, buf[j], i, j, numeric);
36-+ }
37- }
38- }
39- } else {
40---
41-2.21.0.windows.1
42- 
DFix-infinite-loop-of-vlock-if-locked-VC-is-closed.patch+0-28
@@ -1,28 +0,0 @@
1-From afb661b80441b6e3fa8cfa3b69f50e4805ebf8be Mon Sep 17 00:00:00 2001
2-From: Vitezslav Crhonek <vcrhonek@redhat.com>
3-Date: Mon, 14 May 2018 11:21:45 +0200
4-Subject: [PATCH] Fix infinite loop of vlock if locked VC is closed
5- 
6----
7- src/vlock/auth.c | 4 ++--
8- 1 file changed, 2 insertions(+), 2 deletions(-)
9- 
10-diff --git a/src/vlock/auth.c b/src/vlock/auth.c
11-index 25efb5e..4cbc685 100644
12---- a/src/vlock/auth.c
13-+++ b/src/vlock/auth.c
14-@@ -140,9 +140,9 @@ int get_password(pam_handle_t *pamh, const char *username, const char *tty)
15- fflush(stdout);
16- /*
17- * EOF encountered on read?
18-- * If not on VT, check stdin.
19-+ * Check stdin.
20- */
21-- if (is_vt || isatty(STDIN_FILENO)) {
22-+ if (isatty(STDIN_FILENO)) {
23- /* Ignore error. */
24- sleep(SHORT_DELAY);
25- break;
26---
27-2.21.0.windows.1
28- 
DFix-memory-leak.patch+0-43
@@ -1,43 +0,0 @@
1-From ca317cb7bd17792ff9f16a3c0eb49e11e963c63f Mon Sep 17 00:00:00 2001
2-From: luochunsheng <luochunsheng@huawei.com>
3-Date: Sat, 13 Apr 2019 16:24:11 +0800
4-Subject: [PATCH] Subject: [PATCH] Fix memory leak
5- 
6----
7- src/libkeymap/parser.y | 5 +++--
8- 1 file changed, 3 insertions(+), 2 deletions(-)
9- 
10-diff --git a/src/libkeymap/parser.y b/src/libkeymap/parser.y
11-index d9efbf8..50c4f14 100644
12---- a/src/libkeymap/parser.y
13-+++ b/src/libkeymap/parser.y
14-@@ -11,6 +11,7 @@
15- */
16- %{
17- #define YY_HEADER_EXPORT_START_CONDITIONS 1
18-+#define YY_YY_Y_TAB_H_INCLUDED 1
19-
20- #include "config.h"
21- #include "nls.h"
22-@@ -411,7 +412,6 @@ lk_parse_keymap(struct lk_ctx *ctx, lkfile_t *f)
23-
24- ctx->mod = 0;
25-
26-- yylex_init(&scanner);
27- yylex_init_extra(ctx, &scanner);
28-
29- INFO(ctx, _("Loading %s"), f->pathname);
30-@@ -424,8 +424,9 @@ lk_parse_keymap(struct lk_ctx *ctx, lkfile_t *f)
31-
32- rc = 0;
33-
34-+fail:
35- stack_pop(ctx, scanner);
36-
37-- fail: yylex_destroy(scanner);
38-+ yylex_destroy(scanner);
39- return rc;
40- }
41---
42-1.8.3.1
43- 
Dconfigure.ac-Fix-logic-of-vlock-configure-switch.patch+0-28
@@ -1,28 +0,0 @@
1-From f7f357ef079b6d185f340e716d7c72a98d82bad0 Mon Sep 17 00:00:00 2001
2-From: Garry Filakhtov <filakhtov@gmail.com>
3-Date: Fri, 20 Jul 2018 15:58:56 +0200
4-Subject: [PATCH] configure.ac: Fix logic of vlock configure switch
5- 
6-Downstream bug report: https://bugs.gentoo.org/661650
7- 
8-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
9----
10- configure.ac | 2 +-
11- 1 file changed, 1 insertion(+), 1 deletion(-)
12- 
13-diff --git a/configure.ac b/configure.ac
14-index 87eb63c..07098cf 100644
15---- a/configure.ac
16-+++ b/configure.ac
17-@@ -119,7 +119,7 @@ AM_CONDITIONAL(BUILD_LIBKEYMAP, test "$BUILD_LIBKEYMAP" = "yes")
18-
19- AC_ARG_ENABLE(vlock,
20- AS_HELP_STRING(--disable-vlock, [do not build vlock]),
21-- [VLOCK_PROG=no],[VLOCK_PROG=yes])
22-+ [VLOCK_PROG=$enableval],[VLOCK_PROG=yes])
23- AM_CONDITIONAL(VLOCK, test "$VLOCK_PROG" = "yes")
24-
25- if test "$VLOCK_PROG" = "yes"; then
26---
27-2.21.0.windows.1
28- 
Dkbd-1.15-keycodes-man.patch+0-52
@@ -1,52 +0,0 @@
1-diff -up kbd-2.0.4/docs/man/man1/showkey.1.orig kbd-2.0.4/docs/man/man1/showkey.1
2---- kbd-2.0.4/docs/man/man1/showkey.1.orig 2016-10-31 16:56:02.000000000 +0100
3-+++ kbd-2.0.4/docs/man/man1/showkey.1 2017-01-11 10:45:03.763312393 +0100
4-@@ -84,6 +84,19 @@ corresponds to what the keyboard hardwar
5- to know the scan codes sent by various keys it is better to boot a
6- 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0
7- that tells the 2.6 kernel to return the actual scan codes.
8-+
9-+.SH NOTES
10-+The raw scan codes are available only on AT and PS/2 keyboards,
11-+and even then they are disabled unless the
12-+.B atkbd.softraw=0
13-+kernel parameter is used.
14-+When the raw scan codes are not available, the kernel uses a fixed built-in
15-+table to produce scan codes from keycodes. Thus,
16-+.BR setkeycodes (8)
17-+can affect the output of
18-+.B showkey
19-+in scan code dump mode.
20-+
21- .SH "SEE ALSO"
22- .BR loadkeys (1),
23- .BR dumpkeys (1),
24-diff -up kbd-2.0.4/docs/man/man8/setkeycodes.8.orig kbd-2.0.4/docs/man/man8/setkeycodes.8
25---- kbd-2.0.4/docs/man/man8/setkeycodes.8.orig 2016-10-31 16:56:02.000000000 +0100
26-+++ kbd-2.0.4/docs/man/man8/setkeycodes.8 2017-01-11 10:45:03.763312393 +0100
27-@@ -38,6 +38,10 @@ to showkey(1), the command
28- .RE
29- will assign the keycode 112 to it, and then loadkeys(1) can be used
30- to define the function of this key.
31-+
32-+USB keyboards have standardized keycodes and
33-+.B setkeycodes
34-+doesn't affect them at all.
35- .LP
36- Some older kernels might hardwire a low scancode range to the
37- equivalent keycodes; setkeycodes will fail when you try to remap
38-@@ -56,6 +60,14 @@ None.
39- .SH BUGS
40- The keycodes of X have nothing to do with those of Linux.
41- Unusual keys can be made visible under Linux, but not under X.
42-+
43-+.B setkeycodes
44-+affects only the "first" input device
45-+that has modifiable scancode-to-keycode mapping.
46-+If there is more than one such device,
47-+.B setkeycodes
48-+cannot change the mapping of other devices than the "first" one.
49-+
50- .SH "SEE ALSO"
51- .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)"
52-
Dkbd-1.15-sparc.patch+0-65
@@ -1,65 +0,0 @@
1-diff -up kbd-2.0.4/docs/man/man8/kbdrate.8.orig kbd-2.0.4/docs/man/man8/kbdrate.8
2---- kbd-2.0.4/docs/man/man8/kbdrate.8.orig 2017-01-11 11:04:50.114831348 +0100
3-+++ kbd-2.0.4/docs/man/man8/kbdrate.8 2017-01-11 11:05:35.619851252 +0100
4-@@ -22,7 +22,7 @@ Using
5- without any options will reset the repeat rate to 10.9 characters per second (cps)
6- and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
7- These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
8--to 5 cps and the delay to 200 ms.
9-+to 20 cps and the delay to 200 ms.
10-
11- .SH OPTIONS
12- .TP
13-diff -up kbd-2.0.4/src/kbdrate.c.orig kbd-2.0.4/src/kbdrate.c
14---- kbd-2.0.4/src/kbdrate.c.orig 2017-01-11 11:05:10.226840148 +0100
15-+++ kbd-2.0.4/src/kbdrate.c 2017-01-11 11:05:56.832860537 +0100
16-@@ -111,9 +111,12 @@ static int valid_delays[] = { 250, 500,
17- static int
18- KDKBDREP_ioctl_ok(double rate, int delay, int silent)
19- {
20-+#if defined(KDKBDREP) && !defined(__sparc__)
21- /*
22- * This ioctl is defined in <linux/kd.h> but is not
23- * implemented anywhere - must be in some m68k patches.
24-+ * We cannot blindly try unimplemented ioctls on sparc64 -
25-+ * the 32<->64bit transition layer does not like it.
26- * Since 2.4.9 also on i386.
27- */
28- struct my_kbd_repeat kbdrep_s;
29-@@ -176,6 +179,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
30- rate, kbdrep_s.delay);
31-
32- return 1; /* success! */
33-+#else /* no KDKBDREP or __sparc__ */
34-+ return 0;
35-+#endif /* KDKBDREP */
36- }
37-
38- #ifndef KIOCSRATE
39-@@ -226,7 +232,7 @@ sigalrmhandler(int sig __attribute__((un
40- int main(int argc, char **argv)
41- {
42- #ifdef __sparc__
43-- double rate = 5.0; /* Default rate */
44-+ double rate = 20.0; /* Default rate */
45- int delay = 200; /* Default delay */
46- #else
47- double rate = 10.9; /* Default rate */
48-@@ -275,8 +281,9 @@ int main(int argc, char **argv)
49- if (KIOCSRATE_ioctl_ok(rate, delay, silent)) /* sparc? */
50- return 0;
51-
52-- /* The ioport way */
53-+ /* The ioport way - will crash on sparc */
54-
55-+#ifndef __sparc__
56- for (i = 0; i < RATE_COUNT; i++)
57- if (rate * 10 >= valid_rates[i]) {
58- value &= 0x60;
59-@@ -333,5 +340,6 @@ int main(int argc, char **argv)
60- valid_rates[value & 0x1f] / 10.0,
61- valid_delays[(value & 0x60) >> 5]);
62-
63-+#endif
64- return EXIT_SUCCESS;
65- }
Dkbd-1.15-unicode_start.patch+0-21
@@ -1,21 +0,0 @@
1-diff -up kbd-1.15.2/src/unicode_start.orig kbd-1.15.2/src/unicode_start
2---- kbd-1.15.2/src/unicode_start.orig 2011-01-05 13:28:22.079662644 +0100
3-+++ kbd-1.15.2/src/unicode_start 2011-01-05 13:29:01.327353698 +0100
4-@@ -72,6 +72,9 @@ stty iutf8
5- # have a Unicode map attached, or explicitly specified, e.g.,
6- # by giving `def.uni' as a second argument.
7-
8-+DEFAULT_UNICODE_FONT=latarcyrheb-sun16
9-+# Also drdos8x16 is a good candidate.
10-+
11- case "$#" in
12- 2)
13- setfont "$1" -u "$2"
14-@@ -80,6 +83,7 @@ case "$#" in
15- setfont "$1"
16- ;;
17- 0)
18-+ setfont $DEFAULT_UNICODE_FONT
19- ;;
20- *)
21- echo "usage: unicode_start [font [unicode map]]"
Dkbd-1.15.3-dumpkeys-man.patch+0-18
@@ -1,18 +0,0 @@
1-diff -up kbd-2.0.4/docs/man/man1/dumpkeys.1.in.orig kbd-2.0.4/docs/man/man1/dumpkeys.1.in
2---- kbd-2.0.4/docs/man/man1/dumpkeys.1.in.orig 2017-01-11 11:12:22.884029413 +0100
3-+++ kbd-2.0.4/docs/man/man1/dumpkeys.1.in 2017-01-11 11:12:47.537040194 +0100
4-@@ -164,6 +164,14 @@ output of
5- .BI \-S shape " " " " \-\-shape= shape
6- .LP
7- .TP
8-+.B \-1 \-\-separate-lines
9-+This forces
10-+.B dumpkeys
11-+to write one line per (modifier,keycode) pair. It prefixes the word
12-+.I plain
13-+for plain keycodes.
14-+.LP
15-+.TP
16- .B \-t \-\-funcs-only
17- When this option is given,
18- .B dumpkeys
Dkbd-1.15.5-loadkeys-search-path.patch+0-24
@@ -1,24 +0,0 @@
1-diff -up kbd-2.0.4/src/loadkeys.c.orig kbd-2.0.4/src/loadkeys.c
2---- kbd-2.0.4/src/loadkeys.c.orig 2017-01-11 11:14:48.308093019 +0100
3-+++ kbd-2.0.4/src/loadkeys.c 2017-01-11 11:15:18.018106020 +0100
4-@@ -27,7 +27,7 @@
5- #include "keymap.h"
6-
7- static const char *progname = NULL;
8--static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
9-+static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0 };
10- static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
11-
12- static void __attribute__((noreturn))
13-diff -up kbd-2.0.4/src/paths.h.orig kbd-2.0.4/src/paths.h
14---- kbd-2.0.4/src/paths.h.orig 2017-01-11 11:15:40.404115812 +0100
15-+++ kbd-2.0.4/src/paths.h 2017-01-11 11:15:59.730124274 +0100
16-@@ -5,6 +5,8 @@
17- * The following five subdirectories are defined:
18- */
19- #define KEYMAPDIR "keymaps"
20-+#define XKBKEYMAPDIR "keymaps/xkb"
21-+#define LEGACYKEYMAPDIR "keymaps/legacy"
22- #define UNIMAPDIR "unimaps"
23- #define TRANSDIR "consoletrans"
24- #define VIDEOMODEDIR "videomodes"
Dkbd-1.15.5-sg-decimal-separator.patch+0-12
@@ -1,12 +0,0 @@
1-diff -up kbd-1.15.5/data/keymaps/i386/qwertz/sg.map.orig kbd-1.15.5/data/keymaps/i386/qwertz/sg.map
2---- kbd-1.15.5/data/keymaps/i386/qwertz/sg.map.orig 2013-02-21 15:54:39.362799094 +0100
3-+++ kbd-1.15.5/data/keymaps/i386/qwertz/sg.map 2013-02-21 15:54:46.448838554 +0100
4-@@ -1,7 +1,7 @@
5- keymaps 0-2,4-6,8,12
6- include "qwertz-layout"
7- include "linux-with-alt-and-altgr.inc"
8-- plain keycode 83 = KP_Comma
9-+ plain keycode 83 = KP_Period
10- strings as usual
11-
12- keycode 1 = Escape Escape
Dkbd-2.0.2-unicode-start-font.patch+0-15
@@ -1,15 +0,0 @@
1-diff -up kbd-2.0.2/src/unicode_start.orig kbd-2.0.2/src/unicode_start
2---- kbd-2.0.2/src/unicode_start.orig 2014-08-12 14:47:53.019028849 +0200
3-+++ kbd-2.0.2/src/unicode_start 2014-08-12 14:54:42.631427602 +0200
4-@@ -72,7 +72,10 @@ stty iutf8
5- # have a Unicode map attached, or explicitly specified, e.g.,
6- # by giving `def.uni' as a second argument.
7-
8--DEFAULT_UNICODE_FONT=latarcyrheb-sun16
9-+# Source /etc/vconsole.conf to get default font
10-+. /etc/vconsole.conf
11-+
12-+DEFAULT_UNICODE_FONT=$FONT
13- # Also drdos8x16 is a good candidate.
14-
15- case "$#" in
Dkbd-2.0.4.tar.xz+0-0
Binary files do not support preview
Akbd-2.2.0.tar.gz+0-0
Binary files do not support preview
Mkbd.spec+15-37
@@ -1,34 +1,19 @@
1Name: kbd1Name: kbd
2-Version: 2.0.42+Version: 2.2.0
3-Release: 103+Release: 1
4Summary: Tools for managing Linux console(keyboard, virtual terminals, etc.)4Summary: Tools for managing Linux console(keyboard, virtual terminals, etc.)
5License: GPLv2+5License: GPLv2+
6URL: https://www.%{name}-project.org/6URL: https://www.%{name}-project.org/
7 7
8-Source0: http://ftp.altlinux.org/pub/people/legion/%{name}/%{name}-%{version}.tar.xz8+Source0: http://ftp.altlinux.org/pub/people/legion/%{name}/%{name}-%{version}.tar.gz
9Source1: %{name}-latsun-fonts.tar.bz29Source1: %{name}-latsun-fonts.tar.bz2
10Source2: %{name}-latarcyrheb-32.tar.bz210Source2: %{name}-latarcyrheb-32.tar.bz2
11Source3: xml2lst.pl11Source3: xml2lst.pl
12Source4: vlock.pamd12Source4: vlock.pamd
13-Source5: kbdinfo.1
14Source6: cz-map.patch13Source6: cz-map.patch
15 14 
16-Patch0: %{name}-1.15-keycodes-man.patch
17-Patch1: %{name}-1.15-sparc.patch
18-Patch2: %{name}-1.15-unicode_start.patch
19-Patch3: %{name}-1.15.3-dumpkeys-man.patch
20-Patch4: %{name}-1.15.5-sg-decimal-separator.patch
21-Patch5: %{name}-1.15.5-loadkeys-search-path.patch
22-Patch6: %{name}-2.0.2-unicode-start-font.patch
23- 
24-Patch6000: Check-existance-of-map-before-dumping-it.patch
25-Patch6001: Fix-infinite-loop-of-vlock-if-locked-VC-is-closed.patch
26-Patch6002: setmetamode-use-unsigned-int-type-for-KDGKBMETA-KDSK.patch
27-Patch6003: Fix-memory-leak.patch
28-Patch6004: configure.ac-Fix-logic-of-vlock-configure-switch.patch
29- 
30BuildRequires: bison flex gettext pam-devel check-devel15BuildRequires: bison flex gettext pam-devel check-devel
31-BuildRequires: gcc console-setup xkeyboard-config16+BuildRequires: gcc console-setup xkeyboard-config gettext-devel
32Requires: %{name}-misc = %{version}-%{release}17Requires: %{name}-misc = %{version}-%{release}
33Requires: %{name}-legacy = %{version}-%{release}18Requires: %{name}-legacy = %{version}-%{release}
34Provides: vlock = %{version}19Provides: vlock = %{version}
@@ -51,7 +36,7 @@ keymaps and so on. But %{name}-misc can do nothing without %{name}.
51%package legacy36%package legacy
52Summary: Legacy data for %{name} package37Summary: Legacy data for %{name} package
53BuildArch: noarch38BuildArch: noarch
54- 39+ 
55%description legacy40%description legacy
56The %{name}-legacy package contains original keymaps for %{name} package.41The %{name}-legacy package contains original keymaps for %{name} package.
57But %{name}-legacy can do nothing without %{name}.42But %{name}-legacy can do nothing without %{name}.
@@ -62,18 +47,6 @@ But %{name}-legacy can do nothing without %{name}.
62%setup -q -a 1 -a 247%setup -q -a 1 -a 2
63cp -fp %{SOURCE3} .48cp -fp %{SOURCE3} .
64cp -fp %{SOURCE6} .49cp -fp %{SOURCE6} .
65-%patch0 -p1 -b .keycodes-man
66-%patch1 -p1 -b .sparc
67-%patch2 -p1 -b .unicode_start
68-%patch3 -p1 -b .dumpkeys-man
69-%patch4 -p1 -b .sg-decimal-separator
70-%patch5 -p1 -b .loadkeys-search-path
71-%patch6 -p1 -b .unicode-start-font
72-%patch6000 -p1
73-%patch6001 -p1
74-%patch6002 -p1
75-%patch6003 -p1
76-%patch6004 -p1
77 50 
78pushd data/keymaps/i38651pushd data/keymaps/i386
79cp qwerty/pt-latin9.map qwerty/pt.map52cp qwerty/pt-latin9.map qwerty/pt.map
@@ -84,7 +57,7 @@ cp azerty/fr-latin9.map azerty/fr.map
84 57 
85cp azerty/fr-latin9.map azerty/fr-latin0.map 58cp azerty/fr-latin9.map azerty/fr-latin0.map
86 59 
87-mv dvorak/no.map dvorak/no-dvorak.map60+mv dvorak/dvorak-no.map dvorak/no-dvorak.map
88mv fgGIod/trf.map fgGIod/trf-fgGIod.map61mv fgGIod/trf.map fgGIod/trf-fgGIod.map
89mv olpc/es.map olpc/es-olpc.map62mv olpc/es.map olpc/es-olpc.map
90mv olpc/pt.map olpc/pt-olpc.map63mv olpc/pt.map olpc/pt-olpc.map
@@ -97,8 +70,11 @@ popd
97 70 
98iconv -f iso-8859-1 -t utf-8 < "ChangeLog" > "ChangeLog_"71iconv -f iso-8859-1 -t utf-8 < "ChangeLog" > "ChangeLog_"
99mv "ChangeLog_" "ChangeLog"72mv "ChangeLog_" "ChangeLog"
73+./autogen.sh
100 74 
101%build75%build
76+ 
77+ 
102%configure --prefix=%{_prefix} --datadir=/lib/%{name} --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls78%configure --prefix=%{_prefix} --datadir=/lib/%{name} --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls
103%make_build79%make_build
104 80 
@@ -119,8 +95,6 @@ done
119sed -i -e 's,\<%{name}_mode\>,/bin/%{name}_mode,g;s,\<setfont\>,/bin/setfont,g' \95sed -i -e 's,\<%{name}_mode\>,/bin/%{name}_mode,g;s,\<setfont\>,/bin/setfont,g' \
120 %{buildroot}/bin/unicode_start96 %{buildroot}/bin/unicode_start
121 97 
122-gzip -c %SOURCE5 > %{buildroot}/%{_mandir}/man1/kbdinfo.1.gz
123- 
124cp -r %{buildroot}/lib/%{name}/locale/ %{buildroot}%{_datadir}/locale98cp -r %{buildroot}/lib/%{name}/locale/ %{buildroot}%{_datadir}/locale
125rm -rf %{buildroot}/lib/%{name}/locale99rm -rf %{buildroot}/lib/%{name}/locale
126 100 
@@ -144,8 +118,6 @@ while read line; do
144 ckbcomp "$line" | gzip > %{buildroot}/lib/%{name}/keymaps/xkb/"$line".map.gz118 ckbcomp "$line" | gzip > %{buildroot}/lib/%{name}/keymaps/xkb/"$line".map.gz
145done < layouts-list-uniq.lst119done < layouts-list-uniq.lst
146 120 
147-zgrep -L "U+0041" %{buildroot}/lib/%{name}/keymaps/xkb/* | xargs rm -f
148- 
149gunzip %{buildroot}/lib/%{name}/keymaps/xkb/fi.map.gz121gunzip %{buildroot}/lib/%{name}/keymaps/xkb/fi.map.gz
150mv %{buildroot}/lib/%{name}/keymaps/xkb/fi.map %{buildroot}/lib/%{name}/keymaps/xkb/fi-kotoistus.map122mv %{buildroot}/lib/%{name}/keymaps/xkb/fi.map %{buildroot}/lib/%{name}/keymaps/xkb/fi-kotoistus.map
151gzip %{buildroot}/lib/%{name}/keymaps/xkb/fi-kotoistus.map123gzip %{buildroot}/lib/%{name}/keymaps/xkb/fi-kotoistus.map
@@ -181,5 +153,11 @@ gzip %{buildroot}/lib/%{name}/keymaps/xkb/cz.map
181%{_mandir}/man8/*.8.gz153%{_mandir}/man8/*.8.gz
182 154 
183%changelog155%changelog
156+* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.2.0-1
157+- Type:bugfix
158+- Id:NA
159+- SUG:NA
160+- DESC:update to 2.2.0
161+ 
184* Wed Sep 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.0.4-10162* Wed Sep 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.0.4-10
185- Package init163- Package init
Dkbdinfo.1+0-33
@@ -1,33 +0,0 @@
1-.TH KBDINFO 1 "June 2011"
2-.SH NAME
3-kbdinfo \- obtain information about the status of a console
4-.SH SYNOPSIS
5-\fBkbdinfo\fR [\-C \fIDEVICE\fR] getmode [text|graphics]
6-.LP
7-\fBkbdinfo\fR [\-C \fIDEVICE\fR] gkbmode [raw|xlate|mediumraw|unicode]
8-.LP
9-\fBkbdinfo\fR [\-C \fIDEVICE\fR] gkbmeta [metabit|escprefix]
10-.LP
11-\fBkbdinfo\fR [\-C \fIDEVICE\fR] gkbled [scrolllock|numlock|capslock]
12-.SH DESCRIPTION
13-.B kbdinfo
14-is an interface to KDGETMODE, GKBMODE, GKBMETA and GKBLED ioctls. Its
15-primary use case is to query the status of the given
16-.I CONSOLE
17-(or the currently active one, if no \-C option is present) from a shell
18-script.
19-.LP
20-If the final value argument is not specified,
21-.B kbdinfo
22-will print the result of the desired ioctl to the standard output.
23-Otherwise, the given value is compared to the actual result, and the
24-utility will exit with a status code of 0 for a match, 1 otherwise. No
25-text is printed for this style of invocation.
26-.SH "SEE ALSO"
27-.BR kbd_mode (1)
28-.SH AUTHOR
29-kbdinfo is Copyright \(co 2011 Alexey Gladkov
30-<gladkov.alexey@gmail.com>.
31-.LP
32-This manual page was written by Michael Schutte <michi@debian.org> for
33-the Debian GNU/Linux system (but may be used by others).
Dsetmetamode-use-unsigned-int-type-for-KDGKBMETA-KDSK.patch+0-45
@@ -1,45 +0,0 @@
1-From 6613abc26a853293c12f4e146a27606f02c8dd03 Mon Sep 17 00:00:00 2001
2-From: Andreas Henriksson <andreas@fatal.se>
3-Date: Mon, 28 May 2018 21:19:22 +0200
4-Subject: [PATCH] setmetamode: use unsigned int type for KDGKBMETA / KDSKBMETA
5- 
6-alsauser@pragmasoft.com reported that he detected a stack smash
7-and analyzed the problem as allocating too little space for
8-the resulting put_user after calling ioctl KDGKBMETA.
9-The ometa variable should be defined as unsigned int.
10- 
11-While at it and for correctness, also nmeta and thus the
12-val member of the struct meta where changed to unsigned
13-int as it seems the kernel wants to take this type
14-(but should be harmless to use char).
15- 
16-Original bug report at https://bugs.debian.org/872623
17----
18- src/setmetamode.c | 4 ++--
19- 1 file changed, 2 insertions(+), 2 deletions(-)
20- 
21-diff --git a/src/setmetamode.c b/src/setmetamode.c
22-index 8d75b94..adec0e9 100644
23---- a/src/setmetamode.c
24-+++ b/src/setmetamode.c
25-@@ -50,7 +50,7 @@ report(int meta)
26-
27- struct meta {
28- char *name;
29-- int val;
30-+ unsigned int val;
31- } metas[] = {
32- { "metabit", K_METABIT },
33- { "meta", K_METABIT },
34-@@ -64,7 +64,7 @@ struct meta {
35-
36- int main(int argc, char **argv)
37- {
38-- char ometa, nmeta;
39-+ unsigned int ometa, nmeta;
40- struct meta *mp;
41-
42- set_progname(argv[0]);
43---
44-2.21.0.windows.1
45-