[31.x] More Backports #35969

pull fanquake wants to merge 18 commits into bitcoin:31.x from fanquake:even_more_31_x_backports changing 21 files +56 −40

fanquake commented at 10:38 AM on August 14, 2026: member
Backports:
- #35908 (partial)
- #35914
- #35928
- #35937
- #35978
- #36045
- #36199
- #36201

test: Append print_suppressions=0 to LSAN_OPTIONS, and suppress bitcoin-qt

The print_suppressions=0 is required to avoid a CI failure when the
suppressions were used. E.g:

```
$ LSAN_OPTIONS="suppressions=$(pwd)/test/sanitizer_suppressions/lsan:print_suppressions=1" ./bld-cmake/test/functional/interface_gui.py
2026-08-08T10:53:45.864160Z TestFramework (INFO): PRNG seed is: 8358096631255493262
2026-08-08T10:53:45.914748Z TestFramework (INFO): Initializing test directory /tmp/bitcoin_func_test_5zx5343v
2026-08-08T10:53:47.029997Z TestFramework (INFO): Test that bitcoin-gui starts up and can be stopped via RPC
2026-08-08T10:53:47.431761Z TestFramework (ERROR): Unexpected exception:
  File "./test/functional/test_framework/test_node.py", line 534, in is_node_stopped
    raise AssertionError("Unexpected stderr {} != {}".format(stderr, expected_stderr))
AssertionError: Unexpected stderr -----------------------------------------------------
Suppressions used:
  count      bytes template
      2        181 bitcoin-qt
----------------------------------------------------- !=
```

The general suppression of the qt executables is required to avoid CI
failures for i386 builds. E.g:

```
 test  2026-08-05T08:54:08.370427Z TestFramework (ERROR): Unexpected exception:
      Traceback (most recent call last):
        File "/ci_container_base/ci/scratch_ ₿🧪_/build-i686-pc-linux-gnu/test/functional/interface_gui.py", line 34, in run_test
          self.stop_node(0)
          ~~~~~~~~~~~~~~^^^
        File "/ci_container_base/test/functional/test_framework/test_node.py", line 525, in is_node_stopped
          assert return_code in expected_ret_code, self._node_msg(
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      AssertionError: [node 0] Node returned unexpected exit code (1) vs ((0,)) when stopping

 node0 stderr =================================================================
==73449==ERROR: LeakSanitizer: detected memory leaks

Direct leak of 386 byte(s) in 17 object(s) allocated from:
    #0 0x5df28a2d in malloc (/ci_container_base/ci/scratch_ ₿🧪_/build-i686-pc-linux-gnu/bin/bitcoin-qt+0x1d0da2d) (BuildId: 496a5df531df278fe395724ae917f266331b3f81)
    #1 0xee03c1d1  (<unknown module>)

Indirect leak of 12 byte(s) in 1 object(s) allocated from:
    #0 0x5df28a2d in malloc (/ci_container_base/ci/scratch_ ₿🧪_/build-i686-pc-linux-gnu/bin/bitcoin-qt+0x1d0da2d) (BuildId: 496a5df531df278fe395724ae917f266331b3f81)
    #1 0xee03c1d1  (<unknown module>)

SUMMARY: AddressSanitizer: 398 byte(s) leaked in 18 allocation(s).
```

Github-Pull: #35937
Rebased-From: fad9ab714b5512f204f75a94d8cc4fa164dd4061

a5c6c4f2c8

doc: mention -DWITH_ZMQ=ON in macOS build guide

WITH_ZMQ defaults to OFF in CMakeLists.txt with no macOS exception.

Github-Pull: #35928
Rebased-From: 222855ed1129669e67785c9800292f017a301816

792ddd6b6f

doc: Drop GCC upgrade instructions for NetBSD

NetBSD 11.0, the latest release, ships GCC 12.5.0 as the base
system compiler, which meets the minimum version requirement in
`doc/dependencies.md`.

Github-Pull: #35908
Rebased-From: 9b85c9814d1d5b1ef9caedc25dc336dacb887dcc

f77502f066

doc: Switch `pkg-config` package to modern `pkgconf` on NetBSD

Github-Pull: #35908
Rebased-From: 5964c7229fc261ef9c52f3aea1bb11a68a50c803

10818cef79

test, refactor: Remove unused `warnings` in `wallet/test/util.cpp`

These have been unused since the following commits:
 - c61d3f02f5122b38ea8bf0029aa9dfbbf38e10d0
 - e12ff8aca049ec7b054cb3047a167c7ce8dbd421

Github-Pull: #35914
Rebased-From: da58e559865e128ca47571645a7d0e60f9caf317

e36bb6e362

fuzz, refactor: Remove unused `linearization` in `cluster_linearize.cpp`

This has been unused since a52b53926b5c6a5b92255435e3c204cdf18665a2.

Github-Pull: #35914
Rebased-From: fc28914de4e1251be7087e2a0cfa5b8fd3b0f0b9

289568e930

fuzz, refactor: Remove unused `random_string` in `locale.cpp`

This has been unused since 33332829333b589420f8038541d04ec6970f051d.

Github-Pull: #35914
Rebased-From: 3df0d067ade9574ef70e96f048f6178fb34f38f1

50b21679c0

fuzz, refactor: Remove unused `header` in `p2p_transport_serialization.cpp`

This has been unused since 0de48fe858a1ffcced340eef2c849165216141c8.

Github-Pull: #35914
Rebased-From: b7ae50e2e27eb10414a8a2b327fee95e3db3cddc

0379a668db

test, refactor: Remove unused variables in `test/rbf_tests.cpp`

These have been unused since the following commits:
 - c320cddb1b57a9c9911054fc440f7a12aaea61b5
 - e9c5aeb11d641b8cae373452339760809625021d
 - 216e6937290338950215795291dbf0a533e234cf

Github-Pull: #35914
Rebased-From: e50f422d25f98cc83d1d2251eca4e134be5453bd

a16e7b5c31

test, refactor: Remove unused `removed_refs` in `txgraph_tests.cpp`

This has been unused since it was introduced in
938e86f8fecd65ca90b97e6cf896f8c59fb590ba.

Github-Pull: #35914
Rebased-From: e550945a3941e31c8a31983fdce29c11e584bea1

5d8d6dbd09

test, refactor: Remove unused `utxo_pool` in `coinselector_tests.cpp`

This has been unused since d610951c154663053a0e39a850dffd96f808581b.

Github-Pull: #35914
Rebased-From: 422f1bd92f15c35d8fa799d25889e2fcb7469a44

adbf812421

test, refactor: Remove unused `error` in `wallet_tests.cpp`

This has been unused since 3b98bf9c43ece060d57d7ae31624d4a8220de266.

Github-Pull: #35914
Rebased-From: 3175d576288f3118c6fee0d9f7cb57f976c52346

3f32c9e60b

DrahtBot added the label Backport on Aug 14, 2026
DrahtBot commented at 10:38 AM on August 14, 2026: contributor



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/35969.



Reviews

See the guideline and AI policy for information on the review process.

Type Reviewers

ACK willcl-ark, sedited

If your review is incorrectly listed, please copy-paste <code></code> into the comment that the bot should ignore.
fanquake added this to the milestone 31.2 on Aug 15, 2026

Type	Reviewers
ACK	willcl-ark, sedited

contrib/init: fix unused variables in openrc script

Github-Pull: #35978
Rebased-From: d837bb38a44de445d2c459a477302d78871ae1a6

c1f07f9161

test: avoid undersized Boost.Test signal stacks

Boost.Test registers a `SIGSTKSZ` alternate signal stack as each test binary starts, before any tests run.
On musl, this can be smaller than Linux's hardware-dependent minimum, causing `sigaltstack()` to fail with `ENOMEM` during setup.

Disable Boost.Test's alternate stack in both test entry points.
Signal handlers continue to use the regular process stack. Boost.Test can no longer report stack overflows.

Fixes #36026

Co-authored-by: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>

Github-Pull: #36045
Rebased-From: 9eba3aafa6c26994a301965ef8ddca0ada5f85c7

d9f422136c

fanquake force-pushed on Aug 25, 2026
fanquake marked this as ready for review on Sep 9, 2026
fanquake requested review from willcl-ark on Sep 9, 2026
willcl-ark commented at 9:46 AM on September 10, 2026: member

Did we consider backporting #35659, then we can fully backport #35908 (and then the instructions will be up-to-date for current NetBSD)?
fanquake commented at 9:49 AM on September 10, 2026: member

Did we consider backporting #35659,

I don't think we should backport changes that drop support for systems that are currently supported by a branch.
willcl-ark commented at 9:51 AM on September 10, 2026: member

OK that makes sense to me.
willcl-ark approved
willcl-ark commented at 9:53 AM on September 10, 2026: member

ACK 859ee1147e7cd19525850f31ba927fad35183cd9

All backports are correct. 35908 is partial so as not to drop support for older BSDs on the old branch.

All are present in the release notes.

net: treat RFC 9637 new IPv6 documentation range as invalid

Github-Pull: #36199
Rebased-From: e6c775c6d63a1683c9b2ab68d91b335f17e65d55

a0ae200d99

fuzz: assert invalid addresses are not routable

Co-authored-by: Hodlinator <172445034+hodlinator@users.noreply.github.com>

Github-Pull: #36199
Rebased-From: b48a27691ded8c9014be59b190726159b0bff038

83456f92d0

net: Update embedded asmap to 1788801420

Github-Pull: #36201
Rebased-From: 3c91db262b74f001a30bc5834daf322eadc19c46

dfcaeb0de2

doc: update release notes for v31.x a3c425275f
fanquake force-pushed on Sep 10, 2026
willcl-ark approved
willcl-ark commented at 10:25 AM on September 10, 2026: member

reACK a3c425275fd787eca08d02311a2f0caeb2add240

range-diff from previous ACK 859ee11...a3c425275fd787eca08d02311a2f0caeb2add240 adds #36199 and #36201 correctly.
sedited approved
sedited commented at 10:51 AM on September 10, 2026: contributor

ACK a3c425275fd787eca08d02311a2f0caeb2add240

#35978 and #36045 are missing in the PR description.
fanquake commented at 10:52 AM on September 10, 2026: member

Thanks, added.
sedited merged this on Sep 10, 2026
sedited closed this on Sep 10, 2026
fanquake deleted the branch on Sep 10, 2026

Contributors

Labels

Milestone
31.2

Linked (view graph)

#35908 doc: Update NetBSD Build Guide #35914 test, fuzz: Remove unused variables #35928 doc: mention -DWITH_ZMQ=ON in macOS build guide #35937 test: Append print_suppressions=0 to LSAN_OPTIONS, and suppress bitcoin-qt #35978 contrib/init: fix unused variables in openrc script #36045 test: avoid undersized Boost.Test signal stacks #36199 net: treat RFC 9637 new IPv6 documentation range as invalid #36201 Update embedded asmap to 1788801420

[31.x] More Backports #35969

Code Coverage & Benchmarks

Reviews