From nobody Fri Aug 02 07:12:08 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 4WZxpw6LN2z5R8h9; Fri, 02 Aug 2024 07:12:08 +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 4WZxpw5qPSz4X5D; Fri, 2 Aug 2024 07:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722582728; 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=zD8CwIGWdNlLw8F3YNEoIG3fybmxJPGHPViicKOLL54=; b=QsG06ohn+g8EurUNJPn97hKNfEey6WeITMgdr+gIHD9qP+AJrJswkim2VKhPcZHWB9nT2d NGtekY4HdGXFYSSV9gozgGTuxfv0nuV9Er8xnBxC1N9nap5/cR3tWai9YUBSaITXgQqiMq i4uUmXJhZ/iZ4hcsW4DB5D/EIZIgR86werXC5r3knp5ZnFR8wZWWWl0/IVZX2aCJvn0dBm NFtctUTXtGPZCIAdpYMuD9U++BHw6wx20Y6F+JikEXmxBc0fHm+7LF5hkZVvyHWAT0qYVH wQhu7G2cumN6ROYkZPHK6ZYik+RfDWj3Y5VQeCisarc1R8qAvvjuRPOCs9qTHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722582728; a=rsa-sha256; cv=none; b=F8hlA04dbN5jLXM/r9itoyCDXRb33dAQ/cW58dQqDec/c9gEk9/DtGjmhmLODMnp0kkYA7 sJQrHHeKUF4nIE68b1bQd2RJvYwkzLCUl6vA1Dn2ObasLUlG+FcYph9Zl3FJ4t6nCFOtPu mxn5YFXW8620Ew7X9yCL3Bp/QCao81UlesAE5T7NJCC/exvq92+qaB4POWGeEXG0WxeLlM HbcIwPRqLSamIHGyvjYS2xnv5phlRFvBIh6Fs59kYw88g0Np7QfHJ6bIgrvOccJF6YCavq sxMqsGgxwGMYq9aCX8k4Kwy7P26e2VIv2JhxoKFp1eY7QefhXHURrwov0f/U0g== 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=1722582728; 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=zD8CwIGWdNlLw8F3YNEoIG3fybmxJPGHPViicKOLL54=; b=UV1JnCPKI6hMuUPWgGI2lkWLAowBIXuA0Vn7AVbwdh/G6bYUax4+XnJal9T1Kq3cIOcajl atpes4iL+Xvv5e92SBQYw81fEcAcHdBkr/KRZJEKvRRm6arxL/bHa5f8U2fABKIAgP53BF 3cofh1ObR1hCo8P+7QB1jfXMzTfEXpG54EW8GwEnBfY8MQgRGq3V9DpgN+usCvE810ciIM b3c8svPGt2HZ3LPKO6mSXVZZR8Y3KjYKV3vK1eA5q8VohXggTZloV9u44skRCLJPAEoVlF /9zU2libQFPi4lS9SjfBfa7cbAvUrNdncTx64meBWZ8NkIQxWhuj3JDT43S+5A== 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 4WZxpw5QLFzJjr; Fri, 2 Aug 2024 07:12:08 +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 4727C8tr021996; Fri, 2 Aug 2024 07:12:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4727C8lQ021993; Fri, 2 Aug 2024 07:12:08 GMT (envelope-from git) Date: Fri, 2 Aug 2024 07:12:08 GMT Message-Id: <202408020712.4727C8lQ021993@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: ce1617ba393a - main - net-p2p/clboss: upgrade from 0.13.1 to 0.13.2 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: ce1617ba393abf4a08dcf445f1c4ac5888a64279 Auto-Submitted: auto-generated The branch main has been updated by vd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce1617ba393abf4a08dcf445f1c4ac5888a64279 commit ce1617ba393abf4a08dcf445f1c4ac5888a64279 Author: Vasil Dimov AuthorDate: 2024-08-02 07:10:41 +0000 Commit: Vasil Dimov CommitDate: 2024-08-02 07:11:39 +0000 net-p2p/clboss: upgrade from 0.13.1 to 0.13.2 --- net-p2p/clboss/Makefile | 9 ++--- net-p2p/clboss/distinfo | 6 +-- net-p2p/clboss/files/patch-624fc32.diff | 67 +++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 8 deletions(-) diff --git a/net-p2p/clboss/Makefile b/net-p2p/clboss/Makefile index fbf8b77c5b89..2809c459554b 100644 --- a/net-p2p/clboss/Makefile +++ b/net-p2p/clboss/Makefile @@ -1,18 +1,17 @@ PORTNAME= clboss DISTVERSIONPREFIX= v # To build from an arbitrary git commit comment DISTVERSION -DISTVERSION= 0.13.1 +DISTVERSION= 0.13.2 # and uncomment the following two lines (use for example -gf8d8348c where f8d8348c is a commit hash) #DISTVERSION= 0 #DISTVERSIONSUFFIX= -g0673c50e7 +CATEGORIES= net-p2p finance .if defined(DISTVERSIONSUFFIX) PKGNAMESUFFIX= -devel .endif -PORTREVISION= 1 -CATEGORIES= net-p2p finance MAINTAINER= vd@FreeBSD.org -COMMENT= The Core Lightning Node Manager +COMMENT= Core Lightning Node Manager WWW= https://github.com/ZmnSCPxj/clboss LICENSE= MIT @@ -29,7 +28,7 @@ USES= autoreconf \ pkgconfig \ sqlite:3 -CXXFLAGS= -Wno-deprecated-declarations +CXXFLAGS+= -Wno-deprecated-declarations GNU_CONFIGURE= yes diff --git a/net-p2p/clboss/distinfo b/net-p2p/clboss/distinfo index e7449830c612..6b151863ddd2 100644 --- a/net-p2p/clboss/distinfo +++ b/net-p2p/clboss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715154453 -SHA256 (ZmnSCPxj-clboss-v0.13.1_GH0.tar.gz) = 963ea89826b0ccc0bf754f2391b9e7742f01af54821bcfd7bbf651508d0f238f -SIZE (ZmnSCPxj-clboss-v0.13.1_GH0.tar.gz) = 2947982 +TIMESTAMP = 1722513369 +SHA256 (ZmnSCPxj-clboss-v0.13.2_GH0.tar.gz) = 4ed5c894fa00668cc33f2b3cc8bb2a682560e35fd58b2fe5619e8306afb22dfa +SIZE (ZmnSCPxj-clboss-v0.13.2_GH0.tar.gz) = 2947409 diff --git a/net-p2p/clboss/files/patch-624fc32.diff b/net-p2p/clboss/files/patch-624fc32.diff new file mode 100644 index 000000000000..8996396698e6 --- /dev/null +++ b/net-p2p/clboss/files/patch-624fc32.diff @@ -0,0 +1,67 @@ +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: