>Number:         22244
>Category:       pkg
>Synopsis:       canuum pkgsrc of canna-3.6p3 base and seculity hole fix version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Jul 24 14:46:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Osamu OISHI
>Release:        NetBSD-current
>Organization:
	
>Environment:
	
System: NetBSD alef.ims.ac.jp 1.4.3_ALPHA NetBSD 1.4.3_ALPHA (ALEF) #0: Tue Jul 31 15:45:47 JST 2001 root@alef.ims.ac.jp:/usr/src/sys/arch/i386/compile/ALEF i386


>Description:
canuum pkgsrc of canna-3.6p3 base and seculity hole fix version 
>How-To-Repeat:
The following is the shell archive of inputmethod/canna-canuum pkgsrc.
(All of the canuum source code is contained in Canna-3.6p3.tar.gz.)
 
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	canna-canuum
#	canna-canuum/patches
#	canna-canuum/patches/patch-aa
#	canna-canuum/patches/patch-ab
#	canna-canuum/patches/patch-ac
#	canna-canuum/DESCR
#	canna-canuum/Makefile
#	canna-canuum/PLIST
#	canna-canuum/distinfo
#	canna-canuum/MESSAGE
#
echo c - canna-canuum
mkdir -p canna-canuum > /dev/null 2>&1
echo c - canna-canuum/patches
mkdir -p canna-canuum/patches > /dev/null 2>&1
echo x - canna-canuum/patches/patch-aa
sed 's/^X//' >canna-canuum/patches/patch-aa << 'END-of-canna-canuum/patches/patch-aa'
X$NetBSD$
X
X+++ ../Canna.conf
X@@ -133,18 +133,18 @@
X /* rootにならずにインストールする時はこれを定義して下さい */
X /* #define InstallAsUser */
X /* 従来と互換のディレクトリ構造にする場合はこれを定義してください */
X-#define ObsoleteInstallDir
X+/* #define ObsoleteInstallDir */
X #ifdef InstallAsUser
X # define DefCannaPrefix $(HOME)/canna
X # define DefErrDir $(cannaPrefix)/log
X # define DefLibCannaDir $(cannaExecPrefix)/lib
X #else 
X-# define DefCannaPrefix /usr/local/canna
X+# define DefCannaPrefix ${PREFIX}
X # ifdef ObsoleteInstallDir
X #  define DefErrDir /usr/spool/canna
X #  define DefLibCannaDir /usr/lib
X # else
X-#  define DefErrDir /var/log
X+#  define DefErrDir ${CANNA_SPOOL}
X #  define DefLibCannaDir $(cannaExecPrefix)/lib
X # endif
X #endif
X@@ -173,10 +173,10 @@
X /* 次の3行は変更しないでください */
X wcharDefinition = -DCANNA_WCHAR
X Wlib =
X-JapaneseLocale = japanese
X+JapaneseLocale = ja_JP.eucJP
X 
X-cannaOwner = bin
X-cannaGroup = bin
X+cannaOwner = ${CANNA_OWNER}
X+cannaGroup = ${CANNA_GROUP}
X 
X #ifdef InstallAsUser
X cannaOwnerGroup =
X@@ -246,7 +246,7 @@
X  * コマンド類をリンクする時は、次を YES にしてくだい。
X  */
X /* #define UseInstalledLibCanna YES */
X-#define UseInstalledLibCanna NO
X+#define UseInstalledLibCanna YES
X 
X DicDir   = $(cannaLibDir)/dic
X 
X@@ -291,18 +291,18 @@
X     DEPCANNALIB = $(libCannaDir)/libcanna.a
X #endif
X # endif
X-       CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
X+       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
X #else /* ! UseInstalledLibCanna */
X # if DoSharedLib
X-    DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension)
X+    DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension)
X # else
X #ifdef __EMX__
X-    DEPCANNALIB = $(CANNASRC)/canna.a
X+    DEPCANNALIB = $(libCannaDir)/canna.a
X #else
X-    DEPCANNALIB = $(CANNASRC)/libcanna.a
X+    DEPCANNALIB = $(libCannaDir)/libcanna.a
X #endif
X # endif
X-       CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
X+       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna $(DLLIB)
X #endif /* UseInstalledLibCanna */
X 
X #if UseInstalledLibCanna
X@@ -311,14 +311,14 @@
X # else
X     DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
X # endif
X-       CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
X+       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
X #else /* ! UseInstalledLibCanna */
X # if DoSharedLib
X-    DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension)
X+    DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension)
X # else
X-    DEPCANNALIB16 = $(CANNASRC)/libcanna16.a
X+    DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
X # endif
X-       CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
X+       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna16 $(DLLIB)
X #endif /* UseInstalledLibCanna */
X 
X /*
X@@ -335,7 +335,7 @@
X      SCRIPTS_DEFINES = 
X 
X #ifdef JAPANESEMAN
X-JMNLOCALE = ja
X+JMNLOCALE = ja_JP.EUC
X #endif
X 
X /* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */
END-of-canna-canuum/patches/patch-aa
echo x - canna-canuum/patches/patch-ab
sed 's/^X//' >canna-canuum/patches/patch-ab << 'END-of-canna-canuum/patches/patch-ab'
X$NetBSD$
X+++ Imakefile	Tue Jun 24 20:06:56 2003
X@@ -22,7 +22,7 @@
X      CANNASRC = $(CANNAROOT)/lib/canna16
X       DEFINES = -DCANNA -DJAPANESE $(SIGNAL_DEFINES) -DHAVE_CONFIG_H \
X 		-DCONFIG_TERMINFO
X-     INCLUDES = -I$(CANNAROOT)/include -I.
X+     INCLUDES = -I$(CANNAROOT)/include -I. -I.. -I../canna
X SYS_LIBRARIES = $(TERMCAP_LIB)
X 
X          SRCS = header.c printf.c termio.c termcap.c \
END-of-canna-canuum/patches/patch-ab
echo x - canna-canuum/patches/patch-ac
sed 's/^X//' >canna-canuum/patches/patch-ac << 'END-of-canna-canuum/patches/patch-ac'
X$NetBSD$
X+++ ../misc/Imakefile	Tue Jun 24 19:46:27 2003
X@@ -44,6 +44,6 @@
X InstallNonExec(is.c,$(cannaLibDir)/sample/src)
X 
X clean::
X-	$(RM) $(PROGRAMS)
X+	$(RM) $(PROGRAMS) *.o *.core
X 
X DependDependency()
END-of-canna-canuum/patches/patch-ac
echo x - canna-canuum/DESCR
sed 's/^X//' >canna-canuum/DESCR << 'END-of-canna-canuum/DESCR'
XCanuum is a Japanese input frontend program from Wnn tty frontend uum.
END-of-canna-canuum/DESCR
echo x - canna-canuum/Makefile
sed 's/^X//' >canna-canuum/Makefile << 'END-of-canna-canuum/Makefile'
X# $NetBSD: Exp $
X#
X
XDISTNAME=	Canna${CANNA_VERSION:S|.||:S|pl|p|}
XPKGNAME=	Canna-${CANNA_MODULE}-${CANNA_VERSION}
XWRKSRC=		${WRKDIR}/${DISTNAME}/canuum
XCATEGORIES=	japanese inputmethod
XMASTER_SITES=	http://downloads.sourceforge.jp/canna/2181/
X
XCANNA_MODULE=	canuum
X
XMAINTAINER=	oishi@ims.ac.jp
XHOMEPAGE=	http://www.nec.co.jp/japanese/product/computer/soft/canna/
XCOMMENT=	Japanese input tty frontend for Canna using uum
X
XUSE_BUILDLINK2=	YES
XMAKE_ARGS=	PREFIX=${PREFIX}
XCANNA_VERSION=	3.6pl3
X
Xdo-configure:
X	@(cd ${WRKDIR}/${DISTNAME}; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
X		${MAKE} ${MAKE_ARGS} Makefile; \
X		${MAKE} ${MAKE_ARGS} cannaconf.h)
X	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
X		${MAKE} ${MAKE_ARGS} Makefile; \
X		${MAKE} ${MAKE_ARGS} includes; \
X		${MAKE} ${MAKE_ARGS} depend)
X
Xdo-build:
X	@(cd ${WRKSRC}; ${MAKE_PROGRAM} ${MAKE_ARGS} all)
X
Xpre-install:
X	@${MKDIR} ${WRKSRC}/misc
X
Xpost-install:
X	@${INSTALL_MAN} ${WRKSRC}/canuum.jmn \
X		${PREFIX}/man/ja_JP.EUC/man1/canuum.1
X
X.include "../../devel/nbitools/buildlink2.mk"
X.include "../../inputmethod/canna-lib/buildlink2.mk"
X.include "../../mk/bsd.pkg.mk"
END-of-canna-canuum/Makefile
echo x - canna-canuum/PLIST
sed 's/^X//' >canna-canuum/PLIST << 'END-of-canna-canuum/PLIST'
X@comment $NetBSD: PLIST,v 1.2 2002/06/10 09:54:59 sakamoto Exp $
Xbin/canuum
Xman/ja_JP.EUC/man1/canuum.1
END-of-canna-canuum/PLIST
echo x - canna-canuum/distinfo
sed 's/^X//' >canna-canuum/distinfo << 'END-of-canna-canuum/distinfo'
X$NetBSD$
X
XSHA1 (Canna36p3.tar.gz) = 183c4e160babd49d5d8c542fbf06db980e3965da
XSize (Canna36p3.tar.gz) = 1441598 bytes
XSHA1 (patch-aa) = a7ab1751da8230dbd0c882211646bd447692925b
XSHA1 (patch-ab) = b99314648ad936f59510f587bfd2266dc23d0452
XSHA1 (patch-ac) = 5701b4242b9efe60b3cc9fe6458d9d80fb630b12
END-of-canna-canuum/distinfo
echo x - canna-canuum/MESSAGE
sed 's/^X//' >canna-canuum/MESSAGE << 'END-of-canna-canuum/MESSAGE'
X===========================================================================
X$NetBSD: MESSAGE,$
X
XYou at least should set up key functions in "${HOME}/.canna".
Xsuch as:
X(set-key 'alpha-mode "\C-i" 'japanese-mode)
X(set-key 'empty-mode "\C-i" 'alpha-mode)
X===========================================================================
END-of-canna-canuum/MESSAGE
exit

>Fix:
	

>Release-Note:
>Audit-Trail:
>Unformatted: