diff --git a/base/kbd/bg_keymaps.patch b/base/kbd/bg_keymaps.patch index 7a7a75614..3461bcd63 100644 --- a/base/kbd/bg_keymaps.patch +++ b/base/kbd/bg_keymaps.patch @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../kbd/bg_keymaps.patch +# Copyright (C) 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf # @@ -187,8 +188,8 @@ keycode 98 = KP_Divide keycode 99 = Control_backslash keycode 100 = AltGr ---- ./data/keymaps/i386/qwerty/bg_pho-cp1251.map.orig 2002-10-14 02:38:59.000000000 +0300 -+++ ./data/keymaps/i386/qwerty/bg_pho-cp1251.map 2004-01-09 19:11:09.000000000 +0200 +--- ./data/keymaps/i386/qwerty/bg_pho-cp1251.map.orig 2009-06-07 21:48:42.000000000 +0200 ++++ ./data/keymaps/i386/qwerty/bg_pho-cp1251.map 2010-07-15 10:16:31.168091775 +0200 @@ -1,12 +1,12 @@ -### Ver 0.2 - 20021013 +### Ver 1.0 - 20040109 @@ -210,9 +211,9 @@ keycode 10 = nine parenleft nine parenleft keycode 11 = zero parenright zero parenright - control alt keycode 11 = +0xB9 -- altgr control alt keycode 11 = +0xB9 +- altgr control alt keycode 11 = +0xB9 + control alt keycode 11 = 0xB9 -+ altgr control alt keycode 11 = 0xB9 ++ altgr control alt keycode 11 = 0xB9 keycode 12 = minus shift keycode 12 = underscore shift altgr keycode 12 = underscore diff --git a/base/kbd/devfs.patch b/base/kbd/devfs.patch index b0a29251d..21b9a0ed9 100644 --- a/base/kbd/devfs.patch +++ b/base/kbd/devfs.patch @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../kbd/devfs.patch +# Copyright (C) 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf # @@ -15,9 +16,9 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./openvt/openvt.h.orig 2002-10-11 14:08:59.000000000 +0300 -+++ ./openvt/openvt.h 2003-08-16 15:48:07.000000000 +0300 -@@ -33,8 +33,8 @@ +--- ./src/openvt.h.orig 2010-07-15 09:52:56.852091717 +0200 ++++ ./src/openvt.h 2010-07-15 09:53:09.428094127 +0200 +@@ -37,8 +37,8 @@ * Where your VTs are hidden */ #ifdef __linux__ diff --git a/base/kbd/devpts.patch b/base/kbd/devpts.patch deleted file mode 100644 index aa5531ae2..000000000 --- a/base/kbd/devpts.patch +++ /dev/null @@ -1,53 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../kbd/devpts.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2004 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./openvt/openvt.c.orig 2003-08-16 16:44:04.000000000 +0300 -+++ ./openvt/openvt.c 2003-08-16 16:42:01.000000000 +0300 -@@ -100,18 +100,18 @@ - } - - consfd = getfd(); -- if (consfd < 0) { -- fprintf(stderr, -- _("Couldnt get a file descriptor referring to the console\n")); -- return(2); -- } - -- if (ioctl(consfd, VT_GETSTATE, &vtstat) < 0) { -+ if (consfd >= 0 && ioctl(consfd, VT_GETSTATE, &vtstat) < 0) { - perror("openvt: VT_GETSTATE"); - return(4); - } - - if (vtno == -1) { -+ if (consfd < 0) { -+ fprintf(stderr, -+ _("Couldnt get a file descriptor referring to the console\n")); -+ return(2); -+ } - if ((ioctl(consfd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) { - perror("openvt: VT_OPENQRY"); - fprintf(stderr, _("openvt: cannot find a free vt\n")); -@@ -267,7 +267,7 @@ - - if ( do_wait ) { - wait(NULL); -- if (show) { /* Switch back... */ -+ if (show && consfd >= 0) { /* Switch back... */ - if (ioctl(consfd, VT_ACTIVATE, vtstat.v_active)) { - perror("VT_ACTIVATE"); - return 8; diff --git a/base/kbd/kbd.desc b/base/kbd/kbd.desc index 89f02fed1..0e33a9dd5 100644 --- a/base/kbd/kbd.desc +++ b/base/kbd/kbd.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../kbd/kbd.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] @@ -28,10 +28,9 @@ [L] GPL [S] Stable -[V] 1.12 +[V] 1.15.2 [P] X -----5---9 119.500 -[D] 3067218786 kbd-1.12.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/kbd/ +[D] 286726242 kbd-1.15.2.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/kbd/ -[D] 2490451651 kbd-1.12-gcc4_fixes-1.patch http://www.linuxfromscratch.org/patches/downloads/kbd/ -[D] 673168456 kbd-1.12-backspace-1.patch http://www.linuxfromscratch.org/patches/downloads/kbd/ +[D] 3329382668 kbd-1.15.2-backspace-1.patch http://www.linuxfromscratch.org/patches/downloads/kbd/ diff --git a/base/kbd/kbdrate-nonx86.patch b/base/kbd/kbdrate-nonx86.patch deleted file mode 100644 index 7e28d9173..000000000 --- a/base/kbd/kbdrate-nonx86.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../kbd/kbdrate-nonx86.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2004 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- kbd-1.08/src/kbdrate.c 2002-10-11 13:09:01.000000000 +0200 -+++ kbd-1.08-fixed/src/kbdrate.c 2003-07-19 11:03:05.000000000 +0200 -@@ -237,6 +237,7 @@ - if(KIOCSRATE_ioctl_ok(rate, delay, silent)) /* sparc? */ - return 0; - -+#ifdef __i386__ - - /* The ioport way */ - -@@ -286,4 +287,8 @@ - valid_delays[ (value & 0x60) >> 5 ] ); - - return 0; -+#else -+ perror( _("No alternative method for this platform") ); -+ exit( 1 ); -+#endif - } diff --git a/base/kbd/kbdrate-sparc.patch b/base/kbd/kbdrate-sparc.patch deleted file mode 100644 index f5ecb52f9..000000000 --- a/base/kbd/kbdrate-sparc.patch +++ /dev/null @@ -1,55 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../kbd/kbdrate-sparc.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2004 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -The field is named differently on SPARC (?) ... - - - Rene Rebe - ---- kbd-1.12/src/kbdrate.c 2004-06-10 08:24:48.450000000 +0200 -+++ kbd-1.12-fixed/src/kbdrate.c 2004-06-10 08:21:57.000000000 +0200 -@@ -164,10 +164,19 @@ - exit( 1 ); - } - -+#ifdef __sparc__ -+ kbdrate_s.rate = (int) (rate + 0.5); /* round up */ -+#else - kbdrate_s.period = (int) (rate + 0.5); /* round up */ -+#endif - kbdrate_s.delay = delay * HZ / 1000; /* convert ms to Hz */ -+#ifdef __sparc__ -+ if (kbdrate_s.rate > 50) -+ kbdrate_s.rate = 50; -+#else - if (kbdrate_s.period > 50) - kbdrate_s.period = 50; -+#endif - - if (ioctl( fd, KIOCSRATE, &kbdrate_s )) { - perror( "ioctl(KIOCSRATE)" ); -@@ -177,7 +186,11 @@ - - if (!silent) - printf( "Typematic Rate set to %d cps (delay = %d ms)\n", -+#ifdef __sparc__ -+ kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ ); -+#else - kbdrate_s.period, kbdrate_s.delay * 1000 / HZ ); -+#endif - - return 1; - #else /* no KIOCSRATE */