rpms/kbd/devel kbd-1.12-no-user-map.patch, NONE, 1.1 kbd.spec, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: mitr

Update of /cvs/dist/rpms/kbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27751

Modified Files:
	kbd.spec 
Added Files:
	kbd-1.12-no-user-map.patch 
Log Message:
* Thu Dec  1 2005 Miloslav Trmac <mitr at redhat.com> - 1.12-12
- Don't reload the keymap in unicode_start (#172425)


kbd-1.12-no-user-map.patch:
 unicode_start |    6 ------
 1 files changed, 6 deletions(-)

--- NEW FILE kbd-1.12-no-user-map.patch ---
Non-root users are allowed to change the unicode mode of their console, but
not the global keymap.  root will have to load the keymap in unicode mode
explicitly.

--- kbd-1.12/src/unicode_start.no-user-map	2005-12-01 19:33:19.000000000 +0100
+++ kbd-1.12/src/unicode_start	2005-12-01 19:33:28.000000000 +0100
@@ -14,12 +14,6 @@
 
 kbd_mode -u
 
-# Change the keyboard mapping in such a way that the non-ASCII keys
-# produce UTF-8 encoded multibyte sequences, instead of single bytes
-# >= 0x80 in a legacy 8-bit encoding.
-
-dumpkeys | loadkeys --unicode
-
 # 2. The output side: the console screen.
 
 # Tell the console output driver that the bytes arriving are UTF-8


Index: kbd.spec
===================================================================
RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kbd.spec	11 Nov 2005 21:13:48 -0000	1.24
+++ kbd.spec	1 Dec 2005 18:54:08 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 11
+Release: 12
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@@ -21,6 +21,7 @@
 Patch6: kbd-1.12-nostrip.patch
 Patch7: kbd-1.12-alias.patch
 Patch8: kbd-1.12-dir.patch
+Patch9: kbd-1.12-no-user-map.patch
 Obsoletes: console-tools
 Provides: console-tools
 Conflicts: util-linux < 2.11r-9
@@ -44,6 +45,7 @@
 %patch6 -p1 -b .nostrip
 %patch7 -p1 -b .alias
 %patch8 -p1 -b .dir
+%patch9 -p1 -b .no-user-map
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -122,6 +124,9 @@
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Thu Dec  1 2005 Miloslav Trmac <mitr at redhat.com> - 1.12-12
+- Don't reload the keymap in unicode_start (#172425)
+
 * Fri Nov 11 2005 Miloslav Trmac <mitr at redhat.com> - 1.12-11
 - Don't ship character set lists (they are already in glibc-common) and an
   obsolete copy of kbd.FAQ