From nobody Sun Oct 30 22:05:28 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N0r2112J4z4gkMT; Sun, 30 Oct 2022 22:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N0r210Sdjz435p; Sun, 30 Oct 2022 22:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667167529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2eUQGriE3slRiMt/LJIYgJ/mgSgNFVDAOh9dUcBKP3U=; b=pudVHdSGRk9wy3YxYN5tffQvO4i8SB6omIjhZtxrnqxNM8sHyfpVEwc9i+HZRXrCESp9QR MmjEiONazVwZt9wZLHTUMxZwTWIhaF2dphHBAltK6Y4iLm2B3420bQ/+O830dLrBrPREAJ Ff+tebbCPzCc/Yh0g48Sgk3O32UEmGYFDo/8inmucpxniRBoU6XOo1/xV1JyPygalhyuV7 PU85RfDHkTWGmVdCIXUKN6fmL9K5cOeAhE3h8OzigdN9fLsDaUFHl4vbrvlf49wp/zjt+q Uoe9f5sqFNWWZRx+HiyZRNjzjBbQwEtdpPW85o8yA1o/rxCHttwdDexuzRoVRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N0r206bjpz1CZS; Sun, 30 Oct 2022 22:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29UM5STc080738; Sun, 30 Oct 2022 22:05:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29UM5SAC080737; Sun, 30 Oct 2022 22:05:28 GMT (envelope-from git) Date: Sun, 30 Oct 2022 22:05:28 GMT Message-Id: <202210302205.29UM5SAC080737@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 4dbdc33a8d7e - main - x11/tilda: Fix OOB write in start_default_shell() List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4dbdc33a8d7e75b863ed5ccc34a072536b97ff2d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667167529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2eUQGriE3slRiMt/LJIYgJ/mgSgNFVDAOh9dUcBKP3U=; b=dS5hyMd1TbOQY/yt/PFxa5+w9Wc/EjAriGY2bt/0iFQbaYUd75L3PLE4d9SpIwCC3AUfNS PAwnhKU4fxVhRnPJX3UdpedR6HupeBBSwqAJriKrhDAS2IGdKLiuhktQtv4duK+uRIEi24 ZTJ9+xWm5018/v2o2f7+eG15hpqs7yROQLDCM7r8FQ2eVuPTlQMft7SvDit0CRImxnS0KX SprOh2aFuoFWu5aFPn6mc3OyG6oR1kYLsUjkG+w6FCCW0O36rfVSVg9stfnJAwnFF/Vyrz iZuual8M8lKbi0SjD1YPIxFNoWxzvVBTN9xZMochLAD4wJxwZdKZDCTKE4PRpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667167529; a=rsa-sha256; cv=none; b=tIa9bW7OIIP3f6oL39BzDzGCUIb831HaXF0jExLy0P9GyWA+fM2kHv4YLTfk1i0eC3kDRK DvzSCzic7rwxRunOEJh/+bbKASfjm+oTjDq7uY8pd7Q/HxvgnbWonA938S95ntdWNN3Ija skmN4B1KYQgJGS1arKq+GDnVmn/Y6cMP80u3IYNj1aaRSo/ugfiwVgjuli8qBRpZkg8dsS He2kNoXad9vkE/iMSzSEgYTrQFdJsxCZO/SNNnEWxkChB1Gwy+Px8s3+L569IfUKeBoYWJ m/X66gK9JWBXPVV3pIqhNzlHJbU/GYMLtkneOrL0rYGy10rYCelnfk2P1cN5sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4dbdc33a8d7e75b863ed5ccc34a072536b97ff2d commit 4dbdc33a8d7e75b863ed5ccc34a072536b97ff2d Author: Rodrigo Osorio AuthorDate: 2022-10-30 16:02:26 +0000 Commit: Rodrigo Osorio CommitDate: 2022-10-30 21:55:14 +0000 x11/tilda: Fix OOB write in start_default_shell() The fix was committed to upstream in May 9, but no release was made for it until now. https://github.com/lanoxx/tilda/commit/51a980a55ad6d750daa21d43a66d44577dad277b Update Makefile to make portlint happy PR: 264270 Reported by: Tested by: --- x11/tilda/Makefile | 15 +++++++++------ x11/tilda/files/patch-src_tilda_terminal.c | 11 +++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile index 5e112bfe1a6d..e5b52df0c12c 100644 --- a/x11/tilda/Makefile +++ b/x11/tilda/Makefile @@ -1,6 +1,7 @@ PORTNAME= tilda PORTVERSION= 1.5.0 DISTVERSIONPREFIX= ${PORTNAME}- +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= rodrigo@FreeBSD.org @@ -10,17 +11,19 @@ WWW= https://github.com/lanoxx/tilda LICENSE= GPLv2 BUILD_DEPENDS= vte3>=0:x11-toolkits/vte3 -RUN_DEPENDS= vte3>=0:x11-toolkits/vte3 LIB_DEPENDS= libconfuse.so:devel/libconfuse +RUN_DEPENDS= vte3>=0:x11-toolkits/vte3 -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-rpath USES= gmake gettext gnome pkgconfig autoreconf pathfix libtool xorg -USE_XORG+= x11 -USE_GNOME+= glib20 gtk30 gdkpixbuf2 pango -INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= lanoxx +USE_GNOME+= glib20 gtk30 gdkpixbuf2 pango +USE_XORG+= x11 + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-rpath + +INSTALL_TARGET= install-strip DOCS= AUTHORS ChangeLog HACKING.md README.md TODO.md diff --git a/x11/tilda/files/patch-src_tilda_terminal.c b/x11/tilda/files/patch-src_tilda_terminal.c new file mode 100644 index 000000000000..d0df3b7b7af7 --- /dev/null +++ b/x11/tilda/files/patch-src_tilda_terminal.c @@ -0,0 +1,11 @@ +--- src/tilda_terminal.c.orig 2022-10-30 15:03:03 UTC ++++ src/tilda_terminal.c +@@ -530,7 +530,7 @@ + */ + flags |= G_SPAWN_FILE_AND_ARGV_ZERO; + } else { +- argv = malloc(1 * sizeof(void *)); ++ argv = malloc(2 * sizeof(void *)); + argv[0] = default_command; + argv[1] = NULL; + }