From nobody Fri Dec 27 21:25:42 2024 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 4YKdny5NjYz5jMQ3; Fri, 27 Dec 2024 21:25:42 +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 4YKdny4s4Dz4j5t; Fri, 27 Dec 2024 21:25:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735334742; 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=X+Qqzjc+4pbIY5fKouXfGUQLTjcoaaQBFhcHw35iE2U=; b=Or2bSzkKBkP+RtOFriz/zk7OecleyKiZhAx4nMydTdc6cQHKiiAoxGkjea/EA17lPO1wsL 5e9OH8Z2donMTtyus0Vfi9DOS1bWgzlXZeTVLFCwyQ8FZybpJJIEn25BTlUyGi6FJDNcTW RGjLTh5WbfKEGhERutNEqWP87PBAC11kDH3DcMBACsYtzvsm0uVWe9DSnKIFSWZodSTHWN unv0yICeVMeOoazsaV/c/tFlNPuE74QL/6P5amaVt2gPCoVJaBtsDuKTW79MOb3w26GAnu o25gOfOHWeCVdXUB9eJHNa8BopuCdZTh7vGQd+34zF2RieVR0tEOjL2YLEak0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735334742; 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=X+Qqzjc+4pbIY5fKouXfGUQLTjcoaaQBFhcHw35iE2U=; b=bfqPEkx6vvZYuYfIyOLM4nFDpuJxCCo/Wjpmusbfmw92zt0M5h9L1L5dA1i00EX4hdXEld WdlaspkNI0UMvX+tLRqcIuBhsNj0mS8QDqId2OhOBxXMA530bYrNOe8/b/dh5GYrudgf6j 9E0stEfwYhO1tHQHkt3qPYTjvAUwats6gh4UgYv58VhKDrxkOkbfZjFgGBTWaINmyiY+x7 zP0KoxQb0LlHyJJ5trjpqmnmGcyUtSt4BBy/Nrtiru3pL+2ZTOgfWLWI9DLqPlLOvuGtXx tTvPpWmDykT4NaAyjNldJ15l2FzQew0ffPUKJOcDyyPMLF3ps6Pd5FnVdiBW6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735334742; a=rsa-sha256; cv=none; b=vERoeBtBSKiytldIJAaDgF8P+RU+nIhnYU/1l/hNFDbv09zd0VW7H8LUmfrS//c3GuCml2 P9OUf3QHclVFebO6HlctKWifqydqD1XW1Gv9Cli7P2NSCFrAUmle+dPAW9SUeKp//ldVvq naOdVi2Q0HX9uDsQGgpOIM9AmAA3sinus2D7cwPhmaVWa9BVvkRFtdlSiSA4adR7AR9CwF tuF7jAF2Bxh96bqn+viGLz207orWoViOTToRA6G1cKhuYW4vC0UDbGcsqTfjebqWCGgh3o VLZBR67YwYobgc7dD+WtoWWm8oQyk5UcI/fD7fCGw1PjQPQzCttU+03pHc6w4g== 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 4YKdny4SXMzwDY; Fri, 27 Dec 2024 21:25:42 +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 4BRLPga9025676; Fri, 27 Dec 2024 21:25:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRLPgMv025673; Fri, 27 Dec 2024 21:25:42 GMT (envelope-from git) Date: Fri, 27 Dec 2024 21:25:42 GMT Message-Id: <202412272125.4BRLPgMv025673@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: 92112892d832 - 2024Q4 - archivers/pbzip2: fix stream decompression after libc++ 19 fix 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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 92112892d8323a5261869ff5726adc2e5d44a389 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=92112892d8323a5261869ff5726adc2e5d44a389 commit 92112892d8323a5261869ff5726adc2e5d44a389 Author: Dimitry Andric AuthorDate: 2024-12-27 21:15:48 +0000 Commit: Dimitry Andric CommitDate: 2024-12-27 21:25:30 +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 (cherry picked from commit 89f872ec2ccf488f24cd9daca2e0d1f80e7ee429) --- 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