[40111] trunk/dports/textproc/canna

[takanori at macports.org]

Revision: 40111
          http://trac.macports.org/changeset/40111
Author:   takanori at macports.org
Date:     2008-09-20 21:56:33 -0700 (Sat, 20 Sep 2008)
Log Message:
-----------
canna:
* fixed null pointer dereferences in cmd/catdic/can.c - obtained from: FreeBSD
* fixed crash problem of cannaserver - obtained from: Canna CVS

Modified Paths:
--------------
    trunk/dports/textproc/canna/Portfile

Added Paths:
-----------
    trunk/dports/textproc/canna/files/patch-cmd_catdic_Imakefile.diff
    trunk/dports/textproc/canna/files/patch-lib_RK_ncache.c.diff

Modified: trunk/dports/textproc/canna/Portfile
===================================================================
--- trunk/dports/textproc/canna/Portfile	2008-09-20 22:46:19 UTC (rev 40110)
+++ trunk/dports/textproc/canna/Portfile	2008-09-21 04:56:33 UTC (rev 40111)
@@ -5,6 +5,7 @@
 name            canna
 version         3.7p3
 set dicversion  0.95c
+revision        1
 categories      textproc japanese
 maintainers     takanori openmaintainer
 description     Kana-Kanji conversion system
@@ -12,9 +13,7 @@
                 ${description}
 platforms       darwin
 homepage        http://canna.sourceforge.jp/
-#master_sites   sourceforge_jp:${name}/9565/:canna \
-#               http://cannadic.oucrc.org/:cannadic
-master_sites    http://downloads.sourceforge.jp/canna/9565/:canna \
+master_sites    sourceforge_jp:${name}/9565/:canna \
                 http://cannadic.oucrc.org/:cannadic
 distname        "Canna[string map {"." ""} ${version}]"
 use_bzip2       yes
@@ -25,6 +24,8 @@
                 patch-doc_man_guide_tex_Imakefile.diff \
                 patch-lib_canna_lisp.c.diff \
                 patch-server_util.c.diff \
+                patch-cmd_catdic_Imakefile.diff \
+                patch-lib_RK_ncache.c.diff \
                 \
                 patch-dic_ideo_words_dics.dir.diff \
                 patch-misc_default.ca.diff

Added: trunk/dports/textproc/canna/files/patch-cmd_catdic_Imakefile.diff
===================================================================
--- trunk/dports/textproc/canna/files/patch-cmd_catdic_Imakefile.diff	                        (rev 0)
+++ trunk/dports/textproc/canna/files/patch-cmd_catdic_Imakefile.diff	2008-09-21 04:56:33 UTC (rev 40111)
@@ -0,0 +1,11 @@
+--- cmd/catdic/Imakefile.orig	2003-10-02 16:40:30.000000000 +0900
++++ cmd/catdic/Imakefile	2008-09-21 13:05:51.000000000 +0900
+@@ -2,7 +2,7 @@
+ #include "../../Canna.conf"
+ #include "../cmd.tmpl"
+ 
+-          DEFINES = $(SIGNAL_DEFINES) $(ENGINE_DEFS)
++          DEFINES = $(SIGNAL_DEFINES) $(ENGINE_DEFS) -DUSE_VARARGS
+          INCLUDES = -I$(CANNAROOT)/include
+              SRCS = can.c rutil.c RKdelline.c
+              OBJS = can.o rutil.o RKdelline.o

Added: trunk/dports/textproc/canna/files/patch-lib_RK_ncache.c.diff
===================================================================
--- trunk/dports/textproc/canna/files/patch-lib_RK_ncache.c.diff	                        (rev 0)
+++ trunk/dports/textproc/canna/files/patch-lib_RK_ncache.c.diff	2008-09-21 04:56:33 UTC (rev 40111)
@@ -0,0 +1,11 @@
+--- lib/RK/ncache.c.orig	2003-09-17 17:50:52.000000000 +0900
++++ lib/RK/ncache.c	2008-09-21 13:09:04.000000000 +0900
+@@ -27,7 +27,7 @@
+ #include	"RKintern.h"
+ 
+ #define	NCHASH		101
+-#define	hash(x)		((int)((x)%NCHASH))
++#define	hash(x)		((int)(((unsigned long)(x))%NCHASH))
+ 
+ static struct ncache	Nchash[NCHASH];
+ static struct ncache	Ncfree;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080920/8585a717/attachment.html