Commit graph

349 commits

Author SHA1 Message Date
Andrew Poelstra
d228e06487 Merge f3e17686b3 into merged_master (Bitcoin PR #20468) 2021-06-11 16:13:19 +00:00
Andrew Poelstra
af8bb2e65d Merge d0ca394596 into merged_master (Bitcoin PR #20476) 2021-06-11 14:44:55 +00:00
Wladimir J. van der Laan
f3e17686b3
Merge #20468: build: warn when generating man pages for binaries built from a dirty branch
6690adba08 Warn when binaries are built from a dirty branch. (Tyler Chambers)

Pull request description:

  - Adjusted `--version` flag behavior in bitcoind and bitcoin-wallet to have the same behavior.
  - Added `--version` flag to bitcoin-tx to match.
  - Added functionality in gen-manpages.sh to error when attempting to generate man pages for binaries built from a dirty branch.

  mitigates problem with  issue #20412

ACKs for top commit:
  laanwj:
    Tested ACK 6690adba08

Tree-SHA512: b5ca509f1a57f66808c2bebc4b710ca00c6fec7b5ebd7eef58018e28e716f5f2358e36551b8a4df571bf3204baed565a297aeefb93990e7a99add502b97ee1b8
2020-12-07 10:51:45 +01:00
fanquake
ed1bbcefea contrib: add MACHO tests to symbol-check tests 2020-12-03 12:16:19 +01:00
Wladimir J. van der Laan
5bab08df17 contrib: Add test for ELF symbol-check
Check both failure cases:
- Use a glibc symbol from a version that is too new
- Use a symbol from a library that is not in the allowlist

And also check a conforming binary.

Adding a similar check for Windows PE can be done in a separate PR.
2020-12-03 12:15:12 +01:00
Andrew Poelstra
6a1fadf8a6 Merge 3457054c61 into merged_master (Bitcoin PR #20346) 2020-12-02 16:06:54 +00:00
Tyler Chambers
6690adba08
Warn when binaries are built from a dirty branch.
Adjusted version flag behavior in bitcoin-tx, bitcoin-wallet, and
bitcoind to match. Added functionality in gen-manpages.sh to warning when
attempting to generate man pages for binaries built from a dirty
branch.
2020-11-28 18:43:55 -05:00
Andrew Poelstra
55ff198606 Merge c1e0c2ad3b into merged_master (Bitcoin PR #19813) 2020-11-28 19:05:58 +00:00
Andrew Poelstra
0f9a38732c Merge 4ebe2f6e75 into merged_master (Bitcoin PR #18011) 2020-11-26 21:44:11 +00:00
Andrew Poelstra
853b831d64 Merge 400f45ec9b into merged_master (Bitcoin PR #19525) 2020-11-26 20:56:20 +00:00
Andrew Poelstra
714447c7f1 Merge 910a8d9c6f into merged_master (Bitcoin PR #19560) 2020-11-26 14:48:13 +00:00
Andrew Poelstra
3037b20323 Merge ea595d39f7 into merged_master (Bitcoin PR #19205) 2020-11-26 14:36:23 +00:00
Andrew Poelstra
8eb2701f0b Merge b763ae02a6 into merged_master (Bitcoin PR #16878) 2020-11-26 14:30:39 +00:00
Andrew Poelstra
66472b679f Merge f658c15bb9 into merged_master (Bitcoin PR #18434) 2020-11-26 01:09:06 +00:00
Andrew Poelstra
53ee9d62fd Merge 43695b0cf8 into merged_master (Bitcoin PR #19201) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
437f74eaea Merge 2d7489be8f into merged_master (Bitcoin PR #18796) 2020-11-26 01:08:44 +00:00
Andrew Poelstra
d1fbd3b167 Merge fbd522721c into merged_master (Bitcoin PR #18885) 2020-11-26 01:08:38 +00:00
Andrew Poelstra
da37cc0993 Merge ac21090f20 into merged_master (Bitcoin PR #18629) 2020-11-26 01:08:32 +00:00
Andrew Poelstra
87d7c2cf71 Merge c90a9e6fff into merged_master (Bitcoin PR #18713) 2020-11-26 01:08:27 +00:00
Andrew Poelstra
fd37b7c5d6 Merge 54f812d9d2 into merged_master (Bitcoin PR #18673) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
d4323bb589 Merge d486991aa5 into merged_master (Bitcoin PR #18295) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
5a900129b7 Merge 6ec42df32b into merged_master (Bitcoin PR #18426) 2020-11-26 01:08:08 +00:00
Andrew Poelstra
db5ff988fa Merge 1277ca401a into merged_master (Bitcoin PR #18415) 2020-11-26 01:08:04 +00:00
Andrew Poelstra
1956e464aa Merge 3e50fdbe4e into merged_master (Bitcoin PR #18395) 2020-11-26 01:08:01 +00:00
Andrew Poelstra
bca8bce3b7 Merge caa2f3af29 into merged_master (Bitcoin PR #12134) 2020-11-26 01:07:42 +00:00
Andrew Poelstra
47d76259bf Merge 22d11187ee into merged_master (Bitcoin PR #17398) 2020-11-26 01:07:41 +00:00
Andrew Poelstra
77cefac5f9 Merge 2755b2b109 into merged_master (Bitcoin PR #18010) 2020-11-14 16:52:12 +00:00
Andrew Poelstra
6e9028ff6e Merge a3d198c93c into merged_master (Bitcoin PR #17863) 2020-11-14 16:52:11 +00:00
Andrew Poelstra
1b7df1d514 Merge 95ca6aeec7 into merged_master (Bitcoin PR #17691) 2020-11-14 16:52:08 +00:00
Andrew Poelstra
7c53615bb6 Merge af05bd9e1e into merged_master (Bitcoin PR #17891) 2020-11-14 16:52:07 +00:00
Andrew Poelstra
2048abd5df Merge 0655c7a94c into merged_master (Bitcoin PR #17787) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
009bc2fdfb Merge 99813a9745 into merged_master (Bitcoin PR #17829) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
e281d39855 Merge e6f167bfdf into merged_master (Bitcoin PR #17569) 2020-11-14 16:51:49 +00:00
Andrew Poelstra
434dfec482 Merge 7463181798 into merged_master (Bitcoin PR #17538) 2020-11-14 16:51:49 +00:00
Andrew Poelstra
bbc86542de Merge 03f6f408ab into merged_master (Bitcoin PR #17545) 2020-11-09 23:10:14 +00:00
Andrew Poelstra
1d3555cdaf Merge b05b28183c into merged_master (Bitcoin PR #16899) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
78df750e14 Merge 917d3d9052 into merged_master (Bitcoin PR #17052) 2020-11-09 21:20:34 +00:00
Andrew Poelstra
eb174d36e9 Merge 45be44cce4 into merged_master (Bitcoin PR #15257) 2020-11-09 21:20:21 +00:00
Andrew Poelstra
2bc7beced3 Merge db67101c74 into merged_master (Bitcoin PR #16665) 2020-11-09 21:20:17 +00:00
Andrew Poelstra
f9ee0ba9d8 Merge c79bf32774 into merged_master (Bitcoin PR #16625) 2020-11-09 21:20:16 +00:00
Andrew Poelstra
799f59c303 Merge e6e99d4f75 into merged_master (Bitcoin PR #16408) 2020-11-09 21:20:07 +00:00
Tyler Chambers
b6121edf70 swapped "is" for "==" in literal comparison
update lint-python.sh to include check F632
2020-11-09 10:21:51 -05:00
Andrew Poelstra
13fa126076 Merge 1088b90cba into merged_master (Bitcoin PR #16327) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
29431d0295 Merge c84349a148 into merged_master (Bitcoin PR #16314) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
62bfa13828 Merge e115a21f79 into merged_master (Bitcoin PR #16223) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
413732c74d Merge 47d981e827 into merged_master (Bitcoin PR #16186) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
94d71a40fe Merge 7524376a81 into merged_master (Bitcoin PR #16201) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
6553838f2c Merge 6899ef3f0e into merged_master (Bitcoin PR #16143) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
a914dbbeed Merge 26a0d07ddb into merged_master (Bitcoin PR #16130) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
0360ec8cc1 Merge 79046d5749 into merged_master (Bitcoin PR #15939) 2020-10-29 15:24:41 +00:00