merge-script
e44d72b648
Merge bitcoin/bitcoin#32766 : [28.x] Finalize 28.2
...
7135d7536cdbc47536cd2d1c499433aeba945651 docs: Release notes for 28.2 (Ava Chow)
90f78c74a05e2a487705bcba81bdf12d821674da docs: Regenerate manpages for 28.2 (Ava Chow)
3cd4fdb0088799cd67f8752c480b2946c140af22 build: Bump to 28.2 (Ava Chow)
Pull request description:
Version bump for 28.2 final
ACKs for top commit:
theStack:
ACK 7135d7536cdbc47536cd2d1c499433aeba945651
fanquake:
ACK 7135d7536cdbc47536cd2d1c499433aeba945651
Tree-SHA512: 30ae17b4db16d13fcc99fa47f3927e38b337af19cb10fd64823100794d9d1333292449eedd2011aa59c8adad83c049752f04d143766f170dca24353717405055
v28.2
2025-06-19 10:17:57 +01:00
Ava Chow
7135d7536c
docs: Release notes for 28.2
2025-06-18 16:00:44 -07:00
Ava Chow
90f78c74a0
docs: Regenerate manpages for 28.2
2025-06-17 11:07:23 -07:00
Ava Chow
3cd4fdb008
build: Bump to 28.2
2025-06-17 10:56:31 -07:00
merge-script
e5a9e2435f
Merge bitcoin/bitcoin#32735 : [28.x] More backports
...
2437d9398926b82f2015d78752a72d8df82772f2 doc: update 28.x release notes (fanquake)
a6aca67214ea45ef359fa8b990ff5c9aa74fa030 build: patch cmake min version on freetype (josibake)
9082498589f09b4cd81ec017d67b684fa6f0efd9 contrib: Sign all Windows binaries too (Ava Chow)
Pull request description:
This backports
* 3656b828dc - Which was missed in #32563 , see https://github.com/bitcoin/bitcoin/pull/32563#issuecomment-2960237938 .
* #32693
ACKs for top commit:
willcl-ark:
ACK 2437d9398926b82f2015d78752a72d8df82772f2
Tree-SHA512: 3fcc04f22355372fd34581c068c3a02c2b19543f4a2a9058953b6f60debb36a597d74405decbe8451291431aa5bab2060f4545b9f6c1e3b0a8cc3e8aca17fdc5
2025-06-17 13:11:33 +01:00
fanquake
2437d93989
doc: update 28.x release notes
2025-06-13 12:33:24 +01:00
josibake
a6aca67214
build: patch cmake min version on freetype
...
Patch cmake_minimum_required version for freetype, using the version from
https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/352/diffs
This fixes a failure when building with CMake 4, where compatibility
with CMake versions < 3.5 has been removed (see https://cmake.org/cmake/help/latest/release/4.0.html#deprecated-and-removed-features )
Github-Pull: #32693
Rebased-From: d7c37906e7b1dc1513439056d0cdb2bd341d00f1
2025-06-13 12:32:38 +01:00
Ava Chow
9082498589
contrib: Sign all Windows binaries too
...
Github-Pull: #31407
Rebased-From: 3656b828dc2204418974e94928cc8d915b10ed95
2025-06-13 12:32:38 +01:00
glozow
cb13264169
Merge bitcoin/bitcoin#32684 : [28.x] 28.2rc2
...
fb6239327700acc8b038d7d241c33439e3f6916e doc: update manual pages for 28.2rc2 (fanquake)
c2b2942415af42a1c7131dfad3e1d00d136d0237 build: bump version to 28.2rc2 (fanquake)
b64faa54c2f9153d8cc594e0e471269dc3dc3a24 doc: update release notes for rc2 (fanquake)
a6cbd33d1a56966212e0f12e4555a7880ca6da08 depends: use "mkdir -p" when installing xproto (fanquake)
Pull request description:
Backports #32568 .
Bumps to `rc2`.
#32563 & #32639 haved landed since `rc1`.
ACKs for top commit:
glozow:
ACK fb6239327700acc8b038d7d241c33439e3f6916e
willcl-ark:
ACK fb6239327700acc8b038d7d241c33439e3f6916e
Tree-SHA512: 4fc210c2baa6876e9efb62150f295c22d9ef8104812c26c64daf20fc82a002dedf96e5593a49df1b84aa60793a7220c90c5ed06d7dfd1eee972ac9963c188a51
v28.2rc2
2025-06-09 11:18:10 -04:00
fanquake
fb62393277
doc: update manual pages for 28.2rc2
2025-06-07 11:59:32 +02:00
fanquake
c2b2942415
build: bump version to 28.2rc2
2025-06-07 11:59:32 +02:00
fanquake
b64faa54c2
doc: update release notes for rc2
2025-06-07 11:59:27 +02:00
fanquake
a6cbd33d1a
depends: use "mkdir -p" when installing xproto
...
It looks like the mkdir detection in xproto is broken on Alpine. Ensure
we always use `mkdir -p`.
Fixes #32494 .
Github-Pull: #32568
Rebased-From: df9ebbf659d5d1282289f36d7f9ee7103aa33a17
2025-06-05 15:43:16 +02:00
merge-script
7f1da76269
Merge bitcoin/bitcoin#32563: [28.x] Backport #31407
...
b1f694fce276d68a5b983c187a4efbb231d83f79 doc: update release-notes.md (fanquake)
52f09633d0f5c6311bbd6d9bfe06d02206307459 doc: remove note about macOS self-signing (fanquake)
744b1c8581a88cdb2c3a1f7730b5c7caae86a702 guix: Apply all codesignatures to Windows binaries (Ava Chow)
812cadefa293486b832f209ca1d3739f0330531b guix: Apply codesignatures to all MacOS binaries (Ava Chow)
c60055c637087142696a3c804f10d7b0e6821ed6 contrib: Sign and notarize all MacOS binaries (Ava Chow)
0bd5cb7ac448c9aacb86c64256ca486eadf71864 guix: Update signapple (Ava Chow)
2b279a2138eecc60251365764b9406231355cb1d build: Include all Windows binaries for codesigning (Ava Chow)
ac2b6083bab5d8ab4ae6ab271f91eb16aed66742 build: Include all MacOS binaries for codesigning (Ava Chow)
2c21db657fcea7d5c97d0a4a9616926135607b1e guix: Rename Windows unsigned binaries to unsigned.zip (Ava Chow)
9f0ee1cc9bbcdd28e6cfaf7fdbc0a9c20ebfc05c guix: Rename MacOS binaries to unsigned.tar.gz (Ava Chow)
00b401c64856af98a7baab4ded8fbcf848f4a75e guix: Rename unsigned.tar.gz to codesigning.tar.gz (Ava Chow)
Pull request description:
Backports #31407 + #32003 .
ACKs for top commit:
pinheadmz:
ACK b1f694fce276d68a5b983c187a4efbb231d83f79
Tree-SHA512: f0ca9427eb367039b4eb0c8740e66c72520413ed43f66a0ffa60d44c36426f8a31f45a1b974b5e6a591b8bf9d9e125140934d9e0ce3a8f5aaaf01c12d7fd62bd
2025-06-05 15:36:19 +02:00
fanquake
b1f694fce2
doc: update release-notes.md
2025-06-02 10:13:31 +01:00
fanquake
52f09633d0
doc: remove note about macOS self-signing
...
Followup to #31407 .
Github-Pull: #32003
Rebased-From: c873ab6f23e027af1c5837256ce3c9eccaf409cb
2025-06-02 10:13:31 +01:00
Ava Chow
744b1c8581
guix: Apply all codesignatures to Windows binaries
...
Github-Pull: #31407
Rebased-From: e181bda061ca63021511be6e286fdf6a5818df49
2025-06-02 10:13:30 +01:00
Ava Chow
812cadefa2
guix: Apply codesignatures to all MacOS binaries
...
Github-Pull: #31407
Rebased-From: aafbd23fd97ac242f7f83e5f0fff20044176e126
2025-06-02 10:13:30 +01:00
Ava Chow
c60055c637
contrib: Sign and notarize all MacOS binaries
...
Signapple has been updated to sign individual binaries, and notarize app
bundles and binaries. When codesigning, all individual binaries will be
codesigned, and both the app bundle and individual binaries will be
notarized.
Github-Pull: #31407
Rebased-From: 31d325464d0cf2d06888e0c543ae26a944f2ec6b
2025-06-02 10:13:30 +01:00
Ava Chow
0bd5cb7ac4
guix: Update signapple
...
Github-Pull: #31407
Rebased-From: 710d5b5149d0bc36d2643281d81f8f9b0c51b480
2025-06-02 10:13:30 +01:00
Ava Chow
2b279a2138
build: Include all Windows binaries for codesigning
...
Github-Pull: #31407
Rebased-From: e8b3c44da6e060464970717bbd0a5bf84867b82c
2025-06-02 10:13:30 +01:00
Ava Chow
ac2b6083ba
build: Include all MacOS binaries for codesigning
...
Github-Pull: #31407
Rebased-From: dd4ec840eeb468e94cfc9e3c72cfbfd6704dc0da
2025-06-02 10:13:25 +01:00
Ava Chow
2c21db657f
guix: Rename Windows unsigned binaries to unsigned.zip
...
As codesigned binaries will be published, the unsigned ones should be
clearly marked as such.
Github-Pull: #31407
Rebased-From: 4e5c9ceb9dd5a6ad8eea689d916a632e4d482812
2025-05-30 11:28:25 +01:00
Ava Chow
9f0ee1cc9b
guix: Rename MacOS binaries to unsigned.tar.gz
...
The MacOS binaries are unsigned and therefore also unusable on MacOS.
Indicate as such by naming the tarball "unsigned".
Github-Pull: #31407
Rebased-From: d9d49cd533bd430776c0cbe2fd666ffec3e6637b
2025-05-30 11:28:25 +01:00
Ava Chow
00b401c648
guix: Rename unsigned.tar.gz to codesigning.tar.gz
...
The tarballs used for codesigning are more than merely unsigned, they
also contain scripts and other data for codesigning. Rename them to
codesigning.tar.gz to distinguish from tarballs containing actually just
the unsigned binaries.
Github-Pull: #31407
Rebased-From: c214e5268fa9322a83cbba6d47d33f830efdd89e
2025-05-30 11:28:24 +01:00
merge-script
59c19a5416
Merge bitcoin/bitcoin#32639 : [28.x] Backport guix: accomodate migration to codeberg
...
5c2ba9f583e28460e618cc1119a10c06b868377c guix: accomodate migration to codeberg (fanquake)
Pull request description:
See https://guix.gnu.org/blog/2025/migrating-to-codeberg/ .
When interacting with the old repo you may now also see:
```bash
warning: redirecting to https://codeberg.org/guix/guix/
```
Github-Pull: #32439
Rebased-From: c8d9baae942c94d64ce47ae8f67d3710e6a296bd
ACKs for top commit:
hebasto:
ACK 5c2ba9f583e28460e618cc1119a10c06b868377c.
Tree-SHA512: ce43bdaf8bba3fb6c3db2794f25aeaf60557a1151c45903cbfe8e63345f1a9b0f6255d6055b5505556942f569a1683703999e7ed1d59698bdcd4e64edbb3405e
2025-05-30 11:09:23 +01:00
fanquake
5c2ba9f583
guix: accomodate migration to codeberg
...
See https://guix.gnu.org/blog/2025/migrating-to-codeberg/ .
When interacting with the old repo you may now also see:
```bash
warning: redirecting to https://codeberg.org/guix/guix/
```
Github-Pull: #32439
Rebased-From: c8d9baae942c94d64ce47ae8f67d3710e6a296bd
2025-05-29 13:14:53 +01:00
merge-script
ac637458ef
Merge bitcoin/bitcoin#32480 : [28.x] 28.2rc1
...
186e3f1fb65bb693154c0b63b690bea1d279f089 doc: update manual pages for 28.2rc1 (fanquake)
bbfb994fc1fbf16e5aa56e1726902ad25e31771e build: bump version to 28.2rc1 (fanquake)
fdc629fa736d79f5b26a73fafc58f52c16d18f03 doc: update release notes for 28.2rc1 (fanquake)
Pull request description:
Final changes for `v28.2rc1`.
ACKs for top commit:
willcl-ark:
ACK 186e3f1fb65bb693154c0b63b690bea1d279f089
Tree-SHA512: 56c192c9bfb7b2d69b7b039d8e024c18ba39dffed42dbd120f15644cac134e008333ec73ac6ef501db2f2a0f3b125b3003650c4209fa26d0ecb8b566d417374e
v28.2rc1
2025-05-16 18:09:51 +01:00
fanquake
186e3f1fb6
doc: update manual pages for 28.2rc1
2025-05-13 14:41:46 +01:00
fanquake
bbfb994fc1
build: bump version to 28.2rc1
2025-05-13 14:41:46 +01:00
fanquake
fdc629fa73
doc: update release notes for 28.2rc1
2025-05-13 14:41:42 +01:00
merge-script
a124b91339
Merge bitcoin/bitcoin#32299 : [28.x] Backports
...
812e6375213e883a0c22aa926ebcde5da4d23a3e doc: update release notes for 28.x (fanquake)
2ccdfa424cba3f2e414520d49485d3242f28b283 scripted-diff: Use bpf_cflags (MarcoFalke)
3df2624ee9ab25a0281b27116740d0c5aff1c101 test: Add imports for util bpf_cflags (MarcoFalke)
e65676216c6840001dbf153cb8d4861495e231ea build: use make < 3.82 syntax for define directive (Sjors Provoost)
2d6c14efbacb08da70e6323ed44b64a35cda9f52 refactor: Remove spurious virtual from final ~CZMQNotificationInterface (MarcoFalke)
9b15b20cb17f048fedf3628dbb0e7c5db9561fc5 test: Handle empty string returned by CLI as None in RPC tests (Brandon Odiwuor)
Pull request description:
Backports:
- #32070
- #32187
- #32286
- #32336
ACKs for top commit:
willcl-ark:
ACK 812e6375213e883a0c22aa926ebcde5da4d23a3e
Tree-SHA512: b5c9c6b70588658310fd2d79dbd2d1148d8650e020daa9ac8ea2d3380c1e95a92e554b43b0dfd989308a729c5226e1f1ddb13cb1bb56dc5be571e4fc2f2795d6
2025-05-13 14:02:32 +01:00
fanquake
812e637521
doc: update release notes for 28.x
2025-05-13 12:55:59 +01:00
MarcoFalke
2ccdfa424c
scripted-diff: Use bpf_cflags
...
-BEGIN VERIFY SCRIPT-
ren() { sed --regexp-extended -i "s/$1/$2/g" $( git grep --extended-regexp -l "$1" ) ; }
ren 'cflags=\["-Wno-error=implicit-function-declaration"\]' 'cflags=bpf_cflags()'
-END VERIFY SCRIPT-
Github-Pull: #32336
Rebased-From: facb9b327b9da39ce1e09ed56199be9efb19b5b8
2025-04-24 16:25:47 +01:00
MarcoFalke
3df2624ee9
test: Add imports for util bpf_cflags
...
This is required for the next commit.
Github-Pull: #32336
Rebased-From: fa0c1baaf89805182de56d6a2e8eed2265a94b40
2025-04-24 15:22:24 +01:00
Sjors Provoost
e65676216c
build: use make < 3.82 syntax for define directive
...
From the GNU make 3.82 release announcement:
* The 'define' make directive now allows a variable assignment operator
after the variable name, to allow for simple, conditional, or appending
multi-line variable assignment.
macOS ships with 3.81. This caused the multiprocess config options
to be ignored.
Fixes #32068
Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
Github-Pull: #32070
Rebased-From: 9157d9e449870851ef455e077249ac46fc2df24c
2025-04-17 15:18:34 +01:00
MarcoFalke
2d6c14efba
refactor: Remove spurious virtual from final ~CZMQNotificationInterface
...
Github-Pull: #32187
Rebased-From: fa69c42fdf0aeec0546e951bc6132ab630edb9d4
2025-04-17 15:14:39 +01:00
Brandon Odiwuor
9b15b20cb1
test: Handle empty string returned by CLI as None in RPC tests
2025-04-17 13:08:38 +01:00
glozow
dbc450c1b5
Merge bitcoin/bitcoin#31648 : [28.x] Backports
...
e57359c7dd75283363b5f82675531af167742da5 doc: Update release notes (fanquake)
51fbcba6823f3ec0f6ca75fc4573f817f7f2eecc depends: Fix compiling `libevent` package on NetBSD (Hennadii Stepanov)
2829588882781f4b920a692f04c4b0c38c5594f0 tracing: Rename the `MIN` macro to `_TRACEPOINT_TEST_MIN` in log_raw_p2p_msgs (0xb10c)
f676da82fa595e83fd3f92061da4b6d59b7a0cf0 depends: Fix spacing issue (Hennadii Stepanov)
4e7dd0ac2079dc04005c2d226eab9566807f146d doc: upgrade license to 2025. (Kay)
Pull request description:
Backports:
* https://github.com/bitcoin/bitcoin/pull/31500
* https://github.com/bitcoin/bitcoin/pull/31611
* https://github.com/bitcoin/bitcoin/pull/31623
* https://github.com/bitcoin/bitcoin/pull/31627
ACKs for top commit:
stickies-v:
ACK e57359c7dd75283363b5f82675531af167742da5
willcl-ark:
ACK e57359c7dd75283363b5f82675531af167742da5
Tree-SHA512: 2ddc7e5cf1b84846b5b066509074a475bdce6ba70938c5100c985b1135ae0662568654c4053aeddb4a022c7c2c38c49f6ed42f9cc2ff68a3057236202fae141c
2025-03-05 12:34:27 -05:00
fanquake
e57359c7dd
doc: Update release notes
2025-03-05 13:49:49 +00:00
Hennadii Stepanov
51fbcba682
depends: Fix compiling libevent package on NetBSD
...
Github-Pull: #31500
Rebased-From: f89f16846ec02942e7b81d24a85e3f40941e5426
2025-03-05 13:48:47 +00:00
0xb10c
2829588882
tracing: Rename the MIN macro to _TRACEPOINT_TEST_MIN in log_raw_p2p_msgs
...
Inspired by: 00c1dbd26ddb816e5541c5724397015a92a3d06b (#31419 )
Github-Pull: #31623
Rebased-From: f93f0c93961bbce413101c2a92300a7a29277506
2025-01-10 17:10:38 +00:00
Hennadii Stepanov
f676da82fa
depends: Fix spacing issue
...
This change resolves an issue where a missing space caused the value of
the `build_AR` variable to be concatenated with the "NM=" string. This
resulted in subsequent calls to `${AR}` and `${NM}` failing.
Github-Pull: #31627
Rebased-From: 8a46286da667d19414c30350df48ebf245589e32
2025-01-10 17:10:38 +00:00
Kay
4e7dd0ac20
doc: upgrade license to 2025.
...
Github-Pull: #31611
Rebased-From: b537a2c02a9921235d1ecf8c3c7dc1836ec68131
2025-01-10 17:10:38 +00:00
Ava Chow
32efe85043
Merge bitcoin/bitcoin#31594 : [28.x] 28.1 backports and final changes
...
36314b8da2ee65afd5636fa830d436c5c22bd260 doc: Update 28.1 release notes (MarcoFalke)
58910279dcfd989a1712b3dc39a272ff3fbe1136 doc: generate 28.1 manpages (Ava Chow)
6a68ef9bfb39b27d480d4091b60d1c7f9f2d8690 build: bump to 28.1 (Ava Chow)
5b368f88a9fddd0cd48fb014ff9694c555129996 depends: Fix CXXFLAGS on NetBSD (Hennadii Stepanov)
05cd448e3328181d3fe1662bcd7af82cb51833a7 test: generateblocks called by multiple threads (MarcoFalke)
621c634b7fe14fbf151cd222eeaade3505059249 rpc: Extend scope of validation mutex in generateblock (MarcoFalke)
Pull request description:
Backports:
- #31502
- #31563
ACKs for top commit:
glozow:
reACK 36314b8da2ee65afd5636fa830d436c5c22bd260
achow101:
ACK 36314b8da2ee65afd5636fa830d436c5c22bd260
Tree-SHA512: c7a624b4c166f4322011d98d1ca814ae98eaf5fd2481a507cd65a50216f1abbb91f8643508ce81f64f8b10fa2210db1722254c343253f2a950b9c64667735e9b
v28.1
2025-01-07 13:32:56 -05:00
MarcoFalke
36314b8da2
doc: Update 28.1 release notes
2025-01-06 11:04:28 +01:00
Ava Chow
58910279dc
doc: generate 28.1 manpages
2025-01-02 20:53:02 +01:00
Ava Chow
6a68ef9bfb
build: bump to 28.1
2025-01-02 20:53:02 +01:00
Hennadii Stepanov
5b368f88a9
depends: Fix CXXFLAGS on NetBSD
...
This change corrects an issue where CXXFLAGS were mistakenly overridden
by CFLAGS.
Github-Pull: 31502
Rebased-From: a10bb400e8cb0da0030114ee59f2e7c8494aef42
2025-01-02 14:18:28 +01:00
MarcoFalke
05cd448e33
test: generateblocks called by multiple threads
...
Co-Authored-By: David Gumberg <davidzgumberg@gmail.com>
Github-Pull: 31563
Rebased-From: fa63b8232f38e78d3c6413fa7d51809f376de75c
2025-01-02 14:17:02 +01:00