CVS commit: pkgsrc/inputmethod

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Fri Mar 23 04:43:36 UTC 2018

Modified Files:
        pkgsrc/inputmethod/canna: distinfo
        pkgsrc/inputmethod/canna-server: Makefile
Added Files:
        pkgsrc/inputmethod/canna/patches: patch-cmd_catdic_rutil.c

Log Message:
Fix buffer over run in mkdic, found by stack protector.
Bump PKGREVISION for Canna-server.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/inputmethod/canna/distinfo
cvs rdiff -u -r1.24 -r1.25 pkgsrc/inputmethod/canna-server/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/canna/patches/patch-cmd_catdic_rutil.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/canna/distinfo
diff -u pkgsrc/inputmethod/canna/distinfo:1.17 pkgsrc/inputmethod/canna/distinfo:1.18
--- pkgsrc/inputmethod/canna/distinfo:1.17      Sat Jul 22 17:53:16 2017
+++ pkgsrc/inputmethod/canna/distinfo   Fri Mar 23 04:43:36 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2017/07/22 17:53:16 maya Exp $
+$NetBSD: distinfo,v 1.18 2018/03/23 04:43:36 rin Exp $
 
 SHA1 (Canna37p3.tar.bz2) = e39eece7c70c669dd46dd74b26121a60a2496fde
 RMD160 (Canna37p3.tar.bz2) = 33e5eb9e2dc144835db838612897e652acbc60ed
@@ -16,6 +16,7 @@ SHA1 (patch-canuum_jhlp.c) = 1d15186608f
 SHA1 (patch-canuum_printf.c) = c05ef114fae689855989d5d5eded2f734c62e12e
 SHA1 (patch-canuum_termcap.c) = 958015b3bf4e9f89703e198c1ed28d51ae3f8c4e
 SHA1 (patch-canuum_termio.c) = df9e68c8fb564ee4c4367acf6b042c253d17e525
+SHA1 (patch-cmd_catdic_rutil.c) = f9b3d866c089cc6a49d8f90c216fb27cbbc55e19
 SHA1 (patch-cmd_cmd.tmpl) = f6ec97c273aa84eb84bdd24cbe16aaf7e696e041
 SHA1 (patch-dic_phono_Imakefile) = 4e1210517317b57796cad5b350de41e1f0d8157d
 SHA1 (patch-lib_RKC_convert.c) = f196cfa3db3ef163c1869ca6bfd3f22170997aef

Index: pkgsrc/inputmethod/canna-server/Makefile
diff -u pkgsrc/inputmethod/canna-server/Makefile:1.24 pkgsrc/inputmethod/canna-server/Makefile:1.25
--- pkgsrc/inputmethod/canna-server/Makefile:1.24       Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna-server/Makefile    Fri Mar 23 04:43:36 2018
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2015/10/18 03:58:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.25 2018/03/23 04:43:36 rin Exp $
 
+PKGREVISION=   1
 CANNA_MODULE=  server
 
 .include "../../inputmethod/canna/Makefile.common"

Added files:

Index: pkgsrc/inputmethod/canna/patches/patch-cmd_catdic_rutil.c
diff -u /dev/null pkgsrc/inputmethod/canna/patches/patch-cmd_catdic_rutil.c:1.1
--- /dev/null   Fri Mar 23 04:43:36 2018
+++ pkgsrc/inputmethod/canna/patches/patch-cmd_catdic_rutil.c   Fri Mar 23 04:43:36 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmd_catdic_rutil.c,v 1.1 2018/03/23 04:43:36 rin Exp $
+
+Fix buffer over run in mkdic, found by stack protector.
+
+--- cmd/catdic/rutil.c.orig    2018-03-23 13:28:58.453648806 +0900
++++ cmd/catdic/rutil.c 2018-03-23 13:29:11.364912041 +0900
+@@ -308,7 +308,7 @@ int cn;
+ unsigned char *dicname;
+ int mode ;
+ {
+-  char ans[79];
++  char ans[80];
+   int ret = 0;
+ 
+   static int  majv , minv , bak ;