CVS commit: pkgsrc/finance/bitcoin

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri May 15 09:32:41 UTC 2026

Modified Files:
        pkgsrc/finance/bitcoin: Makefile distinfo
Added Files:
        pkgsrc/finance/bitcoin/patches: patch-src_node_txorphanage.cpp
            patch-src_txmempool.h patch-src_txrequest.cpp

Log Message:
bitcoin: updated to 31.0

31.0
https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-31.0.md


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/finance/bitcoin/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/finance/bitcoin/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/finance/bitcoin/patches/patch-src_node_txorphanage.cpp \
    pkgsrc/finance/bitcoin/patches/patch-src_txmempool.h \
    pkgsrc/finance/bitcoin/patches/patch-src_txrequest.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/finance/bitcoin/Makefile
diff -u pkgsrc/finance/bitcoin/Makefile:1.104 pkgsrc/finance/bitcoin/Makefile:1.105
--- pkgsrc/finance/bitcoin/Makefile:1.104       Thu May 14 16:40:54 2026
+++ pkgsrc/finance/bitcoin/Makefile     Fri May 15 09:32:41 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.104 2026/05/14 16:40:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.105 2026/05/15 09:32:41 adam Exp $
 
-DISTNAME=      bitcoin-30.2
-PKGREVISION=   2
+DISTNAME=      bitcoin-31.0
 CATEGORIES=    finance
 MASTER_SITES=  https://bitcoincore.org/bin/bitcoin-core-${PKGVERSION_NOREV}/
 

Index: pkgsrc/finance/bitcoin/distinfo
diff -u pkgsrc/finance/bitcoin/distinfo:1.26 pkgsrc/finance/bitcoin/distinfo:1.27
--- pkgsrc/finance/bitcoin/distinfo:1.26        Thu Jan 15 15:43:32 2026
+++ pkgsrc/finance/bitcoin/distinfo     Fri May 15 09:32:41 2026
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.26 2026/01/15 15:43:32 adam Exp $
+$NetBSD: distinfo,v 1.27 2026/05/15 09:32:41 adam Exp $
 
-BLAKE2s (bitcoin-30.2.tar.gz) = fc0bd5d016f4a3a0a22cb565e2ec26ec6c9e8d5ebd5c657cec832b0942444350
-SHA512 (bitcoin-30.2.tar.gz) = 4fcdb70a016f9ad1b44539f19d61d4c9ce06d92f947be156f8d5de29026aa90a17cea8dcd0bd9bf2f7ad959a4b79d851de95a1c0d2ab87862e04c26cf89f493b
-Size (bitcoin-30.2.tar.gz) = 12684500 bytes
+BLAKE2s (bitcoin-31.0.tar.gz) = cfe2f7d9b8eff64da5d8564fe1b981f27e8e55c7cae37ccc7f95e2ee7cfebb57
+SHA512 (bitcoin-31.0.tar.gz) = 3bfbd8155e56c165551af892d47846c92242ebfd70c11c61d7c7dfc457e51216b6ccabddd4eb5a3fe684eba7a69a306cc69767c8efe7bdc0eb19de1a7ddc5100
+Size (bitcoin-31.0.tar.gz) = 14637699 bytes
 SHA1 (patch-src_netbase.cpp) = d160078c9a7aedc5b569a89ebf9afa98b0d2022b
+SHA1 (patch-src_node_txorphanage.cpp) = f02504f3cd9caec5ecea254904d3636aee5c8d30
+SHA1 (patch-src_txmempool.h) = f3c7479232aad3130580703a19f22ebc675d7233
+SHA1 (patch-src_txrequest.cpp) = f60f7321446939b535f7322d5b178d28faa976de

Added files:

Index: pkgsrc/finance/bitcoin/patches/patch-src_node_txorphanage.cpp
diff -u /dev/null pkgsrc/finance/bitcoin/patches/patch-src_node_txorphanage.cpp:1.1
--- /dev/null   Fri May 15 09:32:42 2026
+++ pkgsrc/finance/bitcoin/patches/patch-src_node_txorphanage.cpp       Fri May 15 09:32:41 2026
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_node_txorphanage.cpp,v 1.1 2026/05/15 09:32:41 adam Exp $
+
+Fix compilation failure with boost >= 1.91
+https://github.com/bitcoin/bitcoin/pull/35175
+
+--- src/node/txorphanage.cpp.orig      2026-04-15 20:55:24.000000000 +0000
++++ src/node/txorphanage.cpp
+@@ -91,12 +91,13 @@ class TxOrphanageImpl final : public TxO
+         }
+     };
+ 
+-    struct OrphanIndices final : boost::multi_index::indexed_by<
+-        boost::multi_index::ordered_unique<boost::multi_index::tag<ByWtxid>, WtxidExtractor>,
+-        boost::multi_index::ordered_unique<boost::multi_index::tag<ByPeer>, ByPeerViewExtractor>
+-    >{};
+-
+-    using AnnouncementMap = boost::multi_index::multi_index_container<Announcement, OrphanIndices>;
++    using AnnouncementMap = boost::multi_index::multi_index_container<
++        Announcement,
++        boost::multi_index::indexed_by<
++            boost::multi_index::ordered_unique<boost::multi_index::tag<ByWtxid>, WtxidExtractor>,
++            boost::multi_index::ordered_unique<boost::multi_index::tag<ByPeer>, ByPeerViewExtractor>
++        >
++    >;
+     template<typename Tag>
+     using Iter = typename AnnouncementMap::index<Tag>::type::iterator;
+     AnnouncementMap m_orphans;
Index: pkgsrc/finance/bitcoin/patches/patch-src_txmempool.h
diff -u /dev/null pkgsrc/finance/bitcoin/patches/patch-src_txmempool.h:1.1
--- /dev/null   Fri May 15 09:32:42 2026
+++ pkgsrc/finance/bitcoin/patches/patch-src_txmempool.h        Fri May 15 09:32:41 2026
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_txmempool.h,v 1.1 2026/05/15 09:32:41 adam Exp $
+
+Fix compilation failure with boost >= 1.91
+https://github.com/bitcoin/bitcoin/pull/35175
+
+--- src/txmempool.h.orig       2026-05-04 13:59:18.096188699 +0000
++++ src/txmempool.h
+@@ -211,7 +211,9 @@ public:
+ 
+     static const int ROLLING_FEE_HALFLIFE = 60 * 60 * 12; // public only for testing
+ 
+-    struct CTxMemPoolEntry_Indices final : boost::multi_index::indexed_by<
++    using indexed_transaction_set = boost::multi_index_container<
++        CTxMemPoolEntry,
++        boost::multi_index::indexed_by<
+             // sorted by txid
+             boost::multi_index::hashed_unique<mempoolentry_txid, SaltedTxidHasher>,
+             // sorted by wtxid
+@@ -227,11 +229,7 @@ public:
+                 CompareTxMemPoolEntryByEntryTime
+             >
+         >
+-        {};
+-    typedef boost::multi_index_container<
+-        CTxMemPoolEntry,
+-        CTxMemPoolEntry_Indices
+-    > indexed_transaction_set;
++    >;
+ 
+     /**
+      * This mutex needs to be locked when accessing `mapTx` or other members
Index: pkgsrc/finance/bitcoin/patches/patch-src_txrequest.cpp
diff -u /dev/null pkgsrc/finance/bitcoin/patches/patch-src_txrequest.cpp:1.1
--- /dev/null   Fri May 15 09:32:42 2026
+++ pkgsrc/finance/bitcoin/patches/patch-src_txrequest.cpp      Fri May 15 09:32:41 2026
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_txrequest.cpp,v 1.1 2026/05/15 09:32:41 adam Exp $
+
+Fix compilation failure with boost >= 1.91
+https://github.com/bitcoin/bitcoin/pull/35175
+
+--- src/txrequest.cpp.orig     2026-04-15 20:55:24.000000000 +0000
++++ src/txrequest.cpp
+@@ -208,17 +208,15 @@ struct ByTimeViewExtractor
+     }
+ };
+ 
+-struct Announcement_Indices final : boost::multi_index::indexed_by<
+-    boost::multi_index::ordered_unique<boost::multi_index::tag<ByPeer>, ByPeerViewExtractor>,
+-    boost::multi_index::ordered_non_unique<boost::multi_index::tag<ByTxHash>, ByTxHashViewExtractor>,
+-    boost::multi_index::ordered_non_unique<boost::multi_index::tag<ByTime>, ByTimeViewExtractor>
+->
+-{};
+ 
+ /** Data type for the main data structure (Announcement objects with ByPeer/ByTxHash/ByTime indexes). */
+ using Index = boost::multi_index_container<
+     Announcement,
+-    Announcement_Indices
++    boost::multi_index::indexed_by<
++        boost::multi_index::ordered_unique<boost::multi_index::tag<ByPeer>, ByPeerViewExtractor>,
++        boost::multi_index::ordered_non_unique<boost::multi_index::tag<ByTxHash>, ByTxHashViewExtractor>,
++        boost::multi_index::ordered_non_unique<boost::multi_index::tag<ByTime>, ByTimeViewExtractor>
++    >
+ >;
+ 
+ /** Helper type to simplify syntax of iterator types. */