rpms/kbd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to kbd-2.0.4

Browse Source
This commit is contained in:
Vitezslav Crhonek 2017-01-11 14:03:59 +01:00
parent 16c2dc7062
commit 0bbc1fa214
7 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,3 +21,4 @@ kbd-1.15.tar.gz
/kbdinfo.1 /kbdinfo.1
/kbd-2.0.2.tar.xz /kbd-2.0.2.tar.xz
/kbd-2.0.3.tar.xz /kbd-2.0.3.tar.xz
/kbd-2.0.4.tar.xz

14
kbd-1.15-keycodes-man.patch
View File

@ -1,7 +1,7 @@
diff -up kbd-1.15.2/man/man1/showkey.1.orig kbd-1.15.2/man/man1/showkey.1 diff -up kbd-2.0.4/docs/man/man1/showkey.1.orig kbd-2.0.4/docs/man/man1/showkey.1
--- kbd-1.15.2/docs/man/man1/showkey.1.orig 2009-10-09 17:26:13.000000000 +0200 --- kbd-2.0.4/docs/man/man1/showkey.1.orig 2016-10-31 16:56:02.000000000 +0100
+++ kbd-1.15.2/docs/man/man1/showkey.1 2011-01-05 12:45:25.726030798 +0100 +++ kbd-2.0.4/docs/man/man1/showkey.1 2017-01-11 10:45:03.763312393 +0100
@@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar @@ -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 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 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. that tells the 2.6 kernel to return the actual scan codes.
@ -21,9 +21,9 @@ diff -up kbd-1.15.2/man/man1/showkey.1.orig kbd-1.15.2/man/man1/showkey.1
.SH "SEE ALSO" .SH "SEE ALSO"
.BR loadkeys (1), .BR loadkeys (1),
.BR dumpkeys (1), .BR dumpkeys (1),
diff -up kbd-1.15.2/man/man8/setkeycodes.8.orig kbd-1.15.2/man/man8/setkeycodes.8 diff -up kbd-2.0.4/docs/man/man8/setkeycodes.8.orig kbd-2.0.4/docs/man/man8/setkeycodes.8
--- kbd-1.15.2/docs/man/man8/setkeycodes.8.orig 2009-10-09 17:26:13.000000000 +0200 --- kbd-2.0.4/docs/man/man8/setkeycodes.8.orig 2016-10-31 16:56:02.000000000 +0100
+++ kbd-1.15.2/docs/man/man8/setkeycodes.8 2011-01-05 12:47:46.894739942 +0100 +++ kbd-2.0.4/docs/man/man8/setkeycodes.8 2017-01-11 10:45:03.763312393 +0100
@@ -38,6 +38,10 @@ to showkey(1), the command @@ -38,6 +38,10 @@ to showkey(1), the command
.RE .RE
will assign the keycode 112 to it, and then loadkeys(1) can be used will assign the keycode 112 to it, and then loadkeys(1) can be used

33
kbd-1.15-sparc.patch
View File

@ -1,6 +1,6 @@
diff -up kbd-2.0.3/docs/man/man8/kbdrate.8.orig kbd-2.0.3/docs/man/man8/kbdrate.8 diff -up kbd-2.0.4/docs/man/man8/kbdrate.8.orig kbd-2.0.4/docs/man/man8/kbdrate.8
--- kbd-2.0.3/docs/man/man8/kbdrate.8.orig 2015-07-14 13:42:43.799261110 +0200 --- kbd-2.0.4/docs/man/man8/kbdrate.8.orig 2017-01-11 11:04:50.114831348 +0100
+++ kbd-2.0.3/docs/man/man8/kbdrate.8 2015-07-14 13:43:30.213459824 +0200 +++ kbd-2.0.4/docs/man/man8/kbdrate.8 2017-01-11 11:05:35.619851252 +0100
@@ -22,7 +22,7 @@ Using @@ -22,7 +22,7 @@ Using
without any options will reset the repeat rate to 10.9 characters per second (cps) without any options will reset the repeat rate to 10.9 characters per second (cps)
and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems. and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
@ -10,13 +10,13 @@ diff -up kbd-2.0.3/docs/man/man8/kbdrate.8.orig kbd-2.0.3/docs/man/man8/kbdrate.
.SH OPTIONS .SH OPTIONS
.TP .TP
diff -up kbd-2.0.3/src/kbdrate.c.orig kbd-2.0.3/src/kbdrate.c diff -up kbd-2.0.4/src/kbdrate.c.orig kbd-2.0.4/src/kbdrate.c
--- kbd-2.0.3/src/kbdrate.c.orig 2015-07-14 13:43:49.463542240 +0200 --- kbd-2.0.4/src/kbdrate.c.orig 2017-01-11 11:05:10.226840148 +0100
+++ kbd-2.0.3/src/kbdrate.c 2015-07-14 13:46:55.797330678 +0200 +++ kbd-2.0.4/src/kbdrate.c 2017-01-11 11:05:56.832860537 +0100
@@ -109,9 +109,12 @@ static int valid_delays[] = { 250, 500, @@ -111,9 +111,12 @@ static int valid_delays[] = { 250, 500,
static int static int
KDKBDREP_ioctl_ok(double rate, int delay, int silent) { KDKBDREP_ioctl_ok(double rate, int delay, int silent)
{
+#if defined(KDKBDREP) && !defined(__sparc__) +#if defined(KDKBDREP) && !defined(__sparc__)
/* /*
* This ioctl is defined in <linux/kd.h> but is not * This ioctl is defined in <linux/kd.h> but is not
@ -26,7 +26,7 @@ diff -up kbd-2.0.3/src/kbdrate.c.orig kbd-2.0.3/src/kbdrate.c
* Since 2.4.9 also on i386. * Since 2.4.9 also on i386.
*/ */
struct my_kbd_repeat kbdrep_s; struct my_kbd_repeat kbdrep_s;
@@ -174,6 +177,9 @@ KDKBDREP_ioctl_ok(double rate, int delay @@ -176,6 +179,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
rate, kbdrep_s.delay); rate, kbdrep_s.delay);
return 1; /* success! */ return 1; /* success! */
@ -36,19 +36,19 @@ diff -up kbd-2.0.3/src/kbdrate.c.orig kbd-2.0.3/src/kbdrate.c
} }
#ifndef KIOCSRATE #ifndef KIOCSRATE
@@ -222,7 +228,7 @@ sigalrmhandler(int sig __attribute__ ((u @@ -226,7 +232,7 @@ sigalrmhandler(int sig __attribute__((un
int int main(int argc, char **argv)
main( int argc, char **argv ) { {
#ifdef __sparc__ #ifdef __sparc__
- double rate = 5.0; /* Default rate */ - double rate = 5.0; /* Default rate */
+ double rate = 20.0; /* Default rate */ + double rate = 20.0; /* Default rate */
int delay = 200; /* Default delay */ int delay = 200; /* Default delay */
#else #else
double rate = 10.9; /* Default rate */ double rate = 10.9; /* Default rate */
@@ -272,8 +278,9 @@ main( int argc, char **argv ) { @@ -275,8 +281,9 @@ int main(int argc, char **argv)
if (KIOCSRATE_ioctl_ok(rate, delay, silent)) /* sparc? */
return 0; return 0;
- /* The ioport way */ - /* The ioport way */
+ /* The ioport way - will crash on sparc */ + /* The ioport way - will crash on sparc */
@ -56,11 +56,10 @@ diff -up kbd-2.0.3/src/kbdrate.c.orig kbd-2.0.3/src/kbdrate.c
for (i = 0; i < RATE_COUNT; i++) for (i = 0; i < RATE_COUNT; i++)
if (rate * 10 >= valid_rates[i]) { if (rate * 10 >= valid_rates[i]) {
value &= 0x60; value &= 0x60;
@@ -331,5 +338,7 @@ main( int argc, char **argv ) { @@ -333,5 +340,6 @@ int main(int argc, char **argv)
valid_rates[value & 0x1f] / 10.0, valid_rates[value & 0x1f] / 10.0,
valid_delays[(value & 0x60) >> 5]); valid_delays[(value & 0x60) >> 5]);
+#endif +#endif
+
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

12
kbd-1.15.3-dumpkeys-man.patch
View File

@ -1,8 +1,8 @@
diff -up kbd-1.15.3/man/man1/dumpkeys.1.in.orig kbd-1.15.3/man/man1/dumpkeys.1.in diff -up kbd-2.0.4/docs/man/man1/dumpkeys.1.in.orig kbd-2.0.4/docs/man/man1/dumpkeys.1.in
--- kbd-1.15.3/docs/man/man1/dumpkeys.1.in.orig 2011-08-23 13:06:16.905892768 +0200 --- kbd-2.0.4/docs/man/man1/dumpkeys.1.in.orig 2017-01-11 11:12:22.884029413 +0100
+++ kbd-1.15.3/docs/man/man1/dumpkeys.1.in 2011-08-23 13:15:18.264853435 +0200 +++ kbd-2.0.4/docs/man/man1/dumpkeys.1.in 2017-01-11 11:12:47.537040194 +0100
@@ -156,6 +156,14 @@ output of @@ -164,6 +164,14 @@ output of
.BR dumpkeys . .BI \-S shape " " " " \-\-shape= shape
.LP .LP
.TP .TP
+.B \-1 \-\-separate-lines +.B \-1 \-\-separate-lines
@ -13,6 +13,6 @@ diff -up kbd-1.15.3/man/man1/dumpkeys.1.in.orig kbd-1.15.3/man/man1/dumpkeys.1.i
+for plain keycodes. +for plain keycodes.
+.LP +.LP
+.TP +.TP
.B \-\-funcs-only .B \-t \-\-funcs-only
When this option is given, When this option is given,
.B dumpkeys .B dumpkeys

14
kbd-1.15.5-loadkeys-search-path.patch
View File

@ -1,7 +1,7 @@
diff -up kbd-2.0.1/src/loadkeys.c.orig kbd-2.0.1/src/loadkeys.c diff -up kbd-2.0.4/src/loadkeys.c.orig kbd-2.0.4/src/loadkeys.c
--- kbd-2.0.1/src/loadkeys.c.orig 2013-11-27 12:56:57.846069007 +0100 --- kbd-2.0.4/src/loadkeys.c.orig 2017-01-11 11:14:48.308093019 +0100
+++ kbd-2.0.1/src/loadkeys.c 2013-11-27 12:58:03.877302345 +0100 +++ kbd-2.0.4/src/loadkeys.c 2017-01-11 11:15:18.018106020 +0100
@@ -26,7 +26,7 @@ @@ -27,7 +27,7 @@
#include "keymap.h" #include "keymap.h"
static const char *progname = NULL; static const char *progname = NULL;
@ -10,9 +10,9 @@ diff -up kbd-2.0.1/src/loadkeys.c.orig kbd-2.0.1/src/loadkeys.c
static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
static void __attribute__((noreturn)) static void __attribute__((noreturn))
diff -up kbd-2.0.1/src/paths.h.orig kbd-2.0.1/src/paths.h diff -up kbd-2.0.4/src/paths.h.orig kbd-2.0.4/src/paths.h
--- kbd-2.0.1/src/paths.h.orig 2013-11-27 12:58:10.662326108 +0100 --- kbd-2.0.4/src/paths.h.orig 2017-01-11 11:15:40.404115812 +0100
+++ kbd-2.0.1/src/paths.h 2013-11-27 12:58:32.566403015 +0100 +++ kbd-2.0.4/src/paths.h 2017-01-11 11:15:59.730124274 +0100
@@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
* The following five subdirectories are defined: * The following five subdirectories are defined:
*/ */

8
kbd.spec
View File

@ -1,6 +1,6 @@
Name: kbd Name: kbd
Version: 2.0.3 Version: 2.0.4
Release: 4%{?dist} Release: 1%{?dist}
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
Group: System Environment/Base Group: System Environment/Base
@ -191,6 +191,10 @@ gzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/cz.map
/lib/kbd/keymaps/legacy /lib/kbd/keymaps/legacy
%changelog %changelog
* Wed Jan 11 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.0.4-1
- Update to kbd-2.0.4
Resolves: #1411174
* Tue Oct 11 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.0.3-4 * Tue Oct 11 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.0.3-4
- Fix FTBFS - Fix FTBFS
Resolves: #1381878 Resolves: #1381878

8
sources
View File

@ -1,4 +1,4 @@
050e1e454e9c01e22f198303d649efb8 kbd-latsun-fonts.tar.bz2 SHA512 (kbd-latsun-fonts.tar.bz2) = b98da5df85017ef1bd297eb2255046d54dd805c84356db7533f24e49fb78c8e3999901a45a49cdf6a74c0002bba2e0aa8327469d78dd38b6e747103972c30584
fe118f07a83134b15610503e5e3fe10e kbd-latarcyrheb-32.tar.bz2 SHA512 (kbd-latarcyrheb-32.tar.bz2) = 1870a708e16cf16f8343f02f7e97940e8404655078f92709a0b8a334be772faa99b4dbaca37e8d8c5b16d0d4d811fe6b102e4f76ae821148eb33075613dc95b8
37ac9b90d43d3581592df8c74ab6b2d5 kbdinfo.1 SHA512 (kbdinfo.1) = 8696d55f6c15f0ee2c2936eca6180b18100a87b11f0efe809a9531bb1228c67cd096cbc8fa25d9ee496daab28892ee5f320cc4bc9c9d816ff666bb4f80271c99
231b46e7142eb41ea3ae06d2ded3c208 kbd-2.0.3.tar.xz SHA512 (kbd-2.0.4.tar.xz) = 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f