[0.18.2] Backports #16617
Merged
[0.18.2] Backports #16617
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Aug 15, 2019
|
Suggest adding luke-jr/bitcoin 20190823-0.18-backports branch in. That adds:
|
41a96ae to
184dba5
Compare
|
Rebased on |
|
Added #16512. Note that in the first commit the header include has been changed from |
Fixed a couple of typos Github-Pull: bitcoin#16615 Rebased-From: 36f7697
Github-Pull: bitcoin#16596 Rebased-From: 14f7eec
Github-Pull: bitcoin#16291 Rebased-From: fa5e9f1
-BEGIN VERIFY SCRIPT- sed -i --regexp-extended -e 's/\<\w+(::\w+)?\(PACKAGE_NAME\)/PACKAGE_NAME/g' $(git grep -l --extended-regexp '\<\w+(::\w+)?\(PACKAGE_NAME\)' src) -END VERIFY SCRIPT- Github-Pull: bitcoin#16291 Rebased-From: fabe87d
Github-Pull: bitcoin#16291 Rebased-From: fa64b94
QApplication takes the command line arguments and parses them itself for some built in command line arguments that it has. We don't want any of those built in arguments, so instead give it dummy arguments. Github-Pull: bitcoin#16578 Rebased-From: a2714a5
Github-Pull: bitcoin#16051 Rebased-From: 4de3c15
Github-Pull: bitcoin#16090 Rebased-From: 36b0a2f
Needed for builds configured with --enable-upnp-default Github-Pull: bitcoin#16646 Rebased-From: b168dd3
…ices, even if the internal port is set differently Currently, the hidden service is published on the same port as the public listening port. But if a non-standard port is configured, this can be used to guess (pretty reliably) that the public IP and the hidden service are the same node. Github-Pull: bitcoin#15651 Rebased-From: 8a26567
Github-Pull: bitcoin#15650 Rebased-From: 5d35ae3
…determinism in unit tests. Github-Pull: bitcoin#16212 Rebased-From: d975338
Github-Pull: bitcoin#16512 Rebased-From: 6f405a1
Github-Pull: bitcoin#16512 Rebased-From: c0b5d97
4e3f394 to
45fb3f8
Compare
Fixes: bitcoin#16803 I opened an [upstream PR](autoconf-archive/autoconf-archive#197) to improve the Boost error reporting, so pull the latest macros. Github-Pull: bitcoin#16870 Rebased-From: bb99c4e
Move qt translations to a separate make include file. This makes it easier to auto-generate this list from tooling (see bitcoin-core/bitcoin-maintainer-tools#36). Github-Pull: bitcoin#16982 Rebased-From: 4320bfc
45fb3f8 to
ac30fc4
Compare
|
What is the status of this? |
|
@MarcoFalke There's a fair few commits in here. I'd like it to get some review and be merged rather than add any more changes. |
Belts and suspenders: make sure outgoing log messages don't contain
potentially suspicious characters, such as terminal control codes.
This escapes control characters except newline ('\n') in C syntax.
It escapes instead of removes them to still allow for troubleshooting
issues where they accidentally end up in strings.
Github-Pull: bitcoin#17095
Rebased-From: d7820a1
|
ACK 0b18ea6 I repeated the cherry-picks here and resolved the conflicts in pretty much the same way. |
laanwj
added a commit
that referenced
this pull request
Nov 25, 2019
0b18ea6 util: Filter control characters out of log messages (Wladimir J. van der Laan) ac30fc4 build: Factor out qt translations from build system (Wladimir J. van der Laan) 3b8af5f build: update boost macros to latest upstream (fanquake) b12defc Test that joinpsbts randomly shuffles the inputs (Andrew Chow) eb07d22 Shuffle inputs and outputs after joining psbts (Andrew Chow) 1175410 addrdb: Remove temporary files created in SerializeFileDB. Fixes non-determinism in unit tests. (practicalswift) c52dd12 Handle the result of posix_fallocate system call (Luca Venturini) f792b25 torcontrol: Use the default/standard network port for Tor hidden services, even if the internal port is set differently (Luke Dashjr) 9fe8d28 Bugfix: QA: Run tests with UPnP disabled (Luke Dashjr) 1d12e52 Add vertical spacer (Josu Goñi) d764141 depends: add patch to common dependencies (fanquake) 56815e9 Give QApplication dummy arguments (Andrew Chow) 9d389d0 util: No translation of `Bitcoin Core` in the copyright (MarcoFalke) 87908e9 scripted-diff: Avoid passing PACKAGE_NAME for translation (MarcoFalke) a44e18f build: Stop translating PACKAGE_NAME (MarcoFalke) 7bd8f4e rpc: Fix getblocktemplate CLI example (#16594) (Emil Engler) 1cc06a1 doc: Fix typos in COPYRIGHT (Chuf) Pull request description: Backports some commits to the `0.18` branch: * #16596 - rpc: Fix getblocktemplate CLI example * #16615 - doc: Fix typos in COPYRIGHT * #16291 - gui: Stop translating PACKAGE_NAME (without the `make translate` commit) * #16578 - Do not pass in command line arguments to QApplication * #16051 - depends: add patch to common dependencies * #16090 - Add vertical spacer * #15651 - torcontrol: Use the default/standard network port for Tor hidden services, even if the internal port is set differently * #15650 - Handle the result of posix_fallocate system call * #16646 - Bugfix: QA: Run tests with UPnP disabled * #16212 - addrdb: Remove temporary files created in SerializeFileDB. Fixes non-determinism in unit tests. * #16512 - rpc: Shuffle inputs and outputs after joining psbts * #16870 - build: update boost macros to latest upstream for improved error reporting * #16982 - build: Factor out qt translations from build system * #17095 - util: Filter control characters out of log messages ACKs for top commit: laanwj: ACK 0b18ea6 Tree-SHA512: 37f0e5afc20975f4d1506e8662eda2ae0125f2f424a852818b5af2c3b8db78fc1c365b83571aa80ca63c885ca314302190b891a50ff3851fda9b9238455a5627
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backports some commits to the
0.18branch:make translatecommit)