From nobody Fri Dec 27 21:25:16 2024 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 4YKdnS5W1Xz5jMs5; Fri, 27 Dec 2024 21:25:16 +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 4YKdnS4KFNz4jGs; Fri, 27 Dec 2024 21:25:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735334716; 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=3D0vP8GRkWQdpzvEudY8x515k0H/Stk/w4xempGvYlY=; b=prFTk0W6ErCR3bWBM9hwP80xAPV3qJQUd7nIxKZ+5DlrFKBTT9xqWcGT2BSYDboCQ8iYnz 5c2lGbiUEAB0I5HHZEahhFyIGjICRi9knU8a45ov1Ghjhcu4XudrwtoiS1bu1Ln5DKhGIk r6ye7Q0dfwiX9AfdLSBKFtPkzpxt9AbCqmYt4PmDAxsNKGzKx55U1HrtW5QLZEAW6SMmKf o0Lz8MGgCM4xqiCxjwjS/53VBjb/nRc9lD4mJJGBvBVmfVJtO9TV7ffYKMCYOjE9b4Vubo giHXfx/FEqBmc+WqNebF64QeM/+aZxVLbCc/WZxC7xZIIV3rT7irBKhkE9yNSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735334716; 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=3D0vP8GRkWQdpzvEudY8x515k0H/Stk/w4xempGvYlY=; b=czOBKNjM1e1MzYFpzhoLWMFlzVAeDy7RSJqKjy/7LCc/usIoPsnxS7Rtrf/5WXZfTVHT2K I3pJNX52HBOvF/D9Bmo9YHm/qpFt86ogNOHVScWuiMMBN+SgiFdhbkkfp0OeO7PvP81e8r RqFRTT/FT3ybWKoXKiqHprHZLcRFgvOirH0R646zROpwv82CZL9CrwoZsyjLAuU0hCY6T6 KCnNwy5nzxwZtrCBe2Uoi0vYqPXK8i+DlKai4twNm8O7zIeeYlHitwhZbGJekCbZ2axGwr 671u6xGKqYu5k0M0fB1pxqU8sd8MpcJqcGmSK9LDS7ZFLTesCi5sGbsFsJ5pZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735334716; a=rsa-sha256; cv=none; b=o8s/IZrGyXyuzjB54uoUlh6q1NQ6HgvRJCrH4rAfG6Qde34XEjw7FzTh8zO9cRAAD4nkRA VlA7vvaro1D3QMHl8X39FZFlM152t4/nJE1EU+wf0dqG4b7dnXw6uW5S/RkSLQXqOti8Ne 5gH/QbtBf0ab2RKVaeDENyhmhjDGuz2oJSmw0eSsngV5b20iCHTVeXesUaMdUwkNBNCxW9 szikPZsgqCbm4fnc4W32UF4Ot9JewdHyw0NsgmrK5lYsyvphJ7wov1Dzh/viP/g7T7ZBV8 E64j1b4iJeuTlAqiqrs9fgJPU90GjxbQ19JUW6vGh9v0Zw7cq2mM57Du57CL0w== 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 4YKdnS3pVbzwSC; Fri, 27 Dec 2024 21:25:16 +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 4BRLPGB8025435; Fri, 27 Dec 2024 21:25:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRLPGIA025432; Fri, 27 Dec 2024 21:25:16 GMT (envelope-from git) Date: Fri, 27 Dec 2024 21:25:16 GMT Message-Id: <202412272125.4BRLPGIA025432@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: 89f872ec2ccf - main - archivers/pbzip2: fix stream decompression after libc++ 19 fix 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: 89f872ec2ccf488f24cd9daca2e0d1f80e7ee429 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=89f872ec2ccf488f24cd9daca2e0d1f80e7ee429 commit 89f872ec2ccf488f24cd9daca2e0d1f80e7ee429 Author: Dimitry Andric AuthorDate: 2024-12-27 21:15:48 +0000 Commit: Dimitry Andric CommitDate: 2024-12-27 21:24:55 +0000 archivers/pbzip2: fix stream decompression after libc++ 19 fix The patch in bug 283655 to fix the pbzip2 build against libc++ 19 (which finally removed std::char_traits) had a problem where it did not correctly check the bzip2 header. This only occurred when decompressing from standard input, in the 'BZ2StreamScanner' mode, and would then throw an unexpected "invalid file format" error. PR: 283655 Reported by: wosch MFH: 2024Q4 --- archivers/pbzip2/files/patch-BZ2StreamScanner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp b/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp index e6a3d82b789c..070f227c7ec1 100644 --- a/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp +++ b/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp @@ -1,4 +1,4 @@ ---- BZ2StreamScanner.cpp.orig 2024-11-03 23:01:39 UTC +--- BZ2StreamScanner.cpp.orig 2015-12-17 23:32:49 UTC +++ BZ2StreamScanner.cpp @@ -49,8 +49,8 @@ int BZ2StreamScanner::init( int hInFile, size_t inBuff @@ -36,7 +36,7 @@ - int cmpres = pHdr->compare( hsp, pHdr->size() - hsp, - getInBuffSearchPtr() + hsp, pHdr->size() - hsp ); + bool cmpres = equal( pHdr->begin() + hsp, pHdr->begin() + pHdr->size() - hsp, -+ getInBuffSearchPtr() ); ++ getInBuffSearchPtr() + hsp ); + #ifdef PBZIP_DEBUG