-
Notifications
You must be signed in to change notification settings - Fork 160
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changes from 3.5b2 are: * Add -inet option not to allow TCP connections by default. * Fix a buffer overflow. (This fix was already incorpolated in Pkgsrc version.) * Improve dicionary. * Improve conversion engine. * Other bug fixes. Patch is made by Yoshifumi Hiramatsu. Tested by Toru Takamizu.
- Loading branch information
uebayasi
committed
Dec 27, 2002
1 parent
2e18bd5
commit b4c2452
Showing
16 changed files
with
187 additions
and
775 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,15 @@ | ||
| # $NetBSD: Makefile,v 1.2 2002/08/21 02:43:45 grant Exp $ | ||
| # $NetBSD: Makefile,v 1.3 2002/12/27 08:41:23 uebayasi Exp $ | ||
|
|
||
| DISTNAME= Canna35b2 | ||
| PKGNAME= Canna-dict-3.5.2 | ||
| PKGREVISION= 2 | ||
| DISTNAME= Canna36p1 | ||
| PKGNAME= Canna-dict-3.6.1 | ||
| CATEGORIES= japanese inputmethod | ||
| MASTER_SITES= ftp://ftp.nec.co.jp/pub/Canna/Canna35/ | ||
|
|
||
| PATCH_SITES= http://www.jaist.ac.jp/~fujieda/canna/ | ||
| PATCHFILES= Canna35b2-unoff1.patch.gz Canna35b2-unoff2.patch.gz \ | ||
| Canna35b2-hack1.patch.gz | ||
| PATCH_DIST_STRIP= -p1 | ||
| MASTER_SITES= http://downloads.sourceforge.jp/canna/1722/ | ||
|
|
||
| MAINTAINER= [email protected] | ||
| HOMEPAGE= http://www.nec.co.jp/japanese/product/computer/soft/canna/ | ||
| HOMEPAGE= http://canna.sourceforge.jp/ | ||
| COMMENT= Kana-Kanji conversion system (dictionary) | ||
|
|
||
| BUILD_DEPENDS+= Canna-server-bin>=3.5.2nb2:../canna-server-bin | ||
| BUILD_DEPENDS+= Canna-server-bin>=3.6.1:../canna-server-bin | ||
|
|
||
| FILESDIR= ${.CURDIR}/../canna-lib/files | ||
| DISTINFO_FILE= ${.CURDIR}/../canna-lib/distinfo | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,13 @@ | ||
| # $NetBSD: Makefile,v 1.4 2002/08/25 19:22:55 jlam Exp $ | ||
| # $NetBSD: Makefile,v 1.5 2002/12/27 08:41:24 uebayasi Exp $ | ||
| # | ||
|
|
||
| DISTNAME= Canna35b2 | ||
| PKGNAME= Canna-lib-3.5.2 | ||
| PKGREVISION= 2 | ||
| DISTNAME= Canna36p1 | ||
| PKGNAME= Canna-lib-3.6.1 | ||
| CATEGORIES= japanese inputmethod | ||
| MASTER_SITES= ftp://ftp.nec.co.jp/pub/Canna/Canna35/ | ||
|
|
||
| PATCH_SITES= http://www.jaist.ac.jp/~fujieda/canna/ | ||
| PATCHFILES= Canna35b2-unoff1.patch.gz Canna35b2-unoff2.patch.gz \ | ||
| Canna35b2-hack1.patch.gz | ||
| PATCH_DIST_STRIP= -p1 | ||
| MASTER_SITES= http://downloads.sourceforge.jp/canna/1722/ | ||
|
|
||
| MAINTAINER= [email protected] | ||
| HOMEPAGE= http://www.nec.co.jp/japanese/product/computer/soft/canna/ | ||
| HOMEPAGE= http://canna.sourceforge.jp/ | ||
| COMMENT= Kana-Kanji conversion system (library) | ||
|
|
||
| INSTALL_TARGET= install install.man | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,9 @@ | ||
| $NetBSD: distinfo,v 1.4 2002/12/02 03:40:20 itojun Exp $ | ||
| $NetBSD: distinfo,v 1.5 2002/12/27 08:41:24 uebayasi Exp $ | ||
|
|
||
| SHA1 (Uum4.109.tar.gz) = 9d57fa67fc321c0b1101970b02154b5d6e42e88e | ||
| Size (Uum4.109.tar.gz) = 43738 bytes | ||
| SHA1 (Canna35b2.tar.gz) = 66742205272cbc6bd91f272596381f761feac0a2 | ||
| Size (Canna35b2.tar.gz) = 1333329 bytes | ||
| SHA1 (Canna35b2-unoff1.patch.gz) = 19579591190f7ace7d3ec5f61a7d01ca3bc576c1 | ||
| Size (Canna35b2-unoff1.patch.gz) = 21443 bytes | ||
| SHA1 (Canna35b2-unoff2.patch.gz) = 16d578ed0558a632832194fffad8fcf24c9181fb | ||
| Size (Canna35b2-unoff2.patch.gz) = 11375 bytes | ||
| SHA1 (Canna35b2-hack1.patch.gz) = 24ab2baf104ef9748f92bd5315d4100a7ee961ab | ||
| Size (Canna35b2-hack1.patch.gz) = 8384 bytes | ||
| SHA1 (patch-aa) = 45cdfd8107ee0beeae878c9940273fc6bca0385a | ||
| SHA1 (patch-ab) = 38f3ad4e022299a4dfd8d9391b1742b0d0f02a71 | ||
| SHA1 (Canna36p1.tar.gz) = 3e08fc03e16298ad7941a923989ea35929cdf3ba | ||
| Size (Canna36p1.tar.gz) = 1337483 bytes | ||
| SHA1 (patch-aa) = 816a5fddac06c980eaa7f622b6872231741c76a5 | ||
| SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9 | ||
| SHA1 (patch-ac) = 8f9f999eb8abd9c8e3d3e5c66cf55150ce700919 | ||
| SHA1 (patch-ad) = dd2eb94e75dc4789e298aa1601280d32fbe5ec96 | ||
| SHA1 (patch-ae) = e44c60ddf1e042ab5df1457b6723071c38baae02 | ||
| SHA1 (patch-ad) = d4b5720c206f81124e0d53e71590de86f66c524c | ||
| SHA1 (patch-af) = 2700fc8395895176c16562af66ea5bf0b13d4e10 | ||
| SHA1 (patch-ag) = 5436f27d2f5fff1d317d58b3beeb1233d801ef32 | ||
| SHA1 (patch-ah) = eee6fc00787dbb59fd7571ba09cbed28c5c18e9c | ||
| SHA1 (patch-ai) = 77cc19926b80f503c9b5171e10722ed0a492dec4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,21 @@ | ||
| $NetBSD: patch-ab,v 1.3 2002/08/25 19:22:56 jlam Exp $ | ||
|
|
||
| --- ./Imakefile.orig Wed Nov 27 16:01:34 1996 | ||
| +++ ./Imakefile Fri Jul 30 19:17:44 1999 | ||
| @@ -61,5 +61,5 @@ | ||
| $NetBSD: patch-ab,v 1.4 2002/12/27 08:41:24 uebayasi Exp $ | ||
| --- Imakefile.orig Thu Dec 5 22:39:41 2002 | ||
| +++ Imakefile Thu Dec 5 22:40:03 2002 | ||
| @@ -60,7 +60,7 @@ | ||
| for i in $(SERVERDIR) ;\ | ||
| do \ | ||
| (cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \ | ||
| - $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \ | ||
| + $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \ | ||
| done | ||
|
|
||
| @@ -69,5 +69,5 @@ | ||
| instclient:: | ||
| @@ -68,7 +68,7 @@ | ||
| for i in $(CLIENTDIR) ;\ | ||
| do \ | ||
| (cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \ | ||
| - $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \ | ||
| + $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \ | ||
| done | ||
|
|
||
| instsgs:: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,12 @@ | ||
| $NetBSD: patch-ad,v 1.3 2002/08/25 19:22:56 jlam Exp $ | ||
| --- server/misc.c~ Fri Jul 29 12:03:54 1994 | ||
| +++ server/misc.c Fri Jun 30 10:16:39 2000 | ||
| @@ -788,12 +788,19 @@ | ||
|
|
||
| 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); | ||
| $NetBSD: patch-ad,v 1.4 2002/12/27 08:41:24 uebayasi Exp $ | ||
| --- dic/ideo/pubdic/Imakefile.orig Thu Dec 5 23:43:40 2002 | ||
| +++ dic/ideo/pubdic/Imakefile Thu Dec 5 23:43:52 2002 | ||
| @@ -9,7 +9,7 @@ | ||
| CANNAROOT = ../../.. | ||
| CANNACMDDIR = $(CANNAROOT)/cmd | ||
| MERGE = $(CANNACMDDIR)/mergewd/mergeword | ||
| - INCLUDES = -I$(CANNAROOT)/include | ||
| + INCLUDES = -I$(CANNAROOT)/canna | ||
| #endif | ||
| TARGETS = iroha.t | ||
| PUBDICS = a.p k.p s.p t.p n.p h.p m.p y.p r.p w.p x.p |
Oops, something went wrong.