From nobody Tue Dec 24 17:45:48 2024 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 4YHj3c6n95z5hZ83; Tue, 24 Dec 2024 17:45:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHj3c627Jz4tvc; Tue, 24 Dec 2024 17:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735062348; 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=o+wPP6vBvs5XWwoE44Xd44D4wfLhQeZelPU6eGFQsC8=; b=yid1YeHCCQ0g4VKalTxkwDcabupErSavOhQ+rot/dXp1Ct9AIf+VaP7qyx5Rj9LbVUd9am BNUDK5p6lTXrA/kRlGKkl7K2WkRmVCirg3wKgekzX1r8jGfyHVBVR7+i55ACbXiQRXVQgi KKf0Sj0jufbmbbiDYLFE77QFKGhUO0+Y2skHQIL+bNL7TCATG5fykJt/DvKn3/xkPTsINe 0j16+98pg2BnR2/feCDorsO9ROAVM40rSANdabp9xCowkklI5icqx+vNTvRMqclafLH9f7 pwWwLdKXNvPJyxlAkLzL/BUgaALdOAnpxh1uZkebfIep78YuG7LNl1VTvEde3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735062348; 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=o+wPP6vBvs5XWwoE44Xd44D4wfLhQeZelPU6eGFQsC8=; b=NdnTz6Ozu9MTX9NObn2HMWLnGBi4/TwCQ+FtnAl6orb8A2otEZyztkEhU4SiDshAx5Amnl NjQxN/hlwnaQY/yKqChG2ZRDT4Q/Ac7akCY9M+NiPC52ECUlwnQ2ZkqG9ZbEK6oHd2GuB9 XRejiSfH0YHt4AeZQs9UjTo0072lVZ2xpEOQhfk2WM9zTg2+brspUb0J0YDnJR0BM3f6Cr FDHKK/jPgsYJ72JjUWosScX9u/xuIWSU4UZCBiRQYVK8XnMbsy4o+M6i3P4sdB5zLlZeIC PqWAOG3NWj1i+SsSYlfX7VdjKuxX2DluSKUabnKgA2M93lkogX88f38iZiwY7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735062348; a=rsa-sha256; cv=none; b=O6Aq0MJZrmc2WthiebwIgfphg4deqoKJhjkcF6pXDF66UldKtgPEEOKrWsOvKXG+6bEryS Fk2LUFipzZ0Egr/Pq7umAqiHTXptTvT+Cl5WxpLx0ypqqXwRUCde6BY0wN7pZMmAtkssDU neUt8pGr3QR6G0zeOnLLs4jW746QUCachNIrCAtjDCrIIm+aJKfjeIecGkW62Y1iNS/SUl KIrPM9iu569Gqk/xVVPU9gOvjq+UxN+LGDpobO1NQHkDbHsvtOo1MArYYgsFStBbEs2Xsk 7XHBTuK2JoCJWst3GNeS1PZFsrfsvrnZf0wfJ5wRy88D3cLP2eQw8HEE+L1YxA== 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 4YHj3c5dCXzpWp; Tue, 24 Dec 2024 17:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BOHjmVl026748; Tue, 24 Dec 2024 17:45:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BOHjmlC026745; Tue, 24 Dec 2024 17:45:48 GMT (envelope-from git) Date: Tue, 24 Dec 2024 17:45:48 GMT Message-Id: <202412241745.4BOHjmlC026745@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 80fd76960a1b - main - textproc/ugrep: Fix build with archivers/bzip3 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80fd76960a1b0d01a9056405b89cfcfde5a8e413 Auto-Submitted: auto-generated The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=80fd76960a1b0d01a9056405b89cfcfde5a8e413 commit 80fd76960a1b0d01a9056405b89cfcfde5a8e413 Author: Eric Camachat AuthorDate: 2024-12-24 17:37:23 +0000 Commit: Ashish SHUKLA CommitDate: 2024-12-24 17:44:04 +0000 textproc/ugrep: Fix build with archivers/bzip3 PR: 283449 Reviewed by: ehaupt (maintainer of archivers/bzip3) --- textproc/ugrep/files/patch-src_zstream.hpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/textproc/ugrep/files/patch-src_zstream.hpp b/textproc/ugrep/files/patch-src_zstream.hpp new file mode 100644 index 000000000000..715484065756 --- /dev/null +++ b/textproc/ugrep/files/patch-src_zstream.hpp @@ -0,0 +1,11 @@ +--- src/zstream.hpp.orig 2024-11-29 20:51:51 UTC ++++ src/zstream.hpp +@@ -2626,7 +2626,7 @@ class zstreambuf : public std::streambuf { + if (block_size > bz3file_->max || + bz3file_->len > bz3file_->max || + fread(bz3file_->buf, 1, block_size, file_) < block_size || +- bz3_decode_block(bz3file_->strm, bz3file_->buf, block_size, bz3file_->len) < 0) ++ bz3_decode_block(bz3file_->strm, bz3file_->buf, bz3file_->max, block_size, bz3file_->len) < 0) + { + if (ferror(file_)) + warning("cannot read", pathname_);