Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[27.x] Backports #29888

Merged
merged 13 commits into from May 13, 2024
Merged

[27.x] Backports #29888

merged 13 commits into from May 13, 2024

Conversation

fanquake and others added 4 commits April 16, 2024 09:12
The issue is that compilation is done with `x86_64-w64-mingw32-g++-posix`,
but then linking is done with `x86_64-w64-mingw32-g++`.

I'm guessing this has been broken since bitcoin#24131
(01d1845), but have not checked.

Fixes bitcoin#29734.
Unblocks bitcoin#29527 (now DEBUG=1 builds can be tested).

Github-Pull: bitcoin#29747
Rebased-From: b7e7e72
To avoid issues with DNS blacklisting, I've setup a separate domain for my DNS seed.

Github-Pull: bitcoin#29691
Rebased-From: 4f273ab
Re-enable feature_init

Github-Pull: bitcoin#29856
Rebased-From: fadf7e9
@fanquake fanquake added this to the 27.1 milestone Apr 16, 2024
@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 16, 2024

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

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK willcl-ark, stickies-v, TheCharlatan

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

The script provided for signature might be externally provided, for
instance by way of 'finalizepsbt'. Therefore the script might be
ill-crafted, so don't assume pubkeys are always 32 bytes.

Thanks to Niklas for finding this.

Github-Pull: bitcoin#29853
Rebased-From: 4d8d213
The 32 to 64-bit time_t transition causes a build failure in the built-in
zlib about conflicting _TIME_BITS and _FILE_OFFSET_BITS.

Note that zlib doesn't use time_t at all, so it is a false alarm.

Take the following patch from upstream zlib:
https://github.com/madler/zlib/commit/a566e156b3fa07b566ddbf6801b517a9dba04fa3.patch

Closes bitcoin#29980.

Github-Pull: bitcoin#29985
Rebased-From: 2e266f3
@fanquake fanquake marked this pull request as ready for review May 6, 2024 09:09
@fanquake fanquake requested a review from stickies-v May 6, 2024 09:09
Copy link
Member

@willcl-ark willcl-ark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left one question, looks good otherwise

depends/packages/qt.mk Show resolved Hide resolved
Copy link
Member

@willcl-ark willcl-ark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 4689006

Without my earlier misunderstanding, this all looks good to me.

Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 4689006

All backports clean except for 0fcceef because of #28955, but the backport looks good to me. CI failure looks unrelated.

doc/release-notes.md Outdated Show resolved Hide resolved
doc/release-notes.md Outdated Show resolved Hide resolved
@willcl-ark
Copy link
Member

reACK bd5860b

@DrahtBot DrahtBot requested a review from stickies-v May 10, 2024 08:20
Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-ACK bd5860b

@hebasto
Copy link
Member

hebasto commented May 12, 2024

I suggest to add bitcoin-core/gui#812 and bitcoin-core/gui#813.

Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK bd5860b

@fanquake
Copy link
Member Author

I suggest to add bitcoin-core/gui#812 and bitcoin-core/gui#813.

I'll put these into the next PR, that will likely also do release prep.

@fanquake fanquake merged commit c7885ec into bitcoin:27.x May 13, 2024
15 of 16 checks passed
@fanquake fanquake deleted the 27_1_backports branch May 13, 2024 03:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet