Commit graph

507 commits

Author SHA1 Message Date
Byron Hambly
81083d47bf Merge 624333455a into merged_master (Bitcoin PR bitcoin/bitcoin#26296) 2025-07-03 20:38:42 +02:00
Byron Hambly
82e4ff741b Merge 1fde20faf8 into merged_master (Bitcoin PR bitcoin/bitcoin#28099) 2025-07-02 17:41:56 +02:00
Byron Hambly
55c95fd927 Merge c123e1d215 into merged_master (Bitcoin PR bitcoin/bitcoin#28069) 2025-07-01 13:34:08 +02:00
Byron Hambly
f86b72b128 Merge a8bd0fef25 into merged_master (Bitcoin PR bitcoin/bitcoin#27999) 2025-06-30 15:00:23 +02:00
Byron Hambly
04fc205a18 Merge 3367e1c850 into merged_master (Bitcoin PR bitcoin/bitcoin#28009) 2025-06-30 15:00:21 +02:00
Byron Hambly
acab5dd981 Merge ec822e88dd into merged_master (Bitcoin PR bitcoin/bitcoin#27813) 2025-06-30 13:48:25 +02:00
Byron Hambly
16d9ef4a8c Merge 35b01e8504 into merged_master (Bitcoin PR bitcoin/bitcoin#27676) 2025-06-28 09:59:07 +02:00
Byron Hambly
2acb8b75bf Merge 6cf47a8f44 into merged_master (Bitcoin PR bitcoin/bitcoin#27507) 2025-06-25 10:21:36 +02:00
Byron Hambly
53a14af7d9 Merge 49d543dcaf into merged_master (Bitcoin PR bitcoin/bitcoin#26953) 2025-05-15 13:12:50 +02:00
Tom Trevethan
fad4c02c57 Merge 0c579203d2 into merged_master (Bitcoin PR bitcoin/bitcoin#25867) 2025-04-08 12:33:05 +00:00
Byron Hambly
54025896c4 Merge fe1b325688 into merged_master (Bitcoin PR bitcoin/bitcoin#27029) 2025-04-06 21:44:29 +02:00
Byron Hambly
30170c6bd9 Merge aef8b4f43b into merged_master (Bitcoin PR bitcoin/bitcoin#26226) 2025-04-03 11:42:16 +02:00
Byron Hambly
4b62493f28 Merge 0c2a1288a2 into merged_master (Bitcoin PR bitcoin/bitcoin#26835) 2025-04-02 10:02:41 +02:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Byron Hambly
6658d3ce4b Merge 9c47eb4503 into merged_master (Bitcoin PR bitcoin/bitcoin#26446) 2025-03-03 15:12:03 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349)
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
24ef305cd0 Merge a9ffebddbe into merged_master (Bitcoin PR bitcoin/bitcoin#26075) 2024-11-27 11:25:12 +02:00
Byron Hambly
076e809b74 Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487) 2024-10-17 09:16:23 +02:00
James Dorfman
6d638f8e4d Merge a09033e22c into merged_master (Bitcoin PR bitcoin/bitcoin#25409) 2024-09-16 00:03:15 +00:00
James Dorfman
941d1a4586 Merge 3b3c66f859 into merged_master (Bitcoin PR bitcoin/bitcoin#25392) 2024-09-10 23:50:46 +00:00
James Dorfman
ac7b05a27d Merge 8035b5c80d into merged_master (Bitcoin PR bitcoin/bitcoin#25369) 2024-09-10 20:10:06 +00:00
James Dorfman
b6df20eb34 Merge d4475ea7ae into merged_master (Bitcoin PR bitcoin/bitcoin#22235) 2024-08-09 04:52:58 +00:00
James Dorfman
ede65a76c3 Merge 0047d9b89b into merged_master (Bitcoin PR bitcoin/bitcoin#24993) 2024-08-09 04:20:20 +00:00
James Dorfman
7ed5fcfb0f Merge 9446de160f into merged_master (Bitcoin PR bitcoin/bitcoin#24831) 2024-08-06 18:50:35 +00:00
James Dorfman
9d2e5152cd Merge bdbabc50ba into merged_master (Bitcoin PR bitcoin/bitcoin#24561) 2024-05-24 00:32:01 +00:00
Byron Hambly
25b65b9f3a Merge deb847b757 into merged_master (Bitcoin PR bitcoin/bitcoin#24491) 2023-10-14 21:53:48 +00:00
fanquake
1c976c691c
tidy: Integrate bicoin-tidy clang-tidy plugin
Enable `bitcoin-unterminated-logprintf`.

Co-authored-by: Cory Fields <cory-nospam-@coryfields.com>
2023-08-03 17:52:24 +01:00
fanquake
8c38509233
contrib: move user32.dll from bitcoind.exe libs
The user interface library is no-longer needed by `bitcoind.exe`,
or utils, only `bitcoin-qt.exe`.
Add missing lib doc.
2023-07-18 16:39:22 +01:00
fanquake
e14473299c
contrib: remove librt from release deps 2023-07-12 09:09:14 +01:00
Byron Hambly
51fbed170b Merge 3c565302aa into merged_master (Bitcoin PR bitcoin/bitcoin#24409) 2023-07-02 13:45:31 +00:00
Byron Hambly
e50aae12c2 Merge bd6b1d0238 into merged_master (Bitcoin PR bitcoin/bitcoin#24263) 2023-07-02 06:15:26 +00:00
fanquake
a8bd0fef25
Merge bitcoin/bitcoin#27999: contrib: add macOS test for fixup_chains usage
7f96638723 contrib: add macOS fixup_chains check to security-check (fanquake)
3dca683cb7 build: support -no_fixup_chains in ld64 (fanquake)

Pull request description:

  Followup to #27676, adding the check for chained fixups.

  Somewhat annoyingly, we have to patch support for `-no_fixup_chains` into ld64. As it doesn't seem to have been added [until a later version](59a99ab603/src/ld/Options.cpp (L4172)).

  Guix Build:
  ```bash
  0e17d462808f86aa7157e27a957da88fd1adeb491ad6c01138aca93e5ad1d018  guix-build-7f96638723a0/output/arm64-apple-darwin/SHA256SUMS.part
  ceb208e6374f5d7367b73128e90ca6eaeea15d50c69e49c8cf75b47212525ad7  guix-build-7f96638723a0/output/arm64-apple-darwin/bitcoin-7f96638723a0-arm64-apple-darwin-unsigned.dmg
  e31663554cfde8a37a9f3438c9c895dde94b90ff87e28f12f78be71ef6421d93  guix-build-7f96638723a0/output/arm64-apple-darwin/bitcoin-7f96638723a0-arm64-apple-darwin-unsigned.tar.gz
  68a7bbc42418641eab391a85725b5c2f3c46d38a7acc07e7a8cef98909be07ec  guix-build-7f96638723a0/output/arm64-apple-darwin/bitcoin-7f96638723a0-arm64-apple-darwin.tar.gz
  38d966ad93e7384f4f1ce16faded003a675ecce7be1987e6c4eee8e4b82c0432  guix-build-7f96638723a0/output/dist-archive/bitcoin-7f96638723a0.tar.gz
  9d314f595d897a715a321a9fba0d552220fbd4bf69aff84eb8c0001cdb48234f  guix-build-7f96638723a0/output/x86_64-apple-darwin/SHA256SUMS.part
  c218ebfd0e96348c4912e6d522492b621bb043ef45b75105ff1fde979d1004d0  guix-build-7f96638723a0/output/x86_64-apple-darwin/bitcoin-7f96638723a0-x86_64-apple-darwin-unsigned.dmg
  1c5ff7fa82f5c76d7d8b9582ad5202f4a82a917102ecafdc3c1fb7b783f6bc3e  guix-build-7f96638723a0/output/x86_64-apple-darwin/bitcoin-7f96638723a0-x86_64-apple-darwin-unsigned.tar.gz
  15fb01e5afcc842db6a3e793b42c70c05ce07bec79e0d2d605e241901ff9f639  guix-build-7f96638723a0/output/x86_64-apple-darwin/bitcoin-7f96638723a0-x86_64-apple-darwin.tar.gz
  ```

ACKs for top commit:
  theuni:
    utACK 7f96638723.
  hebasto:
    ACK 7f96638723, I have reviewed the code and the patch, and they look OK.
  TheCharlatan:
    ACK 7f96638723

Tree-SHA512: 7f94710460f54b2afe3c9f5d57107b71436c59b799b15f78e5e3011c3c4f6b23a3acc1008eccea9c22226a200774c82900bad6c6236ab6c5c48a17dec3f2d5a2
2023-06-30 16:35:09 +01:00
Jon Atack
f86a301433 script, test: add missing python type annotations
Fix warnings for these files when ./test/lint/lint-python.py is run using
mypy 0.991 (released 11/2022) and later:

"By default the bodies of untyped functions are not checked, consider using
--check-untyped-defs [annotation-unchecked]"

For details, see:

https://mypy-lang.blogspot.com/2022/11/mypy-0990-released.html
2023-06-29 16:13:51 -06:00
fanquake
7f96638723
contrib: add macOS fixup_chains check to security-check
Followup to #27676.
2023-06-29 12:08:08 +01:00
Byron Hambly
b09ca8adf3 Merge a4f7c41271 into merged_master (Bitcoin PR bitcoin/bitcoin#21851) 2023-06-29 08:45:25 +00:00
fanquake
ec822e88dd
Merge bitcoin/bitcoin#27813: guix: Update python-lief package to 0.13.2
529c92e837 guix: Update `python-lief` package to 0.13.2 (Hennadii Stepanov)

Pull request description:

  The Guix's `python-lief` package is going to move to using external deps, rather than the bundled ones (https://lists.gnu.org/archive/html/guix-patches/2023-05/msg01302.html). We want to continue using our own package indefinitely, to keep the build simpler, and allow for easier updating.

  Changes in `contrib/devtools/security-check.py` are caused by 6357c6370b.

  Also see: https://github.com/bitcoin/bitcoin/pull/27507.

ACKs for top commit:
  fanquake:
    ACK 529c92e837

Tree-SHA512: ad81111b090a39b380fe25bb27b54a339e78a158f462c7adda25d5ee55f0d654107b1486b29b9687ad0808e27b01e04f53a0e8ffc6600b79103d6bd0dfec64ef
2023-06-28 11:41:35 +01:00
Hennadii Stepanov
529c92e837
guix: Update python-lief package to 0.13.2 2023-06-23 17:02:49 +01:00
fanquake
3df6070466 contrib: remove macOS lazy_bind check
In future, this will be replaced by a check for fixup_chains usage.
2023-06-22 15:28:47 +00:00
Cory Fields
fb61bc0c02 depends: Bump MacOS minimum runtime requirement to 11.0
This is necessary as the new fixup_chains linker behavior is only valid
when the runtime target is >=11.0.
2023-06-22 15:28:47 +00:00
Byron Hambly
fb6fa54337 Merge 792d0d8d51 into merged_master (Bitcoin PR bitcoin/bitcoin#23839) 2023-06-21 11:52:34 +00:00
Byron Hambly
8529988649 Merge 711ce2e533 into merged_master (Bitcoin PR bitcoin/bitcoin#23778) 2023-06-15 13:44:23 +00:00
Byron Hambly
783876f887 Merge 8319c4e906 into merged_master (Bitcoin PR bitcoin/bitcoin#23838) 2023-06-15 05:06:31 +00:00
Byron Hambly
47626b5a64 Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912) 2023-06-14 15:44:11 +00:00
Byron Hambly
6e71741d1f Merge d05be150ca into merged_master (Bitcoin PR bitcoin/bitcoin#23811) 2023-06-13 16:37:58 +00:00
James Dorfman
32d7ad00b2 Merge c9b63ab61e into merged_master (Bitcoin PR bitcoin/bitcoin#23489) 2023-06-02 05:07:21 +00:00
fanquake
015cc5e588
lint: stop ignoring LIEF imports
Type stubs are now available as of 0.13.0.
See https://github.com/lief-project/LIEF/issues/650.
2023-05-29 10:23:52 +01:00
James Dorfman
d94c120f97 Merge 19815b096c into merged_master (Bitcoin PR bitcoin/bitcoin#23535) 2023-05-26 16:09:27 +00:00
Byron Hambly
74f2207551 Merge 6bde42e29e into merged_master (Bitcoin PR bitcoin/bitcoin#23511) 2023-05-26 12:16:49 +00:00
James Dorfman
4a713e72bb Merge aec631bccc into merged_master (Bitcoin PR bitcoin/bitcoin#23462) 2023-05-24 20:35:27 +00:00
Byron Hambly
81d5607ec8 Merge c1fb30633b into merged_master (Bitcoin PR bitcoin/bitcoin#23114) 2023-05-24 12:58:57 +00:00