Backport bugfixes to 0.10 (2015-10-22 / f2c869a) #6953

pull luke-jr wants to merge 14 commits into bitcoin:0.10 from luke-jr:backport-bugfixes-to-0.10-20151014 changing 25 files +191 −127

luke-jr commented at 8:11 PM on November 5, 2015: member

Companion to #6825
Fix spelling of Qt 9c810058d8

Fix locking in GetTransaction.

GetTransaction needs to lock cs_main until ReadBlockFromDisk completes, the data inside CBlockIndex's can change since pruning.  This lock was held by all calls to GetTransaction except rest_tx.

3ad96bdf73

[Qt] Raise debug window when requested

* Raise the debug window when hidden behind other windows
* Switch to the debug window when on another virtual desktop
* Show the debug window when minimized

This change is a conceptual copy of 5ffaaba and 382e9e2

612efe89e3

Include bitcoin-tx binary on Debian/Ubuntu

Currently left out of Matt's PPA. Debian's package for unstable already has it.

dfe0d4da7e

Split bitcoin-tx into its own package

Reverts the change putting it in the bitcoind deb.

43c2789fe3

Drop "with minimal dependencies" from description

Five boost libs plus libcrypto are needed; I don't think that quite passes for minimal.

b3964e3b7a

laanwj commented at 11:50 AM on November 6, 2015: member

Has varous travis issues (missing chainParams, RPC failures)
MarcoFalke commented at 12:05 PM on November 6, 2015: member

Had a look yesterday, I think travis fails due to Bugfix: Allow mining on top of old tip blocks for testnet (fixes testnet-in-a-box use case). Do we need this in .10?
Bugfix: Allow mining on top of old tip blocks for testnet (fixes testnet-in-a-box use case) cf67d8b49b

build: disable -Wself-assign

Prevent these warnings in clang 3.6:

    ./serialize.h:96:9: warning: explicitly assigning value of variable of type 'uint64_t' (aka 'unsigned long') to itself [-Wself-assign]
        obj = (obj);
        ~~~ ^  ~~~

a2f2fb6acf

Update bluematt-key, the old one is long-since revoked 90897ab343
Clarification of unit test build instructions. eae0350b9c

Correct spelling mistakes in doc folder

- OSX —> OS X
- XCode —> Xcode
- github —> GitHub
- homebrew —> Homebrew
- gitian —> Gitian
- Other miscellaneous obvious spelling fixes and whitespace removal

256321ebd2

Update debian/changelog and slight tweak to debian/control 38671bff4e
Change URLs to https in debian/control 97546fc44c
*: alias -h for --help 8b3311fb8d
luke-jr force-pushed on Nov 6, 2015
gmaxwell commented at 12:34 AM on November 7, 2015: contributor

ACK.
luke-jr commented at 1:49 AM on November 7, 2015: member

@laanwj @MarcoFalke Travis is okay with this now. The testnet bugfix just needed chainParams (which had already been in the function for 0.11/master before the fix).
laanwj commented at 6:02 AM on November 9, 2015: member
@luke-jr Next time you do a backport pull like this, can you please add the original pull numbers of what you're backporting?

What I usually do is add a header to the commits messages, to mark where they came from:
```
Github-Pull: [#1234](/bitcoin-bitcoin/1234/)
Rebased-From: <original-commit-hash>
```
See e.g. e7bcc4a

This allows my autogenerate-changelog scripting to work and provide useful pull links for the changes.
luke-jr commented at 6:38 AM on November 9, 2015: member

Is there an easy way to do that? I'll try to remember, but if it's a while, I may need reminding.
laanwj commented at 10:51 AM on November 9, 2015: member

Should probably document that somewhere.

I don't have scripting to automate adding the metadata. What I usually do is cherry-pick -x, then git commit --amend rewrite the "Cherry-picked from" text into Rebased-From:, and manually add in the pull #.
laanwj merged this on Nov 9, 2015
laanwj closed this on Nov 9, 2015
laanwj referenced this in commit 3b89bf6438 on Nov 9, 2015
MarcoFalke locked this on Sep 8, 2021

Contributors

Linked (view graph)

#6825 Backport bugfixes to 0.11 (2015-10-22 / f2c869a)