diff --git a/kbd-1.15.2.tar.bz2 b/kbd-1.15.2.tar.bz2 deleted file mode 100644 index 8b4200f..0000000 --- a/kbd-1.15.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4c1f8238f8c1177008a59a3141bd2eaf7b41f4c4451810bd7930fc2d877f348 -size 1013906 diff --git a/kbd-1.15.3-loadkeys.diff b/kbd-1.15.3-loadkeys.diff new file mode 100644 index 0000000..5f58ade --- /dev/null +++ b/kbd-1.15.3-loadkeys.diff @@ -0,0 +1,22 @@ +Index: kbd-1.15.3/src/loadkeys.y +=================================================================== +--- kbd-1.15.3.orig/src/loadkeys.y ++++ kbd-1.15.3/src/loadkeys.y +@@ -352,8 +352,6 @@ static int defkeys(int fd, int kbd_mode) + j, (key_map[i])[j]); + } + } +- xfree(key_map[i]); +- xfree(keymap_was_set[i]); + + } else if (keymaps_line_seen && !defining[i]) { + /* deallocate keymap */ +@@ -1116,7 +1114,7 @@ int main(int argc, char *argv[]) + + if (!optm && !optb) { + /* check whether the keyboard is in Unicode mode */ +- fd = getfd(console); ++ fd = getfd(NULL); + + if (ioctl(fd, KDGKBMODE, &kbd_mode)) { + perror("KDGKBMODE"); diff --git a/kbd.changes b/kbd.changes index 17d27b3..de734d3 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 5 13:37:08 UTC 2011 - lnussel@suse.de + +- fix loadkeys -C option (bnc#720486) + ------------------------------------------------------------------- Fri Sep 30 15:28:41 UTC 2011 - uli@suse.com diff --git a/kbd.spec b/kbd.spec index 7ce6026..ae5a070 100644 --- a/kbd.spec +++ b/kbd.spec @@ -19,6 +19,7 @@ Name: kbd +# git: git://git.altlinux.org/people/legion/packages/kbd.git Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/ License: GPLv2+ Group: System/Console @@ -55,6 +56,7 @@ Patch6: kbd-1.15.2-dumpkeys-C-opt.patch Patch7: kbd-1.15.2-defkeymap.patch Patch8: kbd-1.15.2-chvt-userwait.patch Patch9: kbd-%{version}-po-es.patch +Patch10: kbd-1.15.3-loadkeys.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq BuildRequires: bison flex @@ -89,6 +91,7 @@ Authors: %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build for i in `find data/keymaps/mac -type f` ; do