Commit graph

670 commits

Author SHA1 Message Date
Byron Hambly
6d649c1782 Merge 63fc2f5cce into merged_master (Bitcoin PR bitcoin/bitcoin#24065) 2023-06-20 12:24:24 +00:00
Byron Hambly
0b8c8d02c3 Merge b24aa9c8ef into merged_master (Bitcoin PR bitcoin/bitcoin#24095) 2023-06-20 11:37:35 +00:00
Byron Hambly
c3b3592742 Merge 290ff5ef6d into merged_master (Bitcoin PR bitcoin/bitcoin#24041) 2023-06-19 10:29:14 +00:00
Byron Hambly
57f75b6da7 Merge 3d0850cec1 into merged_master (Bitcoin PR bitcoin/bitcoin#23994) 2023-06-15 14:45:02 +00:00
Byron Hambly
cf130c6587 Merge 70395bab4e into merged_master (Bitcoin PR bitcoin/bitcoin#23760) 2023-06-15 11:15:18 +00:00
Byron Hambly
2643bd7860 Merge 8f1c28a609 into merged_master (Bitcoin PR bitcoin/bitcoin#21879) 2023-06-15 08:00:33 +00:00
Byron Hambly
b8e9358d8c Merge e31cdb0238 into merged_master (Bitcoin PR bitcoin/bitcoin#23411) 2023-06-15 07:42:35 +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
d90eaec39b Merge 7006496a5c into merged_master (Bitcoin PR bitcoin/bitcoin#23756) 2023-06-13 11:22:13 +00:00
Byron Hambly
c7c59a27a9 Merge 926fc2a0d4 into merged_master (Bitcoin PR bitcoin/bitcoin#23707) 2023-06-06 09:35:00 +00:00
Byron Hambly
e6cdd99eec Merge cf24152596 into merged_master (Bitcoin PR bitcoin/bitcoin#21206) 2023-05-31 09:12:07 +00:00
James Dorfman
3f7655eb32 Merge 9394964f6b into merged_master (Bitcoin PR bitcoin/bitcoin#23451) 2023-05-30 20:46:28 +00:00
Byron Hambly
3f0bf16b6a Merge 73ac195e29 into merged_master (Bitcoin PR bitcoin/bitcoin#23249) 2023-05-30 15:47:52 +00:00
James Dorfman
0a7c717019 Merge cf06c9b35c into merged_master (Bitcoin PR bitcoin/bitcoin#23555) 2023-05-26 15:07:47 +00:00
Byron Hambly
3eabe469a8 Merge 4a7f6e0d0c into merged_master (Bitcoin PR bitcoin/bitcoin#23524) 2023-05-26 11:18:18 +00:00
Byron Hambly
2da8f66309 Merge 38b2a0a3f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23173) 2023-05-24 11:45:57 +00:00
Byron Hambly
0486fef47e Merge 3fc3641043 into merged_master (Bitcoin PR bitcoin/bitcoin#22766) 2023-05-16 13:26:27 +00:00
James Dorfman
bccaef0de8 Merge c8bae2be34 into merged_master (Bitcoin PR bitcoin/bitcoin#23299) 2023-05-14 02:17:40 +00:00
Byron Hambly
2b8eef42dd Merge 1884ce2f4c into merged_master (Bitcoin PR bitcoin/bitcoin#22937) 2023-05-11 12:38:50 +00:00
Byron Hambly
a1fbc62ba6 Merge fbbbc594ad into merged_master (Bitcoin PR bitcoin/bitcoin#23227) 2023-05-10 13:56:33 +00:00
Byron Hambly
13f7de0975 Merge e418a8e675 into merged_master (Bitcoin PR bitcoin/bitcoin#23255) 2023-05-10 13:45:27 +00:00
Byron Hambly
866564752e Merge 6334ff7364 into merged_master (Bitcoin PR bitcoin/bitcoin#23196) 2023-05-10 11:25:39 +00:00
Byron Hambly
ca29c22820 Merge 0500a22d8c into merged_master (Bitcoin PR bitcoin/bitcoin#23208) 2023-05-09 14:40:24 +00:00
Byron Hambly
3d3f4453de Merge 89b910711c into merged_master (Bitcoin PR bitcoin/bitcoin#23178) 2023-05-09 13:00:05 +00:00
Byron Hambly
05049a9697 Merge c79d9fb2f6 into merged_master (Bitcoin PR bitcoin/bitcoin#23179) 2023-05-09 12:12:33 +00:00
Byron Hambly
498907a233 Merge 816e15ee81 into merged_master (Bitcoin PR bitcoin/bitcoin#22951) 2023-05-09 11:50:39 +00:00
Byron Hambly
cca3f919f8 Merge 9e530c6352 into merged_master (Bitcoin PR bitcoin/bitcoin#20487) 2023-05-09 11:22:04 +00:00
Byron Hambly
1c9eb84570 Merge 42fedb4acd into merged_master (Bitcoin PR bitcoin/bitcoin#23156) 2023-05-09 11:02:14 +00:00
Byron Hambly
d1a87496d0 Merge cdb4dfcbf1 into merged_master (Bitcoin PR bitcoin/bitcoin#20452) 2023-05-09 10:47:06 +00:00
Byron Hambly
9fd90e900c Merge 2d8e0c0c3c into merged_master (Bitcoin PR bitcoin/bitcoin#20457) 2023-04-28 12:41:24 +00:00
Byron Hambly
eea9829aa6 Merge 825f4a64e6 into merged_master (Bitcoin PR bitcoin/bitcoin#22976) 2023-04-24 11:40:49 +00:00
Byron Hambly
f21f92ba69 Merge 8bda5e0988 into merged_master (Bitcoin PR bitcoin/bitcoin#22855) 2023-04-23 09:29:14 +00:00
Byron Hambly
bdb6a66eb5 Merge ec7ec69c7b into merged_master (Bitcoin PR bitcoin/bitcoin#22952) 2023-04-21 11:05:32 +00:00
Byron Hambly
2a48cc4c59 Merge b8336b22d3 into merged_master (Bitcoin PR bitcoin/bitcoin#22675) 2023-04-21 06:41:50 +00:00
James Dorfman
5a22e7ab80 Merge 5446070418 into merged_master (Bitcoin PR bitcoin/bitcoin#22911) 2023-04-21 06:10:28 +00:00
James Dorfman
ffaedbc746 Merge d2dd1697ce into merged_master (Bitcoin PR bitcoin/bitcoin#22904) 2023-04-21 05:24:01 +00:00
James Dorfman
9a0306abb7 Merge 8805e06663 into merged_master (Bitcoin PR bitcoin/bitcoin#22390) 2023-04-21 02:12:32 +00:00
James Dorfman
588cbf79f9 Merge 5e3380b9f5 into merged_master (Bitcoin PR bitcoin/bitcoin#22916) 2023-04-21 01:45:53 +00:00
Byron Hambly
d37b3948cd Merge 91e07cc50d into merged_master (Bitcoin PR bitcoin/bitcoin#22591) 2023-04-20 13:05:24 +00:00
Byron Hambly
162e1f24bd Merge 81f4a3e84d into merged_master (Bitcoin PR bitcoin/bitcoin#22796) 2023-04-11 09:13:05 +00:00
James Dorfman
a50ed38709 Merge b20ad0eb16 into merged_master (Bitcoin PR bitcoin/bitcoin#22772) 2023-04-11 03:33:37 +00:00
James Dorfman
0d8968cf61 Merge 61a843e43b into merged_master (Bitcoin PR bitcoin/bitcoin#22220) 2023-04-11 03:23:21 +00:00
James Dorfman
2e16bd7fe2 Merge f6f7a12462 into merged_master (Bitcoin PR bitcoin/bitcoin#22622) 2023-04-11 01:32:44 +00:00
Byron Hambly
b70d32b713 Merge e9d6eb1b80 into merged_master (Bitcoin PR bitcoin/bitcoin#22217) 2023-04-10 13:07:29 +00:00
Byron Hambly
e536247471 Merge c3545a7396 into merged_master (Bitcoin PR bitcoin/bitcoin#22653) 2023-04-09 06:06:44 +00:00
Byron Hambly
a20c67310c Merge b1a672d158 into merged_master (Bitcoin PR bitcoin/bitcoin#22337) 2023-04-07 11:57:51 +00:00
James Dorfman
751b37293b Merge 3f083a5bbd into merged_master (Bitcoin PR bitcoin/bitcoin#22481) 2023-03-21 18:04:30 +00:00
Andrea Bonel
86db1b70e9 Fix location for default cookie path 2022-09-27 18:56:20 -03:00
fanquake
63fc2f5cce
Merge bitcoin/bitcoin#24065: build: explicitly disable support for external signing on Windows
e2ab9f83f8 build: disable external signer on Windows (fanquake)

Pull request description:

  This change explicitly disables support for external signing when targeting Windows and OpenBSD. The driver for this is that Boost Process uses boost::filesystem internally, when targeting Windows, which gets in the way of removing our usage of it (#20744). While we could adjust #20744 to still link against the Boost libs when building for Windows, that would be disappointing, as we wouldn't have cleanly removed the Boost usage we're trying too (including the build infrastructure), and, we'd be in a position where we would be building releases differently depending on the platform, which is something I want to avoid.

  After discussion with Sjors, Achow and Hebasto, this seemed like a reasonable step to move #20744 forward (as-is). Note that support for external signing ([while already being experimental](https://github.com/bitcoin/bitcoin/blob/master/doc/external-signer.md#example-usage)), could be considered even more experimental on Windows. Also, oddly, we have external-signing [explicitly disabled in our Windows (cross-compile) CI](807169e10b/ci/test/00_setup_env_win64.sh (L16)), it's not clear why this is the case, as, if it's a feature being built into releases, it should be being built and tested in the CI which is most-like the release process.

  There is an [issue open upstream](https://github.com/boostorg/process/issues/207), in regards to migrating Boost Process to std::filesystem, or having an option to use it. However there hasn't been much discussion since it was opened ~9 months ago. There is another related issue here: https://github.com/klemens-morgenstern/boost-process/issues/164.

  Resolves #24036.

ACKs for top commit:
  Sjors:
    utACK e2ab9f8
  achow101:
    ACK e2ab9f83f8
  kallewoof:
    utACK e2ab9f83f8
  hebasto:
    ACK e2ab9f83f8, tested on Linux Mint 20.2 (x86_64).

Tree-SHA512: 36fcfc0e1a008a8271dc76b8e12e93d3e1d1e528bf668e95a559e9f6fd7d5f031bd7a6a6bc8b9fa9d057b2cd56f9ec8838c7f74e87899bf9a6aeb787afbd112c
2022-01-20 13:13:30 +08:00
Hennadii Stepanov
f251141483
util: Fix mis-swapped prettyIndent and indentLevel arguments 2022-01-18 15:47:46 +02:00