- spec, init script and patches based on those from Redhat, with many

  PLDifications and cleanups

Changed files:
    Canna-DESTDIR.patch -> 1.1
    Canna-bcopy.patch -> 1.1
    Canna-conf.patch -> 1.1
    Canna-dot-canna -> 1.1
    Canna-glibc.patch -> 1.1
    Canna-hosts.canna-fix.patch -> 1.1
    Canna-security.patch -> 1.1
    Canna-stdin.patch -> 1.1
    Canna.init -> 1.1
    Canna.spec -> 1.1

diff --git a/Canna-DESTDIR.patch b/Canna-DESTDIR.patch
new file mode 100644 (file)
index 0000000..4795ba1
--- /dev/null
+++ b/Canna-DESTDIR.patch
@@ -0,0 +1,128 @@
+diff -Nur Canna35b2.orig/Imakefile Canna35b2/Imakefile
+--- Canna35b2.orig/Imakefile   Wed Nov 27 08:01:34 1996
++++ Canna35b2/Imakefile        Sat Mar  9 19:07:17 2002
+@@ -31,13 +31,8 @@
+ 
+ MakeDirectories(mkbindir, $(cannaBinDir))
+ MakeDirectories(mklibdir, $(cannaLibDir))
+-#ifdef __EMX__
+ MakeDirectories(mkdicdir, $(DicDir))
+ MakeDirectories(mkerrdir, $(ErrDir))
+-#else
+-MakeDirectoriesLong(mkdicdir, $(DicDir), $(cannaOwner), $(cannaGroup))
+-MakeDirectoriesLong(mkerrdir, $(ErrDir), $(cannaOwner), $(cannaGroup))
+-#endif
+ 
+ LinkFileList(includes,cannaconf.h,$(CANNAROOT)/include,..)
+ 
+diff -Nur Canna35b2.orig/cmd/catdic/Imakefile Canna35b2/cmd/catdic/Imakefile
+--- Canna35b2.orig/cmd/catdic/Imakefile        Mon Dec  2 12:38:14 1996
++++ Canna35b2/cmd/catdic/Imakefile     Sat Mar  9 19:02:25 2002
+@@ -75,23 +75,23 @@
+       $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/cannakill.exe
+ #else
+ install::
+-      $(RM) $(cannaBinDir)/cpdic
+-      $(RM) $(cannaBinDir)/lsdic
+-      $(RM) $(cannaBinDir)/mkdic
+-      $(RM) $(cannaBinDir)/mvdic
+-      $(RM) $(cannaBinDir)/rmdic
+-      $(RM) $(cannaBinDir)/syncdic
+-      $(RM) $(cannaBinDir)/chmoddic
+-      $(RM) $(cannaBinDir)/addwords
+-      $(RM) $(cannaBinDir)/delwords
+-      $(RM) $(cannaBinDir)/cannakill
+-      $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic
+-      $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic
+-      $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic
+-      $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mvdic
+-      $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/rmdic
+-      $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic
+-      $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords
+-      $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords
+-      $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill
++      $(RM) $(DESTDIR)$(cannaBinDir)/cpdic
++      $(RM) $(DESTDIR)$(cannaBinDir)/lsdic
++      $(RM) $(DESTDIR)$(cannaBinDir)/mkdic
++      $(RM) $(DESTDIR)$(cannaBinDir)/mvdic
++      $(RM) $(DESTDIR)$(cannaBinDir)/rmdic
++      $(RM) $(DESTDIR)$(cannaBinDir)/syncdic
++      $(RM) $(DESTDIR)$(cannaBinDir)/chmoddic
++      $(RM) $(DESTDIR)$(cannaBinDir)/addwords
++      $(RM) $(DESTDIR)$(cannaBinDir)/delwords
++      $(RM) $(DESTDIR)$(cannaSrvDir)/cannakill
++      $(LN) catdic $(DESTDIR)$(cannaBinDir)/cpdic
++      $(LN) catdic $(DESTDIR)$(cannaBinDir)/lsdic
++      $(LN) catdic $(DESTDIR)$(cannaBinDir)/mkdic
++      $(LN) catdic $(DESTDIR)$(cannaBinDir)/mvdic
++      $(LN) catdic $(DESTDIR)$(cannaBinDir)/rmdic
++      $(LN) catdic $(DESTDIR)$(cannaBinDir)/syncdic
++      $(LN) catdic $(DESTDIR)$(cannaBinDir)/addwords
++      $(LN) catdic $(DESTDIR)$(cannaBinDir)/delwords
++      $(LN) ../bin/catdic $(DESTDIR)$(cannaSrvDir)/cannakill
+ #endif
+diff -Nur Canna35b2.orig/dic/ideo/grammar/Imakefile Canna35b2/dic/ideo/grammar/Imakefile
+--- Canna35b2.orig/dic/ideo/grammar/Imakefile  Wed Nov 27 08:14:45 1996
++++ Canna35b2/dic/ideo/grammar/Imakefile       Sat Mar  9 19:05:52 2002
+@@ -82,9 +82,7 @@
+ 
+ MakeDirectories(install,$(CANNADICDIR))
+ 
+-InstallMultipleFlags($(ALLDIC),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
++InstallMultipleFlags($(ALLDIC),$(CANNADICDIR),-m 0664)
+ 
+ install::
+-      $(CHGRP) $(cannaGroup) $(CANNADICDIR)
+-      $(CHOWN) $(cannaOwner) $(CANNADICDIR)
+-      $(CHMOD) ug+w $(CANNADICDIR)
++      $(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
+diff -Nur Canna35b2.orig/dic/ideo/words/Imakefile Canna35b2/dic/ideo/words/Imakefile
+--- Canna35b2.orig/dic/ideo/words/Imakefile    Wed Nov 27 08:14:55 1996
++++ Canna35b2/dic/ideo/words/Imakefile Sat Mar  9 19:05:40 2002
+@@ -60,7 +60,7 @@
+ 
+ MakeDirectories(install,$(CANNADICDIR))
+ 
+-InstallMultipleFlags($(TARGETS),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
++InstallMultipleFlags($(TARGETS),$(CANNADICDIR),-m 0664)
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ InstallNamedNonExec(obsolete.dir,dics.dir,$(CANNADICDIR))
+@@ -69,13 +69,9 @@
+ #endif
+ 
+ install::
+-      $(CHGRP) $(cannaGroup) $(CANNADICDIR)
+-      $(CHOWN) $(cannaOwner) $(CANNADICDIR)
+-      $(CHMOD) ug+w $(CANNADICDIR)
+-      $(CHGRP) $(cannaGroup) $(DicDir)
+-      $(CHOWN) $(cannaOwner) $(DicDir)
+-      $(CHMOD) ug+w $(DicDir)
+-      $(CHMOD) -w $(CANNADICDIR)/dics.dir
++      $(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
++      $(CHMOD) ug+w $(DESTDIR)$(DicDir)
++      $(CHMOD) -w $(DESTDIR)$(CANNADICDIR)/dics.dir
+ 
+ #ifndef USE_OBSOLETE_STYLE_FILENAME
+ InstallNamedNonExec(necgaiji.t,necgaiji.ctd,$(CANNADICDIR))
+@@ -91,7 +87,7 @@
+ #else
+     TEXTDICS = necgaiji.t kanasmpl.t software.t chimei.t \
+                hojomwd.t hojoswd.t suffix.t number.t katakana.t keishiki.t
+-InstallMultipleFlags($(TEXTDICS),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
++InstallMultipleFlags($(TEXTDICS),$(CANNADICDIR),-m 0664)
+ #endif
+ 
+ depend::
+diff -Nur Canna35b2.orig/server/Imakefile Canna35b2/server/Imakefile
+--- Canna35b2.orig/server/Imakefile    Wed Nov 27 08:25:24 1996
++++ Canna35b2/server/Imakefile Sat Mar  9 19:07:48 2002
+@@ -2,7 +2,7 @@
+ #include "../Canna.conf"
+ 
+          CANNAROOT = ..
+-     INSTUGIDFLAGS = -m 6555 $(cannaOwnerGroup)
++     INSTUGIDFLAGS = -m 755
+ #ifdef __EMX__
+          INSTFLAGS = $(INSTUGIDFLAGS)
+    LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/RK.a

diff --git a/Canna-bcopy.patch b/Canna-bcopy.patch
new file mode 100644 (file)
index 0000000..47e4a03
--- /dev/null
+++ b/Canna-bcopy.patch
@@ -0,0 +1,66 @@
+--- Canna35b2/ccustom/canna.h.glibc    Wed Nov  6 20:21:45 1996
++++ Canna35b2/ccustom/canna.h  Mon Jun 12 15:13:32 2000
+@@ -40,7 +40,7 @@
+ 
+ /*#include "jrkanji.h"*/
+ 
+-#if defined(SYSV) || defined(SVR4) || defined(__STDC__)
++#if defined(SYSV) || defined(SVR4) || defined(__STDC__) && !defined(linux)
+ # if defined(SYSV) || defined(SVR4)
+ #  include <memory.h>
+ # endif
+--- Canna35b2/lib/RK/RKintern.h.glibc  Mon Jun 12 15:18:33 2000
++++ Canna35b2/lib/RK/RKintern.h        Mon Jun 12 15:20:36 2000
+@@ -97,7 +97,7 @@
+ #include      <ctype.h>
+ #endif
+ 
+-#if defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN)
++#if (defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN)) && !defined(linux)
+ # if defined(SYSV) || defined(SVR4)
+ #  include <memory.h>
+ # endif
+--- Canna35b2/lib/RK/ngram.c.glibc     Mon Jun 12 15:19:21 2000
++++ Canna35b2/lib/RK/ngram.c   Mon Jun 12 15:19:35 2000
+@@ -42,7 +42,7 @@
+ #include <sys/stat.h>
+ #endif
+ 
+-#if defined(SYSV) || defined(SVR4) || defined(__STDC__)
++#if defined(SYSV) || defined(SVR4) || defined(__STDC__) && !defined(linux)
+ # if defined(SYSV) || defined(SVR4)
+ #  include <memory.h>
+ # endif
+--- Canna35b2/lib/RKC/rkc.h.glibc      Mon Jun 12 15:17:43 2000
++++ Canna35b2/lib/RKC/rkc.h    Mon Jun 12 15:21:14 2000
+@@ -41,7 +41,7 @@
+ #include "RKrename.h"
+ #endif
+ 
+-#if defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN)
++#if (defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN)) && !defined(linux)
+ # if defined(SYSV) || defined(SVR4) || defined(WIN)
+ #  include <memory.h>
+ # endif
+--- Canna35b2/lib/canna/canna.h.glibc  Mon Jun 12 15:14:09 2000
++++ Canna35b2/lib/canna/canna.h        Mon Jun 12 15:14:26 2000
+@@ -105,7 +105,7 @@
+ 
+ #define STROKE_LIMIT 500 /* ¥¹¥È¥í¡¼¥¯¤ÇÀܳ¤òÀÚ¤ë */
+ 
+-#if defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN)
++#if defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN) && !defined(linux)
+ # if defined(SYSV) || defined(SVR4)
+ #  include <memory.h>
+ # endif
+--- Canna35b2/server/IR.h.glibc        Mon Jun 12 15:23:47 2000
++++ Canna35b2/server/IR.h      Mon Jun 12 15:24:00 2000
+@@ -27,7 +27,7 @@
+ #define EXTENSION
+ #define DEBUG
+ 
+-#if defined(SYSV) || defined(SVR4) || defined(__STDC__)
++#if (defined(SYSV) || defined(SVR4) || defined(__STDC__)) && !defined (linux)
+ # if defined(SYSV) || defined(SVR4)
+ #  include    <memory.h>
+ # endif

diff --git a/Canna-conf.patch b/Canna-conf.patch
new file mode 100644 (file)
index 0000000..be77660
--- /dev/null
+++ b/Canna-conf.patch
@@ -0,0 +1,50 @@
+diff -Nur Canna35b2.orig/Canna.conf Canna35b2/Canna.conf
+--- Canna35b2.orig/Canna.conf  Thu Nov 28 11:27:01 1996
++++ Canna35b2/Canna.conf       Sat Mar  9 19:13:20 2002
+@@ -128,27 +128,27 @@
+  * $Id$
+  */
+ 
+-cannaBinDir = /usr/local/canna/bin
+-cannaSrvDir = /usr/local/canna/bin
+-cannaLibDir = /usr/local/canna/lib
+-cannaManDir = /usr/local/canna/man
+-cannaIncDir = /usr/local/canna/include/canna
++cannaBinDir = /usr/bin
++cannaSrvDir = /usr/sbin
++cannaLibDir = /var/lib/canna
++cannaManDir = /usr/share/man/ja
++cannaIncDir = /usr/include/canna
+ libCannaDir = /usr/lib
+ 
+-ErrDir  = /usr/spool/canna
++ErrDir  = /var/log/canna
+ 
+ wcharDefinition = -DCANNA_WCHAR
+ Wlib =
+-JapaneseLocale = japanese
++JapaneseLocale = ja_JP.eucJP
+ 
+-cannaOwner = bin
+-cannaGroup = bin
++cannaOwner = canna
++cannaGroup = canna
+ 
+ cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
+ 
+ pointerIntegerDef =
+ 
+-cannaDsoRev = 1
++cannaDsoRev = 1.0.0
+     /* SunOS 4.x ¤ò¤ª»È¤¤¤ÎÊý¤Ç shared object ¤òÍøÍѤ¹¤ë¾ì¹ç¤Ë¤Ï
+             cannaDsoRev = 1.1
+     ¤È»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢FreeBSD ¤òÍøÍѤ¹¤ë¾ì¹ç¤Ï¡¢
+@@ -170,7 +170,7 @@
+ #define JAPANESEMAN
+ 
+ /* locale ¥Ç¥£¥ì¥¯¥È¥ê¤ò»ý¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï°Ê²¼¤òµ­½Ò¤¹¤ë */
+-/* #define LOCALE_DIR /usr/lib/locale */
++#define LOCALE_DIR /usr/share/locale
+ 
+ /* ¥¨¥ó¥¸¥ó¥¹¥¤¥Ã¥Áµ¡Ç½¤ò»È¤¦¤Î¤Ç¤¢¤ì¤Ð¥³¥á¥ó¥È¤ò¤Ï¤º¤¹ */
+ /* ¢¨Ãí Canna version 3.5 ¤Ç¤Ï¥³¥á¥ó¥È¤ò¤Ï¤º¤µ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤ */

diff --git a/Canna-dot-canna b/Canna-dot-canna
new file mode 100644 (file)
index 0000000..a6ddaf7
--- /dev/null
+++ b/Canna-dot-canna
@@ -0,0 +1,182 @@
+;; Copyright 1992 NEC Corporation, Tokyo, Japan.
+;;
+;; Permission to use, copy, modify, distribute and sell this software
+;; and its documentation for any purpose is hereby granted without
+;; fee, provided that the above copyright notice appear in all copies
+;; and that both that copyright notice and this permission notice
+;; appear in supporting documentation, and that the name of NEC
+;; Corporation not be used in advertising or publicity pertaining to
+;; distribution of the software without specific, written prior
+;; permission.  NEC Corporation makes no representations about the
+;; suitability of this software for any purpose.  It is provided "as
+;; is" without express or implied warranty.
+;;
+;; NEC CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+;; INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN 
+;; NO EVENT SHALL NEC CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+;; CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF 
+;; USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR 
+;; OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR 
+;; PERFORMANCE OF THIS SOFTWARE. 
+
+;;  $Id$
+
+;; µ­¹æÃÖ¤­´¹¤¨ÊÑ´¹¤òÍøÍѤ¹¤ë¤«¡£
+
+(setq use-symbolic-definition t)
+
+;;; ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¤ÎÀßÄê
+;
+; ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë¤ò»ØÄꤷ¤Þ¤¹¡£¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë¤Ï
+; (1) ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê
+; (2) ¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê
+; (3) /usr/lib/canna/dic
+; ¤Î½ç¤Ë¥µ¡¼¥Á¤µ¤ì¤Þ¤¹¡£
+;
+
+;(setq romkana-table "unix.cbp")
+(setq romkana-table "default.cbp")
+
+;; ³°Íè¸ìÊÑ´¹
+;(setq english-table "canna/english.cbp")
+
+
+;;; ÍøÍѤ¹¤ë¼­½ñ
+;
+; ¤¿¤Àñ¤Ë½ñ¤­Ê¤٤Ƥ¤¤ë¤Î¤Ïñ¸ìÅÐÏ¿¤ò¹Ô¤ï¤Ê¤¤¼­½ñ¤Ç¥·¥¹¥Æ¥à¼­½ñ¤Ê¤É¤¬
+; ¤³¤ì¤ËÅö¤¿¤ê¤Þ¤¹¡£
+;
+; Éô¼ó¼­½ñ¤Ë´Ø¤·¤Æ¤Ï :bushu ¤òÀè¹Ô¤µ¤»¤Æµ­½Ò¤·¤Þ¤¹¡£
+;
+; ñ¸ìÅÐÏ¿¤ò¤·¤¿¤¤¼­½ñ¤Ë´Ø¤·¤Æ¤Ï :user ¤òÀè¹Ô¤µ¤»¤Æµ­½Ò¤·¤Þ¤¹¡£Ã±¸ìÅÐ
+; Ï¿¤ò¤¹¤ë¼­½ñ¤Ï¥Æ¥­¥¹¥È·Á¼°¼­½ñ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£Ã±¸ìÅÐÏ¿¤µ¤»¤¿¤¤
+; ¼­½ñ¤Ï mkdic user ¤ÎÍͤʥ³¥Þ¥ó¥É¤òÂǤĤ³¤È¤Ç¤Ç´Êñ¤ËºîÀ®¤¹¤ë¤³¤È¤¬¤Ç
+; ¤­¤Þ¤¹¡£
+;
+(use-dictionary
+ "chimei"
+ "iroha"
+ "fuzokugo"
+ "hojomwd"
+ "hojoswd"
+ "software"
+ "keishiki"
+; "zip99"
+ :bushu "bushu"
+ :user  "user"
+ )
+
+;;; ¤µ¤Þ¤¶¤Þ¤Ê¥Ñ¥é¥á¥¿¤ÎÀßÄê
+;
+; ¿¿ÍýÃͤòÀßÄꤹ¤ë¤â¤Î¤Ë¤Ä¤¤¤Æ¤Ï¿¿¤Ë¤Ä¤¤¤Æ¤Ï t ¡¢µ¶¤Ë¤Ä¤¤¤Æ¤Ï nil ¤òÀß
+; Äꤷ¤Þ¤¹¡£
+
+; °ìÈÖ±¦¤Ç±¦¤Ë¹Ô¤³¤¦¤È¤¹¤ë¤Èº¸Ã¼¤Ë¤¤¤¯¤è¤¦¤Ë¤¹¤ë¤«
+(setq cursor-wrap          t)  ; default t
+
+; °ìÍ÷ɽ¼¨¤Ç¿ô»ú¤òÂǤ俤Ȥ­¤Ë¥«¡¼¥½¥ë°ÜÆ°¤Ëα¤á¤ë(nil)¤«ÁªÂò¤Þ¤Ç¤·¤Æ
+; ¤·¤Þ¤¦¤«(t)
+(setq select-direct        t)  ; default t
+
+; °ìÍ÷ɽ¼¨¤Ç¿ô»ú¤ÇÁªÂò¤¹¤ë¤«(t)¡£nil¤Î»þ¤Ï¿ô»ú¤¬É½¼¨¤µ¤ì¤Þ¤»¤ó
+(setq numerical-key-select t)  ; default t
+
+; ¸õÊäɽ¼¨»þ¤ËʸÀá¤Î¶èÀÚ¤ê¤Ë¶õÇò¤ò¤¤¤ì¤ë¤«
+(setq bunsetsu-kugiri nil)      ; default nil
+
+; ʸ»ú¥Ù¡¼¥¹¤Î°ÜÆ°¤ò¤¹¤ë¤«(t)¡£ nil¤Î»þ¤Ï¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¤Îñ°Ì¤Ç¥«¡¼
+; ¥½¥ë°ÜÆ°¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
+(setq character-based-move t)  ; default t
+
+; ÆþÎÏÃæ¤ÎÆɤßÁ´ÂΤò¥ê¥Ð¡¼¥¹¤¹¤ë¤«
+(setq reverse-widely       nil)        ; default nil
+
+; ÉÑÅٳؽ¬¤ò¤¹¤ë¤«
+(setq gakushu              t)  ; default t
+
+; °ìÍ÷¤ÎºÇ¸å¤Þ¤Ç¤¤¤Ã¤¿¤é°ìö°ìÍ÷ɽ¼¨¤ò¤ä¤á¤ë¤«
+(setq quit-if-end-of-ichiran nil); default nil
+
+; ʸÀá¤Î±¦Ã¼¤Ç±¦°ÜÆ°¤ò¤¹¤ë¤ÈÁ´ÂΤ¬³ÎÄꤷ¤Æ¤·¤Þ¤¦¤«
+(setq kakutei-if-end-of-bunsetsu nil) ; default nil
+
+; °ìÍ÷ÁªÂò¸åƱ¤¸Ê¸Àá¤Ë¤È¤É¤Þ¤ë¤«(t)¡£nil¤Î»þ¤Ï°ìÍ÷ÁªÂò¤ò¹Ô¤¦¤È¤Ò¤È¤ÄÀè
+; ¤ÎʸÀá¤Ë°ÜÆ°¤·¤Þ¤¹¡£
+(setq stay-after-validate  t)  ; default t
+
+; ÆɤߤòÆþÎÏÃæ¤Ë¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤òÂÇ¤Ä¤È¥í¡¼¥Þ»ú¤Þ¤Ç¥Ð¥é¥Ð¥é¤Ë¤¹¤ë¤«
+(setq break-into-roman     t)  ; default nil
+
+; ²¿²ó¤ÎÊÑ´¹¥­¡¼¤Ç°ìÍ÷ɽ¼¨¤ò¹Ô¤¦¤«¡££°¤òÆþ¤ì¤ë¤ÈÊÑ´¹¥­¡¼¤À¤±¤Ç¤Ï
+; °ìÍ÷ɽ¼¨¤Ë¤Ï°Ü¤ê¤Þ¤»¤ó¡£¤½¤Î¾ì¹ç¤Ë¤Ï C-w ¤òÆþÎϤ·¤Æ°ìÍ÷ɽ¼¨¤·¤Æ
+; ²¼¤µ¤¤¡£
+(setq n-henkan-for-ichiran 2)  ; default 2
+
+; ñ¸ìÅÐÏ¿»þ¤Ëʸˡ´ØÏ¢¤Î¼ÁÌä¤ò¤¹¤ë¤«(t)¡£nil¤Î»þ¤ÏŬÅö¤ÊÉÊ»ì¤òÉÕ¤±¤Æ¤·
+; ¤Þ¤¤¤Þ¤¹¡£
+(setq gramatical-question  t)  ; default t
+
+; ¸õÊ䤬Á´ÂΤβ¿ÈÖÌܤ«¤òɽ¼¨¤¹¤ë¤«
+(setq kouho-count t)            ; default t
+
+; Ã༡ÊÑ´¹¤ò¤¹¤ë¤«
+(setq auto nil)                 ; default nil
+
+; Ã༡ÊÑ´¹¤ò¤¹¤ë»þ¤Ë²¿¸Ä¤ÎʸÀá¤Þ¤Ç¤ò̤³ÎÄê¤ÇÊÝ»ý¤¹¤ë¤«
+(setq n-kouho-bunsetsu 16)      ; default 16
+
+; ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¤Ç¥¤¥ê¡¼¥¬¥ë¤Ê¥í¡¼¥Þ»ú¤ò¼Î¤Æ¤ë¤«
+(setq abandon-illegal-phonogram nil)              ; default nil
+
+; °ìÍ÷¤Î»þ¤â¼¡¤ÎÆþÎϤòǧ¤á¤ë¤«
+(setq allow-next-input                  t)     ; default t
+
+; °ìʸ»ú¥ì¥Ù¥ë¤Î¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¤ÎÊä½õ¥Æ¡¼¥Ö¥ë
+(if use-symbolic-definition
+    (progn
+      (defsymbol ?-  "¡¼" "-" "¡Ý" "¡¾")
+      (defsymbol ?/  "/"  "¡¿"  "¡¦")
+      (defsymbol ?\\ "\\" "¡À"  "¡ï")
+      (defsymbol
+       ?( "(" "¡Ê" "¡Ú"
+       ?) ")" "¡Ë" "¡Û" )
+      (defsymbol 
+       ?[ "¡Ö" "¡Ø" "¡Î" "¡Ì" "["
+       ?] "¡×" "¡Ù" "¡Ï" "¡Í" "]")
+      (defsymbol 
+       ?. "¡£" "¡¥" "."
+       ?, "¡¢" "¡¤" "," )
+      (defsymbol
+       ?0 "0" "£°" "¡»" "Îí"
+       ?1 "1" "£±" "°ì" "°í"
+       ?2 "2" "£²" "Æó" "Æõ"
+       ?3 "3" "£³" "»°" "»²"
+       ?4 "4" "£´" "»Í" "»Í"
+       ?5 "5" "£µ" "¸Þ" "¸à"
+       ?6 "6" "£¶" "Ï»" "Ï»"
+       ?7 "7" "£·" "¼·" "¼·"
+       ?8 "8" "£¸" "Ȭ" "Ȭ"
+       ?9 "9" "£¹" "¶å" "¶å" )
+      (defsymbol
+       ?? "?" "¡©"
+       ?! "!" "¡ª")
+      (defsymbol ?# "#" "¡ô")
+      (defsymbol ?$ "$" "¡ð")
+      (defsymbol ?% "%" "¡ó")
+      (defsymbol ?& "&" "¡õ")
+      (defsymbol ?+ "+" "¡Ü")
+      (defsymbol ?* "*" "¡ö" "¡ß")
+      (defsymbol ?_ "_" "¡²")
+      (defsymbol ?' "'" "¡Ç")
+      (defsymbol ?` "`" "¡Æ")
+      (defsymbol ?\" "\"" "¡É")
+      ))
+
+;; delete ¥­¡¼¤â¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤ÈƱ¤¸½èÍý¤ò¤µ¤»¤ë
+(global-set-key "\Delete" 'delete-previous) ; necessary in using Emacs
+
+;; Help ¤¬¤Ê¤¤¿Í¤â¤¤¤ë¤Î¤Ç F1 ¤Ç¤âƱ¤¸Æ°ºî¤ò¤µ¤»¤ë¡£
+(global-set-key "\F1" 'extend-mode)
+
+;; Ctrl-o ¤ÎÍÞÀ©
+(global-unbind-key-function 'japanese-mode)

diff --git a/Canna-glibc.patch b/Canna-glibc.patch
new file mode 100644 (file)
index 0000000..93f3be6
--- /dev/null
+++ b/Canna-glibc.patch
@@ -0,0 +1,18 @@
+--- cmd/crxgram/crxgram.c.bak  Sun Nov  2 12:29:33 1997
++++ cmd/crxgram/crxgram.c      Sun Nov  2 12:29:33 1997
+@@ -69,6 +69,7 @@
+ static char   fileName[256];
+ static int    lineNum;
+ 
++# ifndef __GLIBC__
+ static char *
+ basename(name)
+   char *name;
+@@ -83,6 +84,7 @@
+           break;
+     return ++s;
+ }
++#endif
+ static void
+ usage(prog)
+   char        *prog;

diff --git a/Canna-hosts.canna-fix.patch b/Canna-hosts.canna-fix.patch
new file mode 100644 (file)
index 0000000..fa8e358
--- /dev/null
+++ b/Canna-hosts.canna-fix.patch
@@ -0,0 +1,12 @@
+--- canna-3.5b2/server/misc.c  Tue Jul 11 14:08:41 2000
++++ canna-3.5b2/server/misc.c.new      Wed Sep  6 18:09:17 2000
+@@ -560,8 +567,6 @@
+       current->next = (ACLPtr)NULL ;
+       prev = current ;
+     }
+-    if( current )
+-      current->next = (ACLPtr)NULL ;
+ 
+     fclose( fp ) ;
+     return 0;
+

diff --git a/Canna-security.patch b/Canna-security.patch
new file mode 100644 (file)
index 0000000..456e4ac
--- /dev/null
+++ b/Canna-security.patch
@@ -0,0 +1,25 @@
+--- canna-3.5b2.orig/server/misc.c
++++ canna-3.5b2/server/misc.c
+@@ -649,12 +649,22 @@
+ 
+     if (client->username && client->username[0]) {
+       if (client->groupname && client->groupname[0]) {
++      if (strlen(DDUSER) + strlen(client->username) +
++          strlen(DDGROUP) + strlen(client->groupname) +
++          strlen(DDPATH) + 4 >= 256) {
++        return(-1);
++      }
++
+       sprintf(dichome, "%s/%s:%s/%s:%s",
+               DDUSER, client->username,
+               DDGROUP, client->groupname,
+               DDPATH);
+       }
+       else {
++        if (strlen(DDUSER) + strlen(client->username) +
++          strlen(DDPATH) + 2 >= 256) {
++        return(-1);
++      }
+       sprintf(dichome, "%s/%s:%s",
+               DDUSER, client->username,
+               DDPATH);

diff --git a/Canna-stdin.patch b/Canna-stdin.patch
new file mode 100644 (file)
index 0000000..5fbb44a
--- /dev/null
+++ b/Canna-stdin.patch
@@ -0,0 +1,21 @@
+diff -urN Canna35b2.ORIG/dic/ideo/pubdic/pod.c Canna35b2/dic/ideo/pubdic/pod.c
+--- Canna35b2.ORIG/dic/ideo/pubdic/pod.c       Tue May 31 06:42:12 1994
++++ Canna35b2/dic/ideo/pubdic/pod.c    Thu Jan 21 04:21:27 1999
+@@ -51,7 +51,7 @@
+ static int list_kinds;
+ static int copy_frequency, extract_kana = 0;
+ static long specific_kind;
+-static FILE *in1 = stdin, *in2 = stdin;
++static FILE *in1, *in2;
+ static char *common_out, *old_out, *new_out, *hinshi_table, *bunrui;
+ static char *description_table;
+ static int selhinshi = 0;
+@@ -1373,6 +1373,8 @@
+ int argc;
+ char *argv[];
+ {
++  in1 = stdin;
++  in2 = stdin;
+ #ifndef POD_WCHAR
+   setlocale(LC_ALL, "");
+ #endif

diff --git a/Canna.init b/Canna.init
new file mode 100644 (file)
index 0000000..094cf12
--- /dev/null
+++ b/Canna.init
@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# chkconfig: 345 90 12
+# description: Canna Japanese Conversion Engine
+#
+# canna         Canna server
+
+# Source function library
+. /etc/rc.d/init.d/functions
+ 
+# Get service config
+[ -f /etc/sysconfig/canna ] && . /etc/sysconfig/canna
+
+case "$1" in
+  start)
+       if [ ! -f /var/lock/subsys/canna ]; then
+               msg_starting Canna
+               rm -f /tmp/.iroha_unix/IROHA
+               daemon "su - canna -s /bin/sh -c '/usr/sbin/cannaserver -syslog'"
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/canna
+               exit $RETVAL
+       else
+               msg_already_running Canna
+               exit 1
+       fi
+        ;;
+  stop)
+       if [ -f /var/lock/subsys/canna ]; then
+               msg_stopping Canna
+               /usr/sbin/cannakill
+               RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       ok
+               else
+                       fail
+               fi
+               rm -f /tmp/.iroha_unix/IROHA /var/lock/subsys/canna
+               exit $RETVAL
+       else
+               msg_not_running Canna
+               exit 1
+       fi
+        ;;
+  status)
+        status cannaserver
+        ;;
+  restart|reload)
+        $0 stop
+        $0 start
+        ;;
+  *)
+        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        exit 1
+esac
+ 
+exit 0

diff --git a/Canna.spec b/Canna.spec
new file mode 100644 (file)
index 0000000..b0e84d1
--- /dev/null
+++ b/Canna.spec
@@ -0,0 +1,239 @@
+Summary:       Japanese input system
+Summary(ja):   ÆüËܸìÆþÎÏ¥·¥¹¥Æ¥à
+Summary(pl):   System wprowadzania znaków japoñskich
+Name:          Canna
+Version:       3.5b2
+Release:       41
+License:       BSD-like
+Group:         Libraries
+#origin, but host not found: ftp://ftp.nec.co.jp/pub/Canna/Canna35/Canna35b2.tar.gz
+Source0:       ftp://ftp.tokyonet.ad.jp/pub/misc/%{name}/%{name}35/%{name}35b2.tar.gz
+Source1:       %{name}.init
+Source2:       %{name}-dot-canna
+Patch0:                %{name}-conf.patch
+Patch1:                %{name}-DESTDIR.patch
+Patch2:                %{name}-glibc.patch
+Patch3:                %{name}-stdin.patch
+Patch4:                %{name}-bcopy.patch
+Patch5:                %{name}-security.patch
+Patch6:                %{name}-hosts.canna-fix.patch
+URL:           http://www.nec.co.jp/japanese/product/computer/soft/canna/
+# note: it doesn't link with X libraries, only uses xmkmf
+BuildRequires: XFree86-devel
+PreReq:                rc-scripts
+Requires(post,preun):  /sbin/chkconfig
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/groupdel
+Requires:      %{name}-libs = %{version}
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+ExcludeArch:   ia64
+
+%description
+Canna is a Japanese input system and provides a unified user interface
+for inputing Japanese. It supports Nemacs(Mule), kinput2, and canuum.
+All of these tools can be used by a single customization file,
+romaji-to-kana conversion rules and conversion dictionaries, and input
+Japanese in the same way. It converts kana to kanji based on a
+client-server model and supports automatically kana-to-kanji
+conversion.
+
+%description -l ja
+Canna ¤ÏÆüËܸì¤òÆþÎϤ¹¤ëºÝ¤Ë¡¢Åý°ì¤µ¤ì¤¿¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤òÄ󶡤¹
+¤ëÆüËܸìÆþÎÏ¥·¥¹¥Æ¥à¤Ç¤¹¡£Nemacs(Mule)¡¢kinput2¡¢canuum ¤ò¥µ¥Ý¡¼¥È¤·¤Æ
+¤¤¤Þ¤¹¡£¤³¤ì¤é¤Î¥Ä¡¼¥ë¤¹¤Ù¤Æ¤Ï¡¢Ã±°ì¤Î¥«¥¹¥¿¥Þ¥¤¥º¥Õ¥¡¥¤¥ë¡¢¥í¡¼¥Þ»ú¤«
+¤ÊÊÑ´¹µ¬Â§¡¢ÊÑ´¹¼­½ñ¤òÍѤ¤¤Æ¡¢Æ±ÍͤËÆüËܸìÆþÎϤǤ­¤Þ¤¹¡£¥¯¥é¥¤¥¢¥ó¥È-
+¥µ¡¼¥Ð¥â¥Ç¥ë¤Ë¤â¤È¤Å¤¤¤Æ¤«¤Ê¤ò´Á»ú¤ËÊÑ´¹¤·¡¢Ã༡Ū¤Ê¤«¤Ê´Á»úÊÑ´¹¤ò¥µ¥Ý¡¼
+¥È¤·¤Æ¤¤¤Þ¤¹¡£
+
+%description -l pl
+Canna to system wprowadzania znaków japoñskich, dostarczaj±cy
+jednolity interfejs u¿ytkownika do tego celu. Obs³uguje Cemacsa
+(Mule), kinput2 i canuum. Wszystkie te narzêdzia mog± byæ u¿ywane
+poprzez pojedynczy plik konfiguracyjny, w ten sam sposób dla zasad
+konwersji romaji do kana, s³owników konwersji i wprowadzania znaków.
+Canna konwertuje kana do kanji bazuj±c na modelu klient-serwer,
+obs³uguje te¿ automatyczn± konwersjê kana do kanji.
+
+%package libs
+Summary:       Runtime library for Canna
+Summary(pl):   Biblioteki Canna
+Group:         Libraries
+
+%description libs
+This package contains the runtime library for running programs with
+Canna.
+
+%description libs -l pl
+Ten pakiet zawiera biblioteki potrzebne do uruchamiania programów
+u¿ywaj±cych Canna.
+
+%package devel
+Summary:       Header files for Canna
+Summary(pl):   Pliki nag³ówkowe Canna
+Group:         Development/Libraries
+Requires:      %{name}-libs = %{version}
+
+%description devel
+This package contains the header files for building programs which use
+Canna.
+
+%description devel -l ja
+¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï Canna ¤òÍøÍѤ·¤¿¥×¥í¥°¥é¥à¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¤Ëɬ
+ÍפʥإåÀ¥Õ¥¡¥¤¥ë¤È¥é¥¤¥Ö¥é¥ê¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
+
+%description devel -l pl
+Ten pakiet zawiera pliki nag³ówkowe do budowania programów u¿ywaj±cych
+Canna.
+
+%package static
+Summary:       Canna static libraries
+Summary(pl):   Biblioteki statyczne Canna
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}
+
+%description static
+This package contains Canna static libraries.
+
+%description static -l pl
+Ten pakiet zawiera statyczne biblioteki Canna.
+
+%prep
+%setup -q -n %{name}35b2
+%patch0 -p1
+%patch1 -p1
+%patch3 -p1
+%patch2 -p0
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
+%build
+xmkmf -a
+# by some reason sglobal.h is not made automatically - workaround:
+%{__make} sglobal.h -C lib/canna
+%{__make} canna \
+       CDEBUGFLAGS="%{rpmcflags}" CXXDEBUGFLAGS="%{rpmcflags}"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/skel}
+
+%{__make} install install.man \
+       DESTDIR=$RPM_BUILD_ROOT \
+       MANSUFFIX=1 LIBMANSUFFIX=3
+
+# default manuals are in Japanese; install English ones too
+mv -f Canna.conf Canna.conf.orig
+sed -e 's/^#define JAPANESEMAN.*//' Canna.conf.orig > Canna.conf
+xmkmf -a
+%{__make} install.man \
+       DESTDIR=$RPM_BUILD_ROOT \
+       cannaManDir=%{_mandir} \
+       MANSUFFIX=1 LIBMANSUFFIX=3
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/canna
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/skel/.canna
+
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/hosts.canna << EOF
+unix
+localhost
+EOF
+
+gzip -9nf CHANGES.jp README* WHATIS*
+
+%clean
+rm -fr $RPM_BUILD_ROOT
+
+%pre
+if [ -n "`getgid canna`" ]; then
+       if [ "`getgid canna`" != "41" ]; then
+               echo "Warning: group canna doesn't have gid=41. Correct this before installing Canna." 1>&2
+               exit 1
+       fi
+else
+       /usr/sbin/groupadd -g 41 -r -f canna
+fi
+if [ -n "`id -u canna 2>/dev/null`" ]; then
+       if [ "`id -u canna`" != "41" ]; then
+               echo "Warning: user canna doesn't have uid=41. Correct this before installing Canna." 1>&2
+               exit 1
+       fi
+else
+       /usr/sbin/useradd -u 41 -r -d /var/lib/canna -s /bin/false \
+               -c "Canna Service User" -g canna canna 1>&2
+fi
+
+%post
+/sbin/chkconfig --add canna
+if [ -f /var/lock/subsys/canna ]; then
+       /etc/rc.d/init.d/canna restart 1>&2
+else
+       echo "Run \"/etc/rc.d/init.d/canna start\" to start Canna service."
+fi
+
+%preun
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/canna ]; then
+               /etc/rc.d/init.d/canna stop 1>&2
+       fi
+       /sbin/chkconfig --del canna
+fi
+
+%postun
+if [ "$1" = "0" ]; then
+       /usr/sbin/userdel canna
+fi
+
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc README.gz WHATIS.gz doc
+%lang(ja) %doc {CHANGES.jp,README.jp,WHATIS.jp}.gz
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/cannaserver
+%attr(755,root,root) %{_sbindir}/cannakill
+%attr(754,root,root) /etc/rc.d/init.d/canna
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/hosts.canna
+%config(noreplace) %verify(not size mtime md5) /etc/skel/.canna
+%{_mandir}/man1/*
+%lang(ja) %{_mandir}/ja/man1/*
+%attr(770,root,canna) /var/log/canna
+%dir /var/lib/canna
+%config(noreplace) %verify(not size mtime md5) /var/lib/canna/default.canna
+%config(noreplace) %verify(not size mtime md5) /var/lib/canna/engine.cf
+%attr(775,root,canna) %dir /var/lib/canna/dic
+%attr(664,root,canna) %config(noreplace) %verify(not size mtime md5) /var/lib/canna/dic/*.cbp
+%attr(775,root,canna) %dir /var/lib/canna/dic/canna
+%attr(664,root,canna) %config(noreplace) %verify(not size mtime md5) /var/lib/canna/dic/canna/*.c*
+%config(noreplace) %verify(not size mtime md5) /var/lib/canna/dic/canna/dics.dir
+/var/lib/canna/sample
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libRKC.so.1.0.0
+%attr(755,root,root) %{_libdir}/libRKC16.so.1.0.0
+%attr(755,root,root) %{_libdir}/libcanna.so.1.0.0
+%attr(755,root,root) %{_libdir}/libcanna16.so.1.0.0
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libRKC.so
+%attr(755,root,root) %{_libdir}/libRKC16.so
+%attr(755,root,root) %{_libdir}/libcanna.so
+%attr(755,root,root) %{_libdir}/libcanna16.so
+%{_includedir}/canna
+%{_mandir}/man3/*
+%lang(ja) %{_mandir}/ja/man3/*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libRKC.a
+%{_libdir}/libRKC16.a
+%{_libdir}/libcanna.a
+%{_libdir}/libcanna16.a