Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 84FAD7A30F for ; Sun, 4 Dec 2016 04:22:26 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id F32AE855D3; Sun, 4 Dec 2016 04:22:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 83359855BC for ; Sun, 4 Dec 2016 04:22:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 1sSInIUZZ2nS for ; Sun, 4 Dec 2016 04:22:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 011D084CF5 for ; Sun, 4 Dec 2016 04:22:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EB502FBA6; Sun, 4 Dec 2016 04:22:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148082534417060" MIME-Version: 1.0 Date: Sun, 4 Dec 2016 04:22:24 +0000 From: "Izumi Tsutsui" Subject: CVS commit: pkgsrc/net/sayaka To: pkgsrc-changes@NetBSD.org Reply-To: tsutsui@netbsd.org X-Mailer: log_accum Message-Id: <20161204042224.EB502FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148082534417060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tsutsui Date: Sun Dec 4 04:22:24 UTC 2016 Modified Files: pkgsrc/net/sayaka: DESCR Makefile distinfo Added Files: pkgsrc/net/sayaka/patches: patch-vala_imagereductor.native.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/sayaka/DESCR cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/sayaka/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/sayaka/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/net/sayaka/patches/patch-vala_imagereductor.native.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148082534417060 Content-Disposition: inline Content-Length: 3158 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=utf-8 Modified files: Index: pkgsrc/net/sayaka/DESCR diff -u pkgsrc/net/sayaka/DESCR:1.1 pkgsrc/net/sayaka/DESCR:1.2 --- pkgsrc/net/sayaka/DESCR:1.1 Sat Feb 27 14:30:58 2016 +++ pkgsrc/net/sayaka/DESCR Sun Dec 4 04:22:24 2016 @@ -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. Index: pkgsrc/net/sayaka/Makefile diff -u pkgsrc/net/sayaka/Makefile:1.7 pkgsrc/net/sayaka/Makefile:1.8 --- pkgsrc/net/sayaka/Makefile:1.7 Sat Nov 26 10:02:27 2016 +++ pkgsrc/net/sayaka/Makefile Sun Dec 4 04:22:24 2016 @@ -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 Index: pkgsrc/net/sayaka/distinfo diff -u pkgsrc/net/sayaka/distinfo:1.3 pkgsrc/net/sayaka/distinfo:1.4 --- pkgsrc/net/sayaka/distinfo:1.3 Sat Nov 26 10:02:27 2016 +++ pkgsrc/net/sayaka/distinfo Sun Dec 4 04:22:24 2016 @@ -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 Added files: Index: pkgsrc/net/sayaka/patches/patch-vala_imagereductor.native.c diff -u /dev/null pkgsrc/net/sayaka/patches/patch-vala_imagereductor.native.c:1.1 --- /dev/null Sun Dec 4 04:22:24 2016 +++ pkgsrc/net/sayaka/patches/patch-vala_imagereductor.native.c Sun Dec 4 04:22:24 2016 @@ -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); --_----------=_148082534417060--