Skip to content

[28.x] Backports#35214

Merged
achow101 merged 3 commits intobitcoin:28.xfrom
fanquake:backport_35202
May 6, 2026
Merged

[28.x] Backports#35214
achow101 merged 3 commits intobitcoin:28.xfrom
fanquake:backport_35202

Conversation

@fanquake
Copy link
Copy Markdown
Member

@fanquake fanquake commented May 5, 2026

@DrahtBot
Copy link
Copy Markdown
Contributor

DrahtBot commented May 5, 2026

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/35214.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK achow101

If your review is incorrectly listed, please copy-paste <!--meta-tag:bot-skip--> into the comment that the bot should ignore.

Docker 29.4.2 blocks `socketcall(2)` in the default seccomp profile:
https://docs.docker.com/engine/release-notes/29/#2942
https://github.com/moby/profiles/releases/tag/seccomp%2Fv0.2.2
moby/moby#52501

That affects the `i686, no IPC` job because it runs 32-bit Linux test binaries inside Docker.

Add Docker's documented `--security-opt seccomp=unconfined` workaround to this job's `CI_CONTAINER_CAP` - the hook `ci/test/02_run_container.py` already appends to `docker run`.

This restores socket availability for the 32-bit test binaries throughout the job:
https://docs.docker.com/engine/security/seccomp/#run-without-the-default-seccomp-profile

Github-Pull: bitcoin#35202
Rebased-From: 11c9ef9
@fanquake fanquake requested a review from willcl-ark May 5, 2026 14:57
@achow101
Copy link
Copy Markdown
Member

achow101 commented May 6, 2026

#35175 please so I can compile this

theuni and others added 2 commits May 6, 2026 09:44
This effectively reverts a3cb309 from PR bitcoin#30194.

That PR reduced the multi_index type signatures as recommended upstream, but
this is no longer supported as of boost 1.91 because it is no longer necessary.
1.91 drops support for the pre-c++11 work-arounds that bloated the type
signatures to begin with.

The upstream `BOOST_MULTI_INDEX_ENABLE_MPL_SUPPORT` define is meant to provide
compatibility with removed features, but it does not work for this case. Using
`indexed_by` directly when defining the `multi_index` (as opposed to inheriting
from it) works with all versions, and avoids the use of the back-compat define.

This is a slight regression when building against boost < 1.91 because the
bloated type signatures are reintroduced in that case, but it's not significant
enough to go to the trouble of introducing version detection and ifdefs.

Github-Pull: bitcoin#35175
Rebased-From: 0bc9d35
@achow101
Copy link
Copy Markdown
Member

achow101 commented May 6, 2026

ACK c1c2184

@achow101 achow101 merged commit 2023de5 into bitcoin:28.x May 6, 2026
17 checks passed
@fanquake fanquake deleted the backport_35202 branch May 6, 2026 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants