From nobody Tue Apr 05 22:09:35 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 699BA1A87A42; Tue, 5 Apr 2022 22:09:38 +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 4KY1ym5TjPz4tSC; Tue, 5 Apr 2022 22:09:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649196576; 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=sF7Qvw1vuO+QCzDJ+ecRDdvmpqPTelkNhptZxrtCtTU=; b=NjHw4jRrk8/tRbly41+HIOQROGKl4vHMsRIPZfKDBo2Hed7R2h7iBIPYbXpKYHrpBux7YH 0ADujTd6OCrgNvLwZ0w8xcmUyOqsDFfoRVQFi8GmM6wrB3mcwitaonvEiIufXcSrM31Qf/ USp68aVdEVDF7aEgTuoH1r/8SbZ4Nv/g57WsdW6IM/UYrEVhHTKAyh0nrzBr/tYgCDD7ah jQ5UMzIc+E0a2uWJJyUITStb2PahF9fagavnFM5J2XhSc55jb//7BtL3UTPKsU8Jb+6ShM 4Gcn9fpn90iY3KRGe/4zwlRSlCEgjegp7wchcq9rCvRBbzKc1a5wkWvazywwhQ== 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 CE52E6C4F; Tue, 5 Apr 2022 22:09:35 +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 235M9ZWm028983; Tue, 5 Apr 2022 22:09:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235M9ZRo028982; Tue, 5 Apr 2022 22:09:35 GMT (envelope-from git) Date: Tue, 5 Apr 2022 22:09:35 GMT Message-Id: <202204052209.235M9ZRo028982@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lewis Cook Subject: git: f204688efbf2 - main - www/amfora: Resolve crash on startup if TERM not recognized 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: lcook X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f204688efbf27343f71126c021b3a7bd5c370959 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649196576; 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=sF7Qvw1vuO+QCzDJ+ecRDdvmpqPTelkNhptZxrtCtTU=; b=P9VpoKV+SpHzn4KABu5lcRwj3MkTjbKgnEeWnU4AIxpYbGwtcJJwINi4357zg8DwOm/qIv qwjFT678KO/xL67/Ok3MxLy4sGHf3VEou5hIqdc/7oBXR1UAbqThvoKprrsjZhiQ9JzsGH JAiOuLDrW5TWWDAHYnWyIBw8NZGYmZr7bXo7LBAhrGlAKTuIStzJ0CuPpbRMIDtVk7PkqN t/9cE6ZyQj6K9UzpdsUPVkic6q9WJO6JElzx6S+pC3Txz0urMwztP5+ugX9u8waCYZOySf etPyGLVNwR0FfggcMkW0xoKusxA1NRqg018czuFZPUKnXG6r1V27HohzYiVa+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649196576; a=rsa-sha256; cv=none; b=G3MjfXjhpGErnGEGH7ZENwWR/gndvIZ0SuK9xcWeLB5mbZiq4TiMKYSwq/fiYHh+XQZZY7 UMIGdjbwDaYn8mzEZyA+Pm79jHBEzduF9SmKGWMO1QxziKF2t/KYY9jNFBUIb1B4+AFXd0 vMT53BRp6x1lOwIyABanGqwZU9WvigTEN2Xlsw8AkBHNn9CVkkLEqfelKtRbrh+JOolryR TwuduO/sRySHWJdmo1V3HXem1kqTX4yyC8ptiWinw3XAW9uhBgrRjIVLbQ8OFGETIK78P9 /ZHQX2zy2/zACuQMv5qha5bgTigMTJojQXGaS5x0fqh4mzu12KIqAt6vGLgAqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=f204688efbf27343f71126c021b3a7bd5c370959 commit f204688efbf27343f71126c021b3a7bd5c370959 Author: Lewis Cook AuthorDate: 2022-04-05 20:59:45 +0000 Commit: Lewis Cook CommitDate: 2022-04-05 21:08:17 +0000 www/amfora: Resolve crash on startup if TERM not recognized PR: 262863 Reported by: Alex Savage MFH: 2022Q2 --- www/amfora/Makefile | 2 +- ...ub.com_gdamore_tcell_v2_terminfo_t_tmux_term.go | 68 ++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/www/amfora/Makefile b/www/amfora/Makefile index 945bb3bac580..e2ec129831fd 100644 --- a/www/amfora/Makefile +++ b/www/amfora/Makefile @@ -1,7 +1,7 @@ PORTNAME= amfora DISTVERSIONPREFIX= v DISTVERSION= 1.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= lcook@FreeBSD.org diff --git a/www/amfora/files/patch-vendor_github.com_gdamore_tcell_v2_terminfo_t_tmux_term.go b/www/amfora/files/patch-vendor_github.com_gdamore_tcell_v2_terminfo_t_tmux_term.go new file mode 100644 index 000000000000..713cef8209d4 --- /dev/null +++ b/www/amfora/files/patch-vendor_github.com_gdamore_tcell_v2_terminfo_t_tmux_term.go @@ -0,0 +1,68 @@ +--- vendor/github.com/gdamore/tcell/v2/terminfo/t/tmux/term.go.orig 2022-04-05 20:54:39 UTC ++++ vendor/github.com/gdamore/tcell/v2/terminfo/t/tmux/term.go +@@ -68,4 +68,65 @@ func init() { + Modifiers: 1, + AutoMargin: true, + }) ++ terminfo.AddTerminfo(&terminfo.Terminfo{ ++ Name: "tmux-256color", ++ Columns: 80, ++ Lines: 24, ++ Colors: 256, ++ Bell: "\a", ++ Clear: "\x1b[H\x1b[J", ++ EnterCA: "\x1b[?1049h", ++ ExitCA: "\x1b[?1049l", ++ ShowCursor: "\x1b[34h\x1b[?25h", ++ HideCursor: "\x1b[?25l", ++ AttrOff: "\x1b[m\x0f", ++ Underline: "\x1b[4m", ++ Bold: "\x1b[1m", ++ Dim: "\x1b[2m", ++ Italic: "\x1b[3m", ++ Blink: "\x1b[5m", ++ Reverse: "\x1b[7m", ++ EnterKeypad: "\x1b[?1h\x1b=", ++ ExitKeypad: "\x1b[?1l\x1b>", ++ SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", ++ SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", ++ SetFgBg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m", ++ ResetFgBg: "\x1b[39;49m", ++ PadChar: "\x00", ++ AltChars: "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", ++ EnterAcs: "\x0e", ++ ExitAcs: "\x0f", ++ EnableAcs: "\x1b(B\x1b)0", ++ StrikeThrough: "\x1b[9m", ++ Mouse: "\x1b[M", ++ SetCursor: "\x1b[%i%p1%d;%p2%dH", ++ CursorBack1: "\b", ++ CursorUp1: "\x1bM", ++ KeyUp: "\x1bOA", ++ KeyDown: "\x1bOB", ++ KeyRight: "\x1bOC", ++ KeyLeft: "\x1bOD", ++ KeyInsert: "\x1b[2~", ++ KeyDelete: "\x1b[3~", ++ KeyBackspace: "\u007f", ++ KeyHome: "\x1b[1~", ++ KeyEnd: "\x1b[4~", ++ KeyPgUp: "\x1b[5~", ++ KeyPgDn: "\x1b[6~", ++ KeyF1: "\x1bOP", ++ KeyF2: "\x1bOQ", ++ KeyF3: "\x1bOR", ++ KeyF4: "\x1bOS", ++ KeyF5: "\x1b[15~", ++ KeyF6: "\x1b[17~", ++ KeyF7: "\x1b[18~", ++ KeyF8: "\x1b[19~", ++ KeyF9: "\x1b[20~", ++ KeyF10: "\x1b[21~", ++ KeyF11: "\x1b[23~", ++ KeyF12: "\x1b[24~", ++ KeyBacktab: "\x1b[Z", ++ Modifiers: 1, ++ AutoMargin: true, ++ }) + }