Received: by mail.netbsd.org (Postfix, from userid 605) id 7DAEB84E7B; Mon, 12 Dec 2022 17:51:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AE90B84E6E for ; Mon, 12 Dec 2022 17:51:23 +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 XFcEAs-1xTNm for ; Mon, 12 Dec 2022 17:51:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1FFAA84D84 for ; Mon, 12 Dec 2022 17:51:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 14204FA90; Mon, 12 Dec 2022 17:51:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1670867483203350" MIME-Version: 1.0 Date: Mon, 12 Dec 2022 17:51:23 +0000 From: "Izumi Tsutsui" Subject: CVS commit: pkgsrc/x11/mlterm To: pkgsrc-changes@NetBSD.org Reply-To: tsutsui@netbsd.org X-Mailer: log_accum Message-Id: <20221212175123.14204FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1670867483203350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tsutsui Date: Mon Dec 12 17:51:22 UTC 2022 Modified Files: pkgsrc/x11/mlterm: Makefile distinfo Added Files: pkgsrc/x11/mlterm/patches: patch-common_c__imagelib.c Log Message: mlterm: pull an upstream change that fixes possible segfaults. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.177 -r1.178 pkgsrc/x11/mlterm/Makefile cvs rdiff -u -r1.96 -r1.97 pkgsrc/x11/mlterm/distinfo cvs rdiff -u -r0 -r1.3 pkgsrc/x11/mlterm/patches/patch-common_c__imagelib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1670867483203350 Content-Disposition: inline Content-Length: 2365 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/mlterm/Makefile diff -u pkgsrc/x11/mlterm/Makefile:1.177 pkgsrc/x11/mlterm/Makefile:1.178 --- pkgsrc/x11/mlterm/Makefile:1.177 Wed Nov 23 16:21:26 2022 +++ pkgsrc/x11/mlterm/Makefile Mon Dec 12 17:51:22 2022 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.177 2022/11/23 16:21:26 adam Exp $ +# $NetBSD: Makefile,v 1.178 2022/12/12 17:51:22 tsutsui Exp $ DISTNAME= mlterm-3.9.2 DIST_SUBDIR= ${PKGNAME_NOREV} # for re-tagged 3.9.2 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=arakiken/} GITHUB_PROJECT= ${PKGBASE} Index: pkgsrc/x11/mlterm/distinfo diff -u pkgsrc/x11/mlterm/distinfo:1.96 pkgsrc/x11/mlterm/distinfo:1.97 --- pkgsrc/x11/mlterm/distinfo:1.96 Mon Dec 12 17:42:04 2022 +++ pkgsrc/x11/mlterm/distinfo Mon Dec 12 17:51:22 2022 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.96 2022/12/12 17:42:04 tsutsui Exp $ +$NetBSD: distinfo,v 1.97 2022/12/12 17:51:22 tsutsui Exp $ BLAKE2s (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 3bd490eb661bc802cb05ebbb17a73956f5a62ca3838dcf5cb7baad0c01c3ebdb SHA512 (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf Size (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 4259208 bytes +SHA1 (patch-common_c__imagelib.c) = 249d67057ea3d6f413de3c646d0e55e04547d4b9 SHA1 (patch-configure) = 266b3e8383c425c7ef8cd180f07e1199890521ba SHA1 (patch-etc_font-fb) = 52c18f512c67ff530c0c326394fdf43956d71cb0 SHA1 (patch-uitoolkit_fb_ui__display__wscons.c) = 5697668f9e294d313d2b9f9c670b047d3bcd8078 Added files: Index: pkgsrc/x11/mlterm/patches/patch-common_c__imagelib.c diff -u /dev/null pkgsrc/x11/mlterm/patches/patch-common_c__imagelib.c:1.3 --- /dev/null Mon Dec 12 17:51:23 2022 +++ pkgsrc/x11/mlterm/patches/patch-common_c__imagelib.c Mon Dec 12 17:51:22 2022 @@ -0,0 +1,17 @@ +$NetBSD: patch-common_c__imagelib.c,v 1.3 2022/12/12 17:51:22 tsutsui Exp $ + +- pull upstream fix: + https://github.com/arakiken/mlterm/commit/ddc9a846a198216cc065901d8a81d8d2801bd70e + > * c_imagelib.c: Fix buffer over-read. + +--- common/c_imagelib.c.orig 2022-01-16 15:20:31.000000000 +0000 ++++ common/c_imagelib.c +@@ -43,7 +43,7 @@ static char *is_otf_emoji(const char *pa + + return p + 5; + } +- path = p + 5; ++ path = p + 1; + } + + return NULL; --_----------=_1670867483203350--