From c7105a5a858455507981790301393abfa453ec71 Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Mon, 13 Mar 2006 09:17:51 +0000
Subject: Add patch to fix array subscript out of range bug which reported to
 kakasi-dev mailing list:

http://www.namazu.org/pipermail/kakasi-dev/2006-March/000039.html

Bump PKGREVISION.
---
 textproc/kakasi/Makefile         |  4 ++--
 textproc/kakasi/buildlink3.mk    |  6 +++---
 textproc/kakasi/distinfo         |  3 ++-
 textproc/kakasi/patches/patch-ad | 22 ++++++++++++++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 textproc/kakasi/patches/patch-ad

(limited to 'textproc')

diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index 86715df3202..6ca219d8153 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/13 09:17:51 taca Exp $
 
 DISTNAME=	kakasi-2.3.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	japanese textproc
 MASTER_SITES=	ftp://kakasi.namazu.org/pub/kakasi/stable/
 
diff --git a/textproc/kakasi/buildlink3.mk b/textproc/kakasi/buildlink3.mk
index 5cef492f8b8..92820b5e111 100644
--- a/textproc/kakasi/buildlink3.mk
+++ b/textproc/kakasi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/03/13 09:17:51 taca Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KAKASI_BUILDLINK3_MK:=	${KAKASI_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	kakasi
 
 .if !empty(KAKASI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.kakasi+=	kakasi>=2.3.0
-BUILDLINK_RECOMMENDED.kakasi+=	kakasi>=2.3.4nb3
+BUILDLINK_RECOMMENDED.kakasi+=	kakasi>=2.3.4nb4
 BUILDLINK_PKGSRCDIR.kakasi?=	../../textproc/kakasi
 .endif	# KAKASI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/kakasi/distinfo b/textproc/kakasi/distinfo
index 00d038c28ee..e99d5090242 100644
--- a/textproc/kakasi/distinfo
+++ b/textproc/kakasi/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/03/13 09:17:51 taca Exp $
 
 SHA1 (kakasi-2.3.4.tar.gz) = ab95a226f301955d2e8ae0d347afbb567e25fbe7
 RMD160 (kakasi-2.3.4.tar.gz) = 8ed84c5aaa0713484ab070871f555b12ded31802
 Size (kakasi-2.3.4.tar.gz) = 1099258 bytes
 SHA1 (patch-ab) = 06ad60e10c996500242fe038213164ddf3147178
 SHA1 (patch-ac) = c2100302e98e597ba50ea57e294b1053137ba8b3
+SHA1 (patch-ad) = 7b339bd53d801f0bedf047f840ce164e03a653cf
diff --git a/textproc/kakasi/patches/patch-ad b/textproc/kakasi/patches/patch-ad
new file mode 100644
index 00000000000..f96b0f4b524
--- /dev/null
+++ b/textproc/kakasi/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2006/03/13 09:17:51 taca Exp $
+
+--- src/k2.c.orig	2001-01-16 16:51:47.000000000 +0900
++++ src/k2.c
+@@ -127,7 +127,7 @@ k2rom_h_table[] = { 
+     "^", "\"", "_", "(maru)", "", ""};
+ 
+ 
+-#define k2rom_buflen 10
++#define k2rom_buflen 11
+ 
+ static int
+ k2rom(c, n, type)
+@@ -154,7 +154,7 @@ k2rom(c, n, type)
+ 	index_made = 1;
+     }
+ 
+-    buffer[k2rom_buflen] = '\0'; clen = k2rom_buflen;
++    buffer[k2rom_buflen - 1] = '\0'; clen = k2rom_buflen - 1;
+     for (i = 0; i < k2rom_buflen; ++ i) {
+ 	c1 = c[i].c1;
+ 	if ((0 < c1) && (c1 < 0x20))
-- 
cgit v1.2.3