summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortsutsui <tsutsui>2015-10-30 15:53:00 +0000
committertsutsui <tsutsui>2015-10-30 15:53:00 +0000
commitde3fa821df3a78c1041eb442ea9e4f173ca13253 (patch)
tree65e744713d02b8dfb744f0beab8d88214fef17b3
parent83eb86579f2d4cc0c208df6dd3da8700da7e9981 (diff)
downloadpkgsrc-de3fa821df3a78c1041eb442ea9e4f173ca13253.tar.gz
Fix coredump on trying to print JIS X 0213:2004 kanji with 8x16 fontList.
Bump PKGREVISION.
-rw-r--r--x11/kterm/Makefile2
-rw-r--r--x11/kterm/distinfo3
-rw-r--r--x11/kterm/patches/patch-gset.c16
3 files changed, 19 insertions, 2 deletions
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 5ee7e7ca508..18ab7d65c8b 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2015/10/14 20:17:28 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2015/10/30 15:53:00 tsutsui Exp $
DISTNAME= kterm-6.2.0
PKGREVISION= 24
diff --git a/x11/kterm/distinfo b/x11/kterm/distinfo
index 3f62b3c18b2..8821bef083d 100644
--- a/x11/kterm/distinfo
+++ b/x11/kterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2013/03/02 17:54:52 joerg Exp $
+$NetBSD: distinfo,v 1.26 2015/10/30 15:53:00 tsutsui Exp $
SHA1 (kterm-6.2.0-scroll-wd0.2.patch) = 384d938d3cfea48ae31426c918be6b8df59eb1de
RMD160 (kterm-6.2.0-scroll-wd0.2.patch) = e2ea4285def5c4ec8b88d36a20a328cc1082a469
@@ -23,6 +23,7 @@ SHA1 (patch-ad) = 35e78a604a19d52e4367419acacab054c5653f42
SHA1 (patch-ae) = bfeceb762f7b0f57cc42a4166ffd86baa8e31229
SHA1 (patch-button.c) = 4d98e3a42979e49074417003f608c3216d43723b
SHA1 (patch-cursor.c) = 00af175233449e3eeeec294e03d6769223f93e12
+SHA1 (patch-gset.c) = b22f8a8f75effa0c0435016a2d7945c1f69fb8c3
SHA1 (patch-input.c) = eb7528cb9578ba1e46188ff7e347c30a29f182f2
SHA1 (patch-screen.c) = 48c0042ed2fd6162e20c523544c1c9aa6eb9ab2a
SHA1 (patch-scrollbar.c) = c2e9a2e20def7408423fa3bf7411e0c8ca2f2819
diff --git a/x11/kterm/patches/patch-gset.c b/x11/kterm/patches/patch-gset.c
new file mode 100644
index 00000000000..a735e4f8a05
--- /dev/null
+++ b/x11/kterm/patches/patch-gset.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-gset.c,v 1.1 2015/10/30 15:53:00 tsutsui Exp $
+
+Fix segmentation faults (out of bound access) on trying to print
+10 kanji characters added in JIS X 0213:2004 with fontList 8x16 settings.
+
+--- gset.c.orig 2015-10-28 17:00:59.000000000 +0000
++++ gset.c
+@@ -325,7 +325,7 @@ char **
+ csnames(fnum)
+ int fnum;
+ {
+- static char *csnameslist[FCNT][4] = {
++ static char *csnameslist[FCNT][5] = {
+ {"iso8859-1"}, /* F_ISO8859_1 */
+ {"iso8859-2"}, /* F_ISO8859_2 */
+ {"iso8859-3"}, /* F_ISO8859_3 */