From nobody Wed Nov 27 13:38:21 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 4Xz0rY4XKSz5fCsJ; Wed, 27 Nov 2024 13:38:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xz0rY3n9gz4PYh; Wed, 27 Nov 2024 13:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732714701; 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=f+nAk2N+EGBrtz1OpcJqkYrZoUsANHqAGIxYS1oKWKY=; b=peLaG050LHJXJonY/p6RVdZylQ3VTK3Uhh1s3BVfMTwyqakD5klNCPSvpADCex9ljGvuxB Ayr/q59AGkok2hUkEMvb9W9kx1VHVUS1Gu98np8HjCPhqOjlhMsTHiZwVplYIFVbMB3vt+ fOL6zYHIkT/jcy6re1JEweGGeB80GPP3z2eY4PrbtxdI4J1xSxPsHv/Fl33G5rKOEosIqs 7jH8suPY1k1QY1mgWAHf1DkGwJN8+AZ5haxLSe8U23DhTtCDoPPAoAzI4kNc6zwR4N5SUG YXxCmGRw6teRjYAoWvWgH3sFTbJoezO8hrTWGSolOzwJKKkniQYNNQHIno9YUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732714701; 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=f+nAk2N+EGBrtz1OpcJqkYrZoUsANHqAGIxYS1oKWKY=; b=W9/Iigael9DWaoYbRkhb1wYqJLoLkD6ZDE8FQEOKfvx8JR/5OsuHamZ0HJE/zoMbaNgC+I bxHHT7xQUHznVdPpu1NCxV8M4e/tw1D16EW7aQ3lKRNlVx8SEIYj8/yyFVwiJz1+2W8M+8 hnioz3zq3kqot1/FHnwiM7MsdkzX0hlBysvMg1SgVwTYcWX+3payhFx1gEjknAE14RFCga 6syFGiTbXzN0dIinU/NpzYLeaTaTyeHYURGGR24HbdVXErRzUZVQOLLP1j7oZRl4xt44N9 V0Mt/7D9tSZWYS0TEy42TdDgLut6SnWrCAsy+hPWz3SX0dNbaOcwhtVyJPOpdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732714701; a=rsa-sha256; cv=none; b=v/pxNvk47VR0Rlj2DYurhCVYvGXw7TOCbZP0IDZrBkFO/PuHwSq7/hhD15Opd7l8ziGkyC 9NfiRFQxEdQYkeBj8oKtkAqLOvvtLIZHs/K/OLi2Pd4LJ9prxMuUKA/kQ62JBXSD82MOti G03dBhNjFvNzjKRjLk8oK+3y3SkR1eGvbjtWUHGeSbVYB7mu2GaiNG5xAEd4PKZ2dtUqVd SfVkVXG4KN8aNVVfRF/R7pvOPxTGOoJhHWWc2xTh82TW8NDsSkEha7yHaA9nHrLzFreVYt U9p3e3nLV6uzJf7hYBBdrmRKX6hFAkLBcbV00EC3mlVYFJ263SttEQ1pTDOFWQ== 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 4Xz0rY30N1z1BKL; Wed, 27 Nov 2024 13:38:21 +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 4ARDcLdQ039622; Wed, 27 Nov 2024 13:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ARDcLxJ039619; Wed, 27 Nov 2024 13:38:21 GMT (envelope-from git) Date: Wed, 27 Nov 2024 13:38:21 GMT Message-Id: <202411271338.4ARDcLxJ039619@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 880b364108f5 - main - net-p2p/litecoin: Update to 0.21.4 and unbreak with recent Boost 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 880b364108f5a935b6e62264a5b6a62428476d99 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=880b364108f5a935b6e62264a5b6a62428476d99 commit 880b364108f5a935b6e62264a5b6a62428476d99 Author: Christopher Hall AuthorDate: 2024-11-27 12:19:45 +0000 Commit: Gleb Popov CommitDate: 2024-11-27 13:37:52 +0000 net-p2p/litecoin: Update to 0.21.4 and unbreak with recent Boost Signed-off-by: Christopher Hall Differential Revision: https://reviews.freebsd.org/D47700 PR: 282875 --- net-p2p/litecoin/Makefile | 6 ++---- net-p2p/litecoin/distinfo | 6 +++--- net-p2p/litecoin/files/patch-src_wallet_bdb.cpp | 11 +++++++++++ .../litecoin/files/patch-src_wallet_walletutil.cpp | 20 ++++++++++++++++++++ 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile index 5d36d15846db..1ac6ffa5db77 100644 --- a/net-p2p/litecoin/Makefile +++ b/net-p2p/litecoin/Makefile @@ -1,7 +1,7 @@ PORTNAME= litecoin DISTVERSIONPREFIX= v -DISTVERSION= 0.21.3 -PORTREVISION= 5 +DISTVERSION= 0.21.4 +PORTREVISION= 0 CATEGORIES= net-p2p finance MAINTAINER= hsw@bitmark.com @@ -10,8 +10,6 @@ WWW= https://www.litecoin.org/ LICENSE= MIT -BROKEN= fails to build with boost-1.85+ - LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ libfmt.so:devel/libfmt \ libevent.so:devel/libevent diff --git a/net-p2p/litecoin/distinfo b/net-p2p/litecoin/distinfo index 5e11ed280f59..8c88d3b095a7 100644 --- a/net-p2p/litecoin/distinfo +++ b/net-p2p/litecoin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711952975 -SHA256 (litecoin-project-litecoin-v0.21.3_GH0.tar.gz) = e08642fb1d4ca3891981e6fd39f8c9fbc995d0db8b6b1c3f8f8671de8e120f9a -SIZE (litecoin-project-litecoin-v0.21.3_GH0.tar.gz) = 6531067 +TIMESTAMP = 1731380372 +SHA256 (litecoin-project-litecoin-v0.21.4_GH0.tar.gz) = ba0922213f69c1b1a1d6c3441c5ea3696b538437533555ab74268f075f0de5d3 +SIZE (litecoin-project-litecoin-v0.21.4_GH0.tar.gz) = 6533051 diff --git a/net-p2p/litecoin/files/patch-src_wallet_bdb.cpp b/net-p2p/litecoin/files/patch-src_wallet_bdb.cpp new file mode 100644 index 000000000000..931bd04ed14d --- /dev/null +++ b/net-p2p/litecoin/files/patch-src_wallet_bdb.cpp @@ -0,0 +1,11 @@ +--- src/wallet/bdb.cpp 2024-03-28 17:05:26.000000000 +0000 ++++ src/wallet/bdb.cpp 2024-11-20 13:23:51.628575000 +0000 +@@ -627,7 +627,7 @@ + return false; + } + +- fs::copy_file(pathSrc, pathDest, fs::copy_option::overwrite_if_exists); ++ fs::copy_file(pathSrc, pathDest, fs::copy_options::overwrite_existing); + LogPrintf("copied %s to %s\n", strFile, pathDest.string()); + return true; + } catch (const fs::filesystem_error& e) { diff --git a/net-p2p/litecoin/files/patch-src_wallet_walletutil.cpp b/net-p2p/litecoin/files/patch-src_wallet_walletutil.cpp new file mode 100644 index 000000000000..72c1a8374817 --- /dev/null +++ b/net-p2p/litecoin/files/patch-src_wallet_walletutil.cpp @@ -0,0 +1,20 @@ +--- src/wallet/walletutil.cpp 2024-03-28 17:05:26.000000000 +0000 ++++ src/wallet/walletutil.cpp 2024-11-20 13:28:06.157704000 +0000 +@@ -58,7 +58,7 @@ + (ExistsBerkeleyDatabase(it->path()) || ExistsSQLiteDatabase(it->path()))) { + // Found a directory which contains wallet.dat btree file, add it as a wallet. + paths.emplace_back(path); +- } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && ExistsBerkeleyDatabase(it->path())) { ++ } else if (it.depth() == 0 && it->symlink_status().type() == fs::regular_file && ExistsBerkeleyDatabase(it->path())) { + if (it->path().filename() == "wallet.dat") { + // Found top-level wallet.dat btree file, add top level directory "" + // as a wallet. +@@ -73,7 +73,7 @@ + } + } catch (const std::exception& e) { + LogPrintf("%s: Error scanning %s: %s\n", __func__, it->path().string(), e.what()); +- it.no_push(); ++ it.disable_recursion_pending(); + } + } +