From nobody Sat Jan 18 20:28:20 2025 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 4Yb7Tc38dPz5kq6t; Sat, 18 Jan 2025 20:28:20 +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 4Yb7Tc2R6Hz3FdJ; Sat, 18 Jan 2025 20:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737232100; 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=wFHmFVUsAotf1y2BVJFn2nb0qXFyG3tQFPM909BC9NY=; b=pTV7NSmef6QHVR9apFxXi/3hrt2febsjyXdg5q47oB9oDQECwQUEZ66e63yE38IMOW7O25 C4dVUw1/CWQIIkVuWMMr9nYp/XFQuRPz9+7q72ek6YwYkuhMivjHegcP3wdPgRxBRAIjMN CF5pKQuTHKJOkGBEKaIrzyTVyQih0bATgF/6JdtF2z/E+r6zwI294fIZEKimAsexl0LCtj QN9iON3/xtZ7N+0k/0iFuvdiR+Je8k+lYMOcWkPAcUgqVQcZgFmP3ekCjp7a3cDJ7rzE7L q2OdrYf+5u9TLunK869VXgDThfPndlMltZvu1jW+bHse5D3552k9fEVeyE1Ezw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737232100; 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=wFHmFVUsAotf1y2BVJFn2nb0qXFyG3tQFPM909BC9NY=; b=wHZrDrlgZyM/rGbS1GLJ+yWoi/diLcLYW/9CdyN020zAqXKkxggJzVI2VtHKZOnUcMfTPW B8olkmiD+yHBICcqxZHIeJbKgRFnaOvRdGqkKYqRyKFlcNVPJyIFu8g6bLcloMsY2F0a3X X5yzQA1opsYXsiNWnJruHN2kr6ZhVFoAQmcFJXRjAPYJt4QGLwg8xtPRq9ymxFI7Kow3lf sPF1Obcu8Xndy1GQG/9mKdlOkkxXoFbQ4RGXlv5Xefuj0SIRR3AyLRzUBXCY6fpb1tyL/O ALd6Zs0bAEikVd9mFaYT7X5+3+H9lQ9wErOrmIQMvxDGu7cVM5Zhk+0ITUHYFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737232100; a=rsa-sha256; cv=none; b=MNMA3nouCcJ5P7TDFjuY9DNa+CtOgCLILDpnNCli/2BnlbnUawJ6rIVwhcQwlBbOi52F7m 08m2i8zwyaDIJV3JUjaCAYZj2hbjos2PKJF071SP3Gu3+X+ErhP0REjMkm0H2u0IjI8UQa c10TfBZC3ZOp0BSBdE/bhYe15Cs0TM+fH4K/BSTLdeB5YO/rEF7PFc+R5b8sjGdAZ2yqvC SQ7gQ1+qXLlJKEEXd6uoJK0hCPMxtKICRtz9LKvXxfTRY+5mDbiLY2TxvlwERmI/bHgh7Z ZgYJR8BZzGSOC49hH7ju/Yx7UtulU0/VmfIiaig2I14scLyr0F1KnF32iWSl8g== 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 4Yb7Tc20byz3wj; Sat, 18 Jan 2025 20:28:20 +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 50IKSK3S081952; Sat, 18 Jan 2025 20:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50IKSKHt081949; Sat, 18 Jan 2025 20:28:20 GMT (envelope-from git) Date: Sat, 18 Jan 2025 20:28:20 GMT Message-Id: <202501182028.50IKSKHt081949@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 974d3ff05496 - main - archivers/pbzip2: fix more issues after libc++ 19 patches 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 974d3ff054965d2bd2ab884a0579ed06c5a08b07 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=974d3ff054965d2bd2ab884a0579ed06c5a08b07 commit 974d3ff054965d2bd2ab884a0579ed06c5a08b07 Author: Dimitry Andric AuthorDate: 2025-01-18 20:26:02 +0000 Commit: Dimitry Andric CommitDate: 2025-01-18 20:28:01 +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 --- 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 ); +