From nobody Fri Oct 29 16:44:28 2021 X-Original-To: dev-commits-ports-all@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 1DD88181C209; Fri, 29 Oct 2021 16:44: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 4HgpDX6SjFz4RSV; Fri, 29 Oct 2021 16:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A1D361A7CC; Fri, 29 Oct 2021 16:44: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 19TGiSSO028629; Fri, 29 Oct 2021 16:44:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19TGiSum028628; Fri, 29 Oct 2021 16:44:28 GMT (envelope-from git) Date: Fri, 29 Oct 2021 16:44:28 GMT Message-Id: <202110291644.19TGiSum028628@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: fb07233b044e - main - sysutils/lnav: Update to 0.10.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb07233b044ee9b65d5a0b227da4d2fc0ca30697 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb07233b044ee9b65d5a0b227da4d2fc0ca30697 commit fb07233b044ee9b65d5a0b227da4d2fc0ca30697 Author: Thomas Hurst AuthorDate: 2021-10-29 16:40:05 +0000 Commit: Neel Chauhan CommitDate: 2021-10-29 16:44:07 +0000 sysutils/lnav: Update to 0.10.1 PR: 258847 --- sysutils/lnav/Makefile | 2 +- sysutils/lnav/distinfo | 6 +++--- sysutils/lnav/files/patch-src_logfile.cc | 37 -------------------------------- 3 files changed, 4 insertions(+), 41 deletions(-) diff --git a/sysutils/lnav/Makefile b/sysutils/lnav/Makefile index e06fb260aa31..261dcb49d4f4 100644 --- a/sysutils/lnav/Makefile +++ b/sysutils/lnav/Makefile @@ -1,7 +1,7 @@ # Created by: Thomas Hurst PORTNAME= lnav -PORTVERSION= 0.9.0 +PORTVERSION= 0.10.1 CATEGORIES= sysutils MASTER_SITES= https://github.com/tstack/${PORTNAME}/releases/download/v${PORTVERSION}/ diff --git a/sysutils/lnav/distinfo b/sysutils/lnav/distinfo index ea3eae7852ad..e412e2345480 100644 --- a/sysutils/lnav/distinfo +++ b/sysutils/lnav/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601099244 -SHA256 (lnav-0.9.0.tar.bz2) = 9ba2c9c745d1479ec0eed0201cba7fdb223fc0489c50b20a54af3d2a1b2ae550 -SIZE (lnav-0.9.0.tar.bz2) = 877288 +TIMESTAMP = 1633398666 +SHA256 (lnav-0.10.1.tar.bz2) = 3bb0fb4f36efc1b83f082b0a232fd4495fc78dcf552424afcb0297d21613b3a7 +SIZE (lnav-0.10.1.tar.bz2) = 1400364 diff --git a/sysutils/lnav/files/patch-src_logfile.cc b/sysutils/lnav/files/patch-src_logfile.cc deleted file mode 100644 index fbad7c3c686e..000000000000 --- a/sysutils/lnav/files/patch-src_logfile.cc +++ /dev/null @@ -1,37 +0,0 @@ ---- src/logfile.cc.orig 2020-09-09 16:17:12 UTC -+++ src/logfile.cc -@@ -323,10 +323,13 @@ logfile::rebuild_result_t logfile::rebuild_index() - - this->lf_line_buffer.clear(); - if (!this->lf_index.empty()) { -- off_t check_line_off = this->lf_index.back().get_offset(); -+ auto last_line = this->lf_index.end(); -+ --last_line; -+ off_t check_line_off = last_line->get_offset(); -+ auto last_length = ssize_t(this->line_length(last_line, false)); - - auto read_result = this->lf_line_buffer.read_range({ -- check_line_off, this->lf_index_size - check_line_off -+ check_line_off, last_length - }); - - if (read_result.isErr()) { -@@ -553,7 +556,7 @@ filesystem::path logfile::get_path() const - - size_t logfile::line_length(logfile::iterator ll, bool include_continues) - { -- iterator next_line = ll; -+ auto next_line = ll; - size_t retval; - - if (!include_continues && this->lf_next_line_cache) { -@@ -570,6 +573,9 @@ size_t logfile::line_length(logfile::iterator ll, bool - - if (next_line == this->end()) { - retval = this->lf_index_size - ll->get_offset(); -+ if (retval > line_buffer::MAX_LINE_BUFFER_SIZE) { -+ retval = line_buffer::MAX_LINE_BUFFER_SIZE; -+ } - if (retval > 0 && !this->lf_partial_line) { - retval -= 1; - }