From nobody Sat Jan 18 20:38:34 2025 X-Original-To: dev-commits-ports-branches@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 4Yb7jQ2lBrz5kr2N; Sat, 18 Jan 2025 20:38:34 +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 4Yb7jQ1ymKz3Gql; Sat, 18 Jan 2025 20:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737232714; 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=k9YnO6DoIsNVkDhHvw0NMRZGVgfb2VrM1FI0czyo5Cg=; b=U5C6ibRp83c+LrHfP2PRtEg9Tbpd1lzlQlFrHl/3dURyKps4XDaGKEmqLzk1Rpghb1Xpyr y5to0qjd7p1EyYohT9dgrf49CdeAl9FtncPLXJZ++RZL0NZJkpkd/tjoIcXYw+GpgKXU8K /nmzw16LXRo1C8UKbtf8AZQKxfb34PBglXTj+8KQeBIZllQPv1b8FcuzfOSgDXbtQXywKn g2N5S4w8/dELEgZ6LC3HyZuxDxz4d9rBWVSqhwQ3pgZlf9nMH5416xgMWPnQMRPVs1/iy9 KP4dpblDt6O5WdV3vs5shSnI0e0kvoGyMUR0rhULqXvLfvo6/EYQvjRWXyCQGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737232714; 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=k9YnO6DoIsNVkDhHvw0NMRZGVgfb2VrM1FI0czyo5Cg=; b=yaYc7wqEZ3ARwxfSQM+lzBOhqDgA5KqXzQQA5zoxJpR9WkPfVgAZ4Xff9KMBi4yXQ+MJ6F Gy8cNUJk7z6F9cj/N3ZO/Az30VWjGSymJNnZTdzs7gEXiMZLybMDz1b12mI20/eO2tuimO tCLxvC2DvX21P+VTLh6nHP4hOYj7I/Fd1HLObiUcfxUWBFvLwXmnAZaitaZPvvNMR8BXPN kSqzSbuqgO2DIhCuXiGYhymBl7VvhK31ErTVwBPgWxO0C1PbSP/31DRZNwPMDqUbK7mKRx BCxfK1JsZ17tP9ZDGBgqV0mnXXjmWmxElswoIZJq91zqsGegH64UeBsrShcXpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737232714; a=rsa-sha256; cv=none; b=K5ii4lU4OvI/wyPr9yy1VdkggxCe2+at3bZ503yoT3HUnpCGziU26O3/GWeyodMlmHHaNO jlHkeEbrfP9aBlusfgk8BVcYOHvOUceoIlQFG/4SfiG7UCH+0hheO7yxg4/5oxdSvRP4vl SrFRtMKocrmQzIgC4soAx7pP5ic5VAXZ4rBHKDvHtGgRo4RCuIv8He/mh5kLyKRTs7so55 HyGEX1ae5osk7IeJ31ycoBexdrgr7rR96YmhoXG3I+dRdxSdr+8+76Q8St0Nmd+8bUcs5q AudxG5gRFcim59kyF+zSIHycGrhKSr6uiDFqVh1eTdVKaqTPAbl4YhSGxcMudA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yb7jQ18Hhz4N3; Sat, 18 Jan 2025 20:38:34 +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 50IKcYEP000095; Sat, 18 Jan 2025 20:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50IKcYdN000092; Sat, 18 Jan 2025 20:38:34 GMT (envelope-from git) Date: Sat, 18 Jan 2025 20:38:34 GMT Message-Id: <202501182038.50IKcYdN000092@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 71fc928d82c4 - 2025Q1 - archivers/pbzip2: fix more issues after libc++ 19 patches List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: 71fc928d82c4b8378229e096bb5b327d2106acb6 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=71fc928d82c4b8378229e096bb5b327d2106acb6 commit 71fc928d82c4b8378229e096bb5b327d2106acb6 Author: Dimitry Andric AuthorDate: 2025-01-18 20:26:02 +0000 Commit: Dimitry Andric CommitDate: 2025-01-18 20:38:17 +0000 archivers/pbzip2: fix more issues after libc++ 19 patches * Ensure the _bz2Header and _bz2HeaderZero members of BZ2StreamScanner do not contain an additional NUL byte. * When comparing the magic header, compare from pHdr->begin() + hsp to pHdr->end(), making the code equivalent to what it was doing using std::basic_string::compare(). Submitted by: paparodeo@proton.me PR: 283655 MFH: 2025Q1 (cherry picked from commit 974d3ff054965d2bd2ab884a0579ed06c5a08b07) --- archivers/pbzip2/files/patch-BZ2StreamScanner.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp b/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp index 070f227c7ec1..19678e0d7d24 100644 --- a/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp +++ b/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp @@ -1,6 +1,16 @@ --- BZ2StreamScanner.cpp.orig 2015-12-17 23:32:49 UTC +++ BZ2StreamScanner.cpp -@@ -49,8 +49,8 @@ int BZ2StreamScanner::init( int hInFile, size_t inBuff +@@ -42,15 +42,15 @@ int BZ2StreamScanner::init( int hInFile, size_t inBuff + { + dispose(); + +- CharType bz2header[] = "BZh91AY&SY"; +- // zero-terminated string ++ CharType bz2header[] = ++ { 'B', 'Z', 'h', '9', '1', 'A', 'Y', '&', 'S', 'Y' }; + CharType bz2ZeroHeader[] = +- { 'B', 'Z', 'h', '9', 0x17, 0x72, 0x45, 0x38, 0x50, 0x90, 0 }; ++ { 'B', 'Z', 'h', '9', 0x17, 0x72, 0x45, 0x38, 0x50, 0x90 }; _hInFile = hInFile; _eof = false; @@ -35,7 +45,7 @@ // compare the remaining part of magic header - int cmpres = pHdr->compare( hsp, pHdr->size() - hsp, - getInBuffSearchPtr() + hsp, pHdr->size() - hsp ); -+ bool cmpres = equal( pHdr->begin() + hsp, pHdr->begin() + pHdr->size() - hsp, ++ bool cmpres = equal( pHdr->begin() + hsp, pHdr->end(), + getInBuffSearchPtr() + hsp ); +