Pull fix for crash caused by out of bounce access bug from upstream.

Also fix misc pkgsrc stuff:
- update DESCR (php version is no more)
- remove obsolete SUBST

Bump PKGREVISION.

4 files changed, 21 insertions, 10 deletions

diff --git a/net/sayaka/DESCR b/net/sayaka/DESCR
index c3cb1e18e2d..bd16c2b46da 100644
--- a/net/sayaka/DESCR
+++ b/net/sayaka/DESCR
@@ -1,4 +1,2 @@
 Sayaka is a light-weight terminal specific twitter client which
 supports userstream and sixel graphics etc.
-There are two variants (PHP based version and and Vala based version)
-in the sayaka distribution and this package uses the newer Vala based one.
diff --git a/net/sayaka/Makefile b/net/sayaka/Makefile
index b09d87362d9..03749b90aad 100644
--- a/net/sayaka/Makefile
+++ b/net/sayaka/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2016/11/26 10:02:27 tsutsui Exp $
+# $NetBSD: Makefile,v 1.8 2016/12/04 04:22:24 tsutsui Exp $
 
 DISTNAME=	sayaka-3.3.0
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=isaki68k/}
 GITHUB_PROJECT=	${DISTNAME:S/-${PKGVERSION_NOREV}//}
@@ -17,12 +18,6 @@ INSTALLATION_DIRS+=	bin share/sayaka
 
 .include "../../mk/bsd.prefs.mk"
 
-SUBST_CLASSES+=		prefix
-SUBST_MESSAGE.prefix=	Fixing ${PREFIX}
-SUBST_STAGE.prefix=	pre-configure
-SUBST_FILES.prefix=	vala/sayaka.vala
-SUBST_SED.prefix=	-e 's,@PREFIX@,${PREFIX},g'
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vala/sayaka ${DESTDIR}${PREFIX}/bin
 
diff --git a/net/sayaka/distinfo b/net/sayaka/distinfo
index c472ea468e6..0cd411436ee 100644
--- a/net/sayaka/distinfo
+++ b/net/sayaka/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2016/11/26 10:02:27 tsutsui Exp $
+$NetBSD: distinfo,v 1.4 2016/12/04 04:22:24 tsutsui Exp $
 
 SHA1 (sayaka-3.3.0.tar.gz) = 6bf7710bfb72f5295a5224096a2edf0f644b7932
 RMD160 (sayaka-3.3.0.tar.gz) = 28d72195af2208762f9d34d9d62e97b6348c481a
 SHA512 (sayaka-3.3.0.tar.gz) = 3653a47d4b3889c7958a421a902f47b2732a6864f5883a0d17ba15857813421deb8933d826d95c211fe6f2029eb80d2bc330ea9f56d25b74f70bbf6866603231
 Size (sayaka-3.3.0.tar.gz) = 1953671 bytes
+SHA1 (patch-vala_imagereductor.native.c) = ccc9fdc9dcac00e8a12e3f8c2ae528f69e1f21d6
diff --git a/net/sayaka/patches/patch-vala_imagereductor.native.c b/net/sayaka/patches/patch-vala_imagereductor.native.c
new file mode 100644
index 00000000000..b802b08f7d1
--- /dev/null
+++ b/net/sayaka/patches/patch-vala_imagereductor.native.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-vala_imagereductor.native.c,v 1.1 2016/12/04 04:22:24 tsutsui Exp $
+
+- pull upstream fix for crash caused by out of bounce access
+ https://github.com/isaki68k/sayaka/commit/80f7e7b2e766c142b75378c32d8a733780131c43
+
+--- vala/imagereductor.native.c.orig	2016-11-25 06:08:13.000000000 +0000
++++ vala/imagereductor.native.c
+@@ -881,7 +881,8 @@ ImageReductor_HighQuality(
+ 			errbuf[i] = errbuf[i + 1];
+ 		}
+ 		errbuf[errbuf_count - 1] = tmp;
+-		memset(errbuf[errbuf_count - 1], 0, errbuf_len);
++		// errbuf[y] には左マージンがあるのを考慮する
++		memset(errbuf[errbuf_count - 1] - errbuf_left, 0, errbuf_len);
+ 	}
+ 
+ 	free(errbuf_mem);