diff options
| author | tsutsui <tsutsui@pkgsrc.org> | 2015-10-25 12:17:36 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui@pkgsrc.org> | 2015-10-25 12:17:36 +0000 |
| commit | 28ae0fdf51da1d70e5062d82c0b4a50588a685c8 (patch) | |
| tree | 88595a85503b32bf7c53fedacc2e98aead97a30b /inputmethod | |
| parent | 25934d46fe48526e7e13444a01c2f028a5b1c65c (diff) | |
| download | pkgsrc-28ae0fdf51da1d70e5062d82c0b4a50588a685c8.tar.gz | |
Pull upstream fix to avoid libcanna crash triggered by set-key command.
Reported by Takeshi Nakayama in PR pkg/50368.
Also update comment in patch-lib_RK_ncache.c to mention about
the upstream fix in the same commit.
Bump PKGREVISION.
Diffstat (limited to 'inputmethod')
| -rw-r--r-- | inputmethod/canna-lib/Makefile | 3 | ||||
| -rw-r--r-- | inputmethod/canna/distinfo | 5 | ||||
| -rw-r--r-- | inputmethod/canna/patches/patch-lib_RK_ncache.c | 5 | ||||
| -rw-r--r-- | inputmethod/canna/patches/patch-lib_canna_keydef.c | 22 |
4 files changed, 30 insertions, 5 deletions
diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile index a50d41c7389..f6e644f7454 100644 --- a/inputmethod/canna-lib/Makefile +++ b/inputmethod/canna-lib/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2015/10/18 03:58:31 tsutsui Exp $ +# $NetBSD: Makefile,v 1.16 2015/10/25 12:17:36 tsutsui Exp $ +PKGREVISION= 1 CANNA_MODULE= lib .include "../../inputmethod/canna/Makefile.common" diff --git a/inputmethod/canna/distinfo b/inputmethod/canna/distinfo index 0a258ba2d67..8c682dbc8f5 100644 --- a/inputmethod/canna/distinfo +++ b/inputmethod/canna/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2015/10/18 03:58:31 tsutsui Exp $ +$NetBSD: distinfo,v 1.13 2015/10/25 12:17:36 tsutsui Exp $ SHA1 (Canna37p3.tar.bz2) = e39eece7c70c669dd46dd74b26121a60a2496fde RMD160 (Canna37p3.tar.bz2) = 33e5eb9e2dc144835db838612897e652acbc60ed @@ -20,4 +20,5 @@ SHA1 (patch-cmd_cmd.tmpl) = f6ec97c273aa84eb84bdd24cbe16aaf7e696e041 SHA1 (patch-dic_phono_Imakefile) = 4e1210517317b57796cad5b350de41e1f0d8157d SHA1 (patch-lib_RKC_convert.c) = f196cfa3db3ef163c1869ca6bfd3f22170997aef SHA1 (patch-lib_RK_dd.c) = 8055a2a3902e7d4d0cc1d782295c2879311750ec -SHA1 (patch-lib_RK_ncache.c) = f322d8b0c23e3b00b6d605ec2a044ac637a3cbfe +SHA1 (patch-lib_RK_ncache.c) = e792592500e7db85a6b2370c4ea9eb533d97bda0 +SHA1 (patch-lib_canna_keydef.c) = af14140f58bf8a6214a7fb9d5d73347c1b3cdd85 diff --git a/inputmethod/canna/patches/patch-lib_RK_ncache.c b/inputmethod/canna/patches/patch-lib_RK_ncache.c index 2a288a4b695..3fb04820262 100644 --- a/inputmethod/canna/patches/patch-lib_RK_ncache.c +++ b/inputmethod/canna/patches/patch-lib_RK_ncache.c @@ -1,6 +1,7 @@ -$NetBSD: patch-lib_RK_ncache.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $ +$NetBSD: patch-lib_RK_ncache.c,v 1.2 2015/10/25 12:17:36 tsutsui Exp $ -Fix crash problem of cannaserver. +Pull upstream fix to avoid crash problem of cannaserver. + https://osdn.jp/cvs/view/canna/canna/lib/RK/ncache.c?view=log#rev1.3 --- lib/RK/ncache.c.orig 2003-09-17 08:50:52.000000000 +0000 +++ lib/RK/ncache.c diff --git a/inputmethod/canna/patches/patch-lib_canna_keydef.c b/inputmethod/canna/patches/patch-lib_canna_keydef.c new file mode 100644 index 00000000000..996193400de --- /dev/null +++ b/inputmethod/canna/patches/patch-lib_canna_keydef.c @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_canna_keydef.c,v 1.1 2015/10/25 12:17:36 tsutsui Exp $ + +Pull upstream fix to avoid crash on set-key in ~/.canna (PR pkg/50368). + https://osdn.jp/cvs/view/canna/canna/lib/canna/keydef.c?view=log#rev1.3 + +--- lib/canna/keydef.c.orig 2003-09-17 08:50:53.000000000 +0000 ++++ lib/canna/keydef.c +@@ -444,12 +444,9 @@ static unsigned int + createHashKey(data1, data2, which_seq) + unsigned char *data1; + unsigned char data2; +-int which_seq; ++unsigned int which_seq; + { +- unsigned int hashKey; +- +- hashKey = (int)(((POINTERINT)data1 + (POINTERINT)data2) % which_seq); +- return hashKey; ++ return (unsigned int)(((canna_uintptr_t)data1 + (canna_uintptr_t)data2) % which_seq); + } + + /* 機能シーケンスを割り出す */ |