From owner-ports-jp@jp.FreeBSD.org Mon Dec  2 10:59:57 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id gB21xvv16582;
	Mon, 2 Dec 2002 10:59:57 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from kappa.allnet.ne.jp (kappa.allnet.ne.jp [61.211.150.156])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet id gB21xu216577
	for <ports-jp@jp.freebsd.org>; Mon, 2 Dec 2002 10:59:56 +0900 (JST)
	(envelope-from kanou@kappa.allnet.ne.jp)
Received: from localhost (localhost [127.0.0.1])
	by kappa.allnet.ne.jp (8.12.6/8.12.5) with ESMTP id gB2209vv087361;
	Mon, 2 Dec 2002 11:00:09 +0900 (JST)
	(envelope-from kanou@kappa.allnet.ne.jp)
Message-Id: <200212020200.gB2209vv087361@kappa.allnet.ne.jp>
To: ports-jp@jp.FreeBSD.org
From: KANOU Hiroki <kanou@mil.allnet.ne.jp>
cc: kanou@mil.allnet.ne.jp
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
Date: Mon, 02 Dec 2002 11:00:09 +0900
X-Sequence: ports-jp 13446
Subject: [ports-jp 13446] Canna 3.6p1 (security fix)
Errors-To: owner-ports-jp@jp.FreeBSD.org
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: kanou@kappa.allnet.ne.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+021111

$B<mLn$H?=$7$^$9!#(Bcanna.sourceforge.jp $B$N%W%m%8%'%/%H%a%s%P!<$K(B
$B2C$($5$;$F$$$?$@$$$F$*$j$^$9!#(B

$B:#F|!"(BCanna 3.6 p1 $B$,%j%j!<%9$5$l$^$7$?!#(B
$B%;%-%e%j%F%#%[!<%k$KBP$9$k=$@5$,2C$($i$l$F$$$^$9!#(B
port $B$r=$@5$7$^$7$?$N$G!"%"%C%W%G!<%H$r$*4j$$$7$^$9!#(B

$B<mLn(B $B9(<y(B  <kanou@mil.allnet.ne.jp / kanou@sourceforge.jp>


diff -uNr Canna.orig/Makefile Canna/Makefile
--- Canna.orig/Makefile	Wed Nov 20 18:50:03 2002
+++ Canna/Makefile	Mon Dec  2 10:51:46 2002
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	Canna
-PORTVERSION=	3.6
-PORTREVISION=	1
+PORTVERSION=	3.6p1
 CATEGORIES=	japanese
-MASTER_SITES=	http://downloads.sourceforge.jp/canna/1425/
+MASTER_SITES=	http://downloads.sourceforge.jp/canna/1722/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	max@FreeBSD.org
@@ -30,7 +29,7 @@
 	RkEnlarge.3 RkFinalize.3 RkGetDicList.3 RkGetKanji.3 RkGetLex.3 \
 	RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 RkIntro.3 RkLeft.3 \
 	RkMapPhonogram.3 RkMapRoma.3 RkMountD.3 RkNext.3 RkNfer.3 \
-	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkRgnBun.3 RkRight.3 \
+	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkBgnBun.3 RkRight.3 \
 	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff -uNr Canna.orig/distinfo Canna/distinfo
--- Canna.orig/distinfo	Tue Nov 12 11:39:57 2002
+++ Canna/distinfo	Mon Dec  2 10:33:27 2002
@@ -1 +1 @@
-MD5 (Canna36.tar.gz) = 6c6698f1b6202d92d62b85aed599c519
+MD5 (Canna36p1.tar.gz) = 303f236f40f923c9c3f3cdde90561ddc
diff -uNr Canna.orig/files/patch-ag Canna/files/patch-ag
--- Canna.orig/files/patch-ag	Sun Nov 18 13:48:55 2001
+++ Canna/files/patch-ag	Mon Dec  2 10:45:53 2002
@@ -1,18 +1,36 @@
---- cmd/catdic/Imakefile.orig	Mon Oct 29 01:41:09 2001
-+++ cmd/catdic/Imakefile	Mon Oct 29 01:42:13 2001
+--- cmd/catdic/Imakefile.orig	Thu Nov  7 23:46:02 2002
++++ cmd/catdic/Imakefile	Mon Dec  2 10:45:18 2002
+@@ -62,7 +62,7 @@
+ 	$(RM) $(DESTDIR)$(cannaBinDir)/chmoddic.exe
+ 	$(RM) $(DESTDIR)$(cannaBinDir)/addwords.exe
+ 	$(RM) $(DESTDIR)$(cannaBinDir)/delwords.exe
+-	$(RM) $(DESTDIR)$(cannaBinDir)/cannakill.exe
++	$(RM) $(DESTDIR)$(cannaSrvDir)/cannakill.exe
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cpdic.exe
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/lsdic.exe
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mkdic.exe
+@@ -72,7 +72,7 @@
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/chmoddic.exe
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/addwords.exe
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/delwords.exe
+-	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cannakill.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaSrvDir)/cannakill.exe
+ #else
+ install::
+ 	$(RM) $(DESTDIR)$(cannaBinDir)/cpdic
 @@ -84,7 +84,7 @@
- 	$(RM) $(cannaBinDir)/chmoddic
- 	$(RM) $(cannaBinDir)/addwords
- 	$(RM) $(cannaBinDir)/delwords
--	$(RM) $(cannaBinDir)/cannakill
-+	$(RM) $(cannaSrvDir)/cannakill
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic
-@@ -93,5 +93,5 @@
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords
--	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill
-+	$(LN) $(cannaBinDir)/catdic $(cannaSrvDir)/cannakill
+ 	$(RM) $(DESTDIR)$(cannaBinDir)/chmoddic
+ 	$(RM) $(DESTDIR)$(cannaBinDir)/addwords
+ 	$(RM) $(DESTDIR)$(cannaBinDir)/delwords
+-	$(RM) $(DESTDIR)$(cannaBinDir)/cannakill
++	$(RM) $(DESTDIR)$(cannaSrvDir)/cannakill
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cpdic
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/lsdic
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mkdic
+@@ -94,5 +94,5 @@
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/chmoddic
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/addwords
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/delwords
+-	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cannakill
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaSrvDir)/cannakill
  #endif
