<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[40111] trunk/dports/textproc/canna</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/40111">40111</a></dd>
<dt>Author</dt> <dd>takanori@macports.org</dd>
<dt>Date</dt> <dd>2008-09-20 21:56:33 -0700 (Sat, 20 Sep 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>canna:
* fixed null pointer dereferences in cmd/catdic/can.c - obtained from: FreeBSD
* fixed crash problem of cannaserver - obtained from: Canna CVS</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextproccannaPortfile">trunk/dports/textproc/canna/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportstextproccannafilespatchcmd_catdic_Imakefilediff">trunk/dports/textproc/canna/files/patch-cmd_catdic_Imakefile.diff</a></li>
<li><a href="#trunkdportstextproccannafilespatchlib_RK_ncachecdiff">trunk/dports/textproc/canna/files/patch-lib_RK_ncache.c.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextproccannaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/canna/Portfile (40110 => 40111)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> name            canna
</span><span class="cx"> version         3.7p3
</span><span class="cx"> set dicversion  0.95c
</span><ins>+revision        1
</ins><span class="cx"> categories      textproc japanese
</span><span class="cx"> maintainers     takanori openmaintainer
</span><span class="cx"> description     Kana-Kanji conversion system
</span><span class="lines">@@ -12,9 +13,7 @@
</span><span class="cx">                 ${description}
</span><span class="cx"> platforms       darwin
</span><span class="cx"> homepage        http://canna.sourceforge.jp/
</span><del>-#master_sites   sourceforge_jp:${name}/9565/:canna \
-#               http://cannadic.oucrc.org/:cannadic
-master_sites    http://downloads.sourceforge.jp/canna/9565/:canna \
</del><ins>+master_sites    sourceforge_jp:${name}/9565/:canna \
</ins><span class="cx">                 http://cannadic.oucrc.org/:cannadic
</span><span class="cx"> distname        &quot;Canna[string map {&quot;.&quot; &quot;&quot;} ${version}]&quot;
</span><span class="cx"> use_bzip2       yes
</span><span class="lines">@@ -25,6 +24,8 @@
</span><span class="cx">                 patch-doc_man_guide_tex_Imakefile.diff \
</span><span class="cx">                 patch-lib_canna_lisp.c.diff \
</span><span class="cx">                 patch-server_util.c.diff \
</span><ins>+                patch-cmd_catdic_Imakefile.diff \
+                patch-lib_RK_ncache.c.diff \
</ins><span class="cx">                 \
</span><span class="cx">                 patch-dic_ideo_words_dics.dir.diff \
</span><span class="cx">                 patch-misc_default.ca.diff
</span></span></pre></div>
<a id="trunkdportstextproccannafilespatchcmd_catdic_Imakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/textproc/canna/files/patch-cmd_catdic_Imakefile.diff (0 => 40111)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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 &quot;../../Canna.conf&quot;
+ #include &quot;../cmd.tmpl&quot;

+-          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
</ins></span></pre></div>
<a id="trunkdportstextproccannafilespatchlib_RK_ncachecdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/textproc/canna/files/patch-lib_RK_ncache.c.diff (0 => 40111)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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        &quot;RKintern.h&quot;

+ #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;
</ins></span></pre>
</div>
</div>

</body>
</html>