From past@ajax.noc.ntua.gr Sun Nov 9 04:34:52 2003 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBBA116A4CE for ; Sun, 9 Nov 2003 04:34:51 -0800 (PST) Received: from diomedes.noc.ntua.gr (diomedes.noc.ntua.gr [147.102.222.220]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6833143FF3 for ; Sun, 9 Nov 2003 04:34:50 -0800 (PST) (envelope-from past@ajax.noc.ntua.gr) Received: from ajax.noc.ntua.gr (ajax.noc.ntua.gr [147.102.220.1]) by diomedes.noc.ntua.gr (8.12.9p1/8.12.9) with ESMTP id hA9CYmru057380 for ; Sun, 9 Nov 2003 14:34:48 +0200 (EET) (envelope-from past@ajax.noc.ntua.gr) Received: from ajax.noc.ntua.gr (localhost [127.0.0.1]) by ajax.noc.ntua.gr (8.12.9p1/8.12.9) with ESMTP id hA9CYmoN026278 for ; Sun, 9 Nov 2003 14:34:48 +0200 (EET) (envelope-from past@ajax.noc.ntua.gr) Received: (from past@localhost) by ajax.noc.ntua.gr (8.12.9p1/8.12.9/Submit) id hA9CYmaE026277; Sun, 9 Nov 2003 14:34:48 +0200 (EET) Message-Id: <200311091234.hA9CYmaE026277@ajax.noc.ntua.gr> Date: Sun, 9 Nov 2003 14:34:48 +0200 (EET) From: Panagiotis Astithas Reply-To: Panagiotis Astithas To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [patch] Fix greek support in sysinstall and INDEX.keymaps X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 59078 >Category: bin >Synopsis: [patch] Fix greek support in sysinstall and INDEX.keymaps >Confidential: no >Severity: non-critical >Priority: medium >Responsible: re >State: closed >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Nov 09 04:40:13 PST 2003 >Closed-Date: Sun Mar 20 20:44:22 GMT 2005 >Last-Modified: Sun Mar 20 20:44:22 GMT 2005 >Originator: Panagiotis Astithas >Release: FreeBSD 4.8-STABLE i386 >Organization: National Technical University of Athens >Environment: System: FreeBSD ajax.noc.ntua.gr 4.8-STABLE FreeBSD 4.8-STABLE #0: Tue Apr 8 21:45:00 EEST 2003 root@ajax.noc.ntua.gr:/usr/obj/usr/src/sys/GENERIC i386 >Description: Sysinstall does not offer the option to select a greek keymap, although such keymaps exist in the system and can be selected via other means, e.g. kbdmap(1). Moreover, a typo in INDEX.keymaps always produces one garbled line in kbdmap(1). >How-To-Repeat: Start sysinstall, go to keymap (or configure -> console -> keymap) and notice that no greek keymap entries appear. Also, start kbdmap, scroll to the end of the available options and observe the last line. >Fix: Apply the supplied patches. As a workaround do not use sysinstall for selecting greek keymap, but use kbdmap after the initial installation, or specify the keymap directly in /etc/rc.conf. Note that the patches are for the HEAD versions of the relative files (as of a few weeks ago, at least). --- patch-INDEX.keymaps begins here --- --- share/syscons/keymaps/INDEX.keymaps.orig Sat Nov 8 17:44:04 2003 +++ share/syscons/keymaps/INDEX.keymaps Sat Nov 8 17:44:28 2003 @@ -165,7 +165,7 @@ gr.elot.acc.kbd:el:Ελληνικό ISO-8859-7 ΕΛΟΤ gr.us101.acc.kbd:en:Greek ISO-8859-7 (101 keys) -gr.us101.acc.kbd:en:Ελληνικό ISO-8859-7 (101 πλήκτρων) +gr.us101.acc.kbd:el:Ελληνικό ISO-8859-7 (101 πλήκτρων) iw.iso8.kbd:en:Hebrew ISO-8859-8 iw.iso8.kbd:he:ISO-8859-8 ϊιψας --- patch-INDEX.keymaps ends here --- --- patch-Makefile begins here --- --- usr.sbin/sysinstall/Makefile.orig Sat Nov 8 17:19:45 2003 +++ usr.sbin/sysinstall/Makefile Sat Nov 8 17:10:59 2003 @@ -68,11 +68,12 @@ KEYMAPS= jp.pc98 jp.pc98.iso .else KEYMAPS= be.iso bg.bds.ctrlcaps bg.phonetic.ctrlcaps br275.iso \ - cs.latin2.qwertz danish.iso finnish.iso fr.iso \ - german.iso hr.iso hu.iso2.101keys it.iso icelandic.iso jp.106 \ - norwegian.iso pl_PL.ISO8859-2 pt.iso ru.koi8-r si.iso \ - spanish.iso swedish.iso swissfrench.iso swissgerman.iso ua.koi8-u \ - ua.koi8-u.shift.alt uk.iso us.dvorak us.iso us.pc-ctrl us.unix + cs.latin2.qwertz danish.iso el.iso07 finnish.iso fr.iso \ + german.iso gr.elot.acc gr.us101.acc hr.iso hu.iso2.101keys \ + it.iso icelandic.iso jp.106 norwegian.iso pl_PL.ISO8859-2 \ + pt.iso ru.koi8-r si.iso spanish.iso swedish.iso swissfrench.iso \ + swissgerman.iso ua.koi8-u ua.koi8-u.shift.alt uk.iso us.dvorak \ + us.iso us.pc-ctrl us.unix .endif keymap.h: --- patch-Makefile ends here --- --- patch-menus.c begins here --- --- usr.sbin/sysinstall/menus.c.orig Sat Nov 8 17:19:38 2003 +++ usr.sbin/sysinstall/menus.c Sat Nov 8 17:42:44 2003 @@ -2004,6 +2004,9 @@ { " French ISO", "French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" }, { "German CP850", "German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.cp850" }, { " German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" }, + { " Greek 101", "Greek ISO keymap (101 keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=gr.us101.acc" }, + { " Greek 104", "Greek ISO keymap (104 keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=el.iso07" }, + { " Greek ELOT", "Greek ISO keymap (ELOT 1000)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=gr.elot.acc" }, { "Hungarian 101", "Hungarian ISO keymap (101 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.101keys" }, { " Hungarian 102", "Hungarian ISO keymap (102 key)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hu.iso2.102keys" }, { "Icelandic (accent)", "Icelandic ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso.acc" }, --- patch-menus.c ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-bugs->re Responsible-Changed-By: kris Responsible-Changed-When: Wed Nov 12 00:59:17 PST 2003 Responsible-Changed-Why: Assign to sysinstall maintainers http://www.freebsd.org/cgi/query-pr.cgi?pr=59078 State-Changed-From-To: open->patched State-Changed-By: jhb State-Changed-When: Thu Nov 20 12:43:14 PST 2003 State-Changed-Why: Committed to current, can be MFC'd later. http://www.freebsd.org/cgi/query-pr.cgi?pr=59078 State-Changed-From-To: patched->closed State-Changed-By: murray State-Changed-When: Sun Mar 20 20:43:27 GMT 2005 State-Changed-Why: This greek support is in HEAD and RELENG_5 and was in FreeBSD 5.3. There is no immediate need to merge it to RELENG_4 so we can close this PR. http://www.freebsd.org/cgi/query-pr.cgi?pr=59078 >Unformatted: