From nobody Tue Sep 03 11:39:22 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 4WykDV2ckLz5MrS1; Tue, 03 Sep 2024 11:39:22 +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 4WykDV23T7z4NpF; Tue, 3 Sep 2024 11:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725363562; 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=wZZ2sGBa/859OPnfc2zwEjbR5wpJ9ihi1eJ0/itXzUk=; b=Q3kiELmKyS48lE2xb8qIcCD/5nN5YVM71MwgRVSEIx/BLwWHpmRFXnKlehnLSCPqqeJLUA rMPKyxlH4FCjnH6Eq6Rm6MiuW/syn4YJdRjFdx2ukVpiyowmv32XcNrOgtYghN5C6MvVBy Jotu7/W3ENjimGvA2PVs5U1DMIbv6iausCJSDDomLQNkYXwyzMMyGlpglY6Xq0sw+MI2fr LxLpBmpWNf0u3jpfXUnwztDrU6YCVVIQ6FGCXOkUHfC4gDmhtYopSh3fx0O7ljKKID83r9 wdkK0dIevPoPWFjYz4jgZt7CGGu3TOwmdgn0s8o8BlR6667IyNXYePvCHarDZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725363562; a=rsa-sha256; cv=none; b=XuEs9JeWS76i/TraadWk+7dDIYcJI1lSAdgMSaZf4ddZ/AVVODiKxm5TjPnOhGIzMoMqVy 66FIO3o0eAx45d3r9BgD+qCO0t+Ur5/wO1DBG74BwoYUUpGaotCK90eXpxlaCZM7GKYovd YyHFL6VA1TLjat6dwAJbknOMxZ/Zz/+6Z+NEKljgc18eiz8mQ8ImUzRBNk+AdqO/L37bzg 1WWLifF2r59yQuC3A6gDUGjGY2H1kqk+O4oBmph6u7SPabnGaQNAeuMjGcoE5OGS67dj5u r3OiHesHsiDHUa7V4RTckwkSD0ZHeehIrz4eo8O8KHZlWUzD1+hj+Ivh7f0e0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725363562; 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=wZZ2sGBa/859OPnfc2zwEjbR5wpJ9ihi1eJ0/itXzUk=; b=lTU4MEWNnlzsfEISprt6Uu9qwwQMkS6FNzrNpqRG2T7z5GF4/3xCE0N9F5ZFHVpE0mwalV WJWrpKkf5Myv2Ugi+qAn5hR7c6O5SKDlTrfuD5GddLS/63LLRjN+3TYWwp3pH+R+ii5B+L zEm6M20ZVO1n5HDfXJKzOwmGCHnUnoKKuCo2fvFzWE/Z7y6M0y/oZ4F8ahEmS+AeAUW50y Fb0aoSdp23LG1JjId/em0TrqM4XY68AWjKGJKMVnUNbKA4NoJXF6kseo1LxdqRriTbGtz5 XtONBJrUnJciEt7VXuzrTP1saBz5cgyvAQLTITVmYt7uV5jZznRAIezpfthUWw== 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 4WykDV1THbzf6m; Tue, 3 Sep 2024 11:39:22 +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 483BdMan030296; Tue, 3 Sep 2024 11:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483BdMrZ030293; Tue, 3 Sep 2024 11:39:22 GMT (envelope-from git) Date: Tue, 3 Sep 2024 11:39:22 GMT Message-Id: <202409031139.483BdMrZ030293@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vasil Dimov Subject: git: 9275e41380dd - main - net-p2p/clboss: upgrade from 0.13.2 to 0.13.3 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: vd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9275e41380ddef36faec392905b4f7da3d21c153 Auto-Submitted: auto-generated The branch main has been updated by vd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9275e41380ddef36faec392905b4f7da3d21c153 commit 9275e41380ddef36faec392905b4f7da3d21c153 Author: Vasil Dimov AuthorDate: 2024-09-03 11:38:47 +0000 Commit: Vasil Dimov CommitDate: 2024-09-03 11:38:47 +0000 net-p2p/clboss: upgrade from 0.13.2 to 0.13.3 --- net-p2p/clboss/Makefile | 2 +- net-p2p/clboss/distinfo | 6 +-- net-p2p/clboss/files/patch-624fc32.diff | 67 --------------------------------- 3 files changed, 4 insertions(+), 71 deletions(-) diff --git a/net-p2p/clboss/Makefile b/net-p2p/clboss/Makefile index 2809c459554b..54902737255d 100644 --- a/net-p2p/clboss/Makefile +++ b/net-p2p/clboss/Makefile @@ -1,7 +1,7 @@ PORTNAME= clboss DISTVERSIONPREFIX= v # To build from an arbitrary git commit comment DISTVERSION -DISTVERSION= 0.13.2 +DISTVERSION= 0.13.3 # and uncomment the following two lines (use for example -gf8d8348c where f8d8348c is a commit hash) #DISTVERSION= 0 #DISTVERSIONSUFFIX= -g0673c50e7 diff --git a/net-p2p/clboss/distinfo b/net-p2p/clboss/distinfo index 6b151863ddd2..d0ea4ae8ed9c 100644 --- a/net-p2p/clboss/distinfo +++ b/net-p2p/clboss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1722513369 -SHA256 (ZmnSCPxj-clboss-v0.13.2_GH0.tar.gz) = 4ed5c894fa00668cc33f2b3cc8bb2a682560e35fd58b2fe5619e8306afb22dfa -SIZE (ZmnSCPxj-clboss-v0.13.2_GH0.tar.gz) = 2947409 +TIMESTAMP = 1725363351 +SHA256 (ZmnSCPxj-clboss-v0.13.3_GH0.tar.gz) = 9b19cc3d6f5b444605df0a904481e87b686b14f155ce947061f815d35f59294a +SIZE (ZmnSCPxj-clboss-v0.13.3_GH0.tar.gz) = 2948591 diff --git a/net-p2p/clboss/files/patch-624fc32.diff b/net-p2p/clboss/files/patch-624fc32.diff deleted file mode 100644 index 8996396698e6..000000000000 --- a/net-p2p/clboss/files/patch-624fc32.diff +++ /dev/null @@ -1,67 +0,0 @@ -commit 624fc32db7733b47c8f9fbf5cbab3a40155032b2 (origin/master, origin/HEAD) -Parent: 44476241d101337d89bd9b7c88ec1280039d5167 -Author: Vasil Dimov -AuthorDate: Wed Jun 26 09:46:55 2024 +0200 -Commit: Ken Sedgwick -CommitDate: Wed Jul 24 11:32:53 2024 -0700 - - Avoid vector out of bounds access in ParserExposedBuffer.cpp - - Accessing elements past the size of a `std::vector` is undefined - behavior [1] and is actually checked in recent versions of LLVM - libcxx, which is used in FreeBSD [2]. - - [1] https://en.cppreference.com/w/cpp/container/vector/operator_at: - > Accessing a nonexistent element through this operator is undefined - > behavior. - - [2] https://cgit.freebsd.org/src/tree/contrib/llvm-project/libcxx/include/vector?h=2472e352d80fcf6440fd42fbb16960cc49d05b03#n1393 - -diff --git a/Jsmn/ParserExposedBuffer.cpp b/Jsmn/ParserExposedBuffer.cpp -index 2e42fd6..e6099da 100644 ---- Jsmn/ParserExposedBuffer.cpp -+++ Jsmn/ParserExposedBuffer.cpp -@@ -102,21 +102,24 @@ private: - if (datum_ender.feed(buffer[end_idx++])) - break; - if (end_idx == load_idx) - return nullptr; - } - for (;;) { -+ if (start_idx == end_idx) { -+ return nullptr; -+ } - auto res = jsmn_parse( &base - , &buffer[start_idx], end_idx - start_idx - , &toks[0], toks.size() - ); - if (res > 0) { - assert(base.pos + start_idx <= end_idx); - auto pr = Detail::ParseResult(); -- auto text = std::string( &buffer[start_idx] -- , &buffer[start_idx + base.pos] -+ auto text = std::string( buffer.begin() + start_idx -+ , buffer.begin() + start_idx + base.pos - ); - pr.orig_string = std::move(text); - pr.tokens.resize(res); - for (auto i = 0; i < res; ++i) - pr.tokens[i] = token_convert(toks[i]); - -@@ -162,14 +165,14 @@ private: - * In that case, retain our start_idx instead of - * moving the data. - */ - void move_loaded() { - if ((load_idx - start_idx) > start_idx) - return; -- std::copy( &buffer[start_idx], &buffer[load_idx] -- , &buffer[0] -+ std::copy( buffer.begin() + start_idx, buffer.begin() + load_idx -+ , buffer.begin() - ); - load_idx -= start_idx; - end_idx -= start_idx; - start_idx = 0; - } - public: