Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 17 commits into from
Nov 6, 2015

Conversation

luke-jr
Copy link
Member

@luke-jr luke-jr commented Oct 14, 2015

Probably should leave this open until we're ready for the next 0.11.x release so I can keep adding to it.

diegoviola and others added 13 commits October 14, 2015 08:20
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.
* 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
Currently left out of Matt's PPA.  Debian's package for unstable already has it.
Reverts the change putting it in the bitcoind deb.
Five boost libs plus libcrypto are needed; I don't think that quite passes for minimal.
bitcoin-cli (in contrast to bitcoin-tx, which does signing ops)
shouldn't need secp256k1, and indeed it doesn't.
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);
        ~~~ ^  ~~~
@luke-jr
Copy link
Member Author

luke-jr commented Oct 14, 2015

Is 6a07eb6 a bugfix hiding inside #6424 ? O.o

MitchellCash and others added 4 commits October 23, 2015 03:22
- OSX —> OS X
- XCode —> Xcode
- github —> GitHub
- homebrew —> Homebrew
- gitian —> Gitian
- Other miscellaneous obvious spelling fixes and whitespace removal
@luke-jr luke-jr changed the title [WIP] Backport bugfixes to 0.11 (2015-10-14 / a1d623d) Backport bugfixes to 0.11 (2015-10-14 / a1d623d) Nov 5, 2015
@luke-jr luke-jr changed the title Backport bugfixes to 0.11 (2015-10-14 / a1d623d) Backport bugfixes to 0.11 (2015-10-22 / f2c869a) Nov 5, 2015
@maflcko
Copy link
Member

maflcko commented Nov 5, 2015

Skimmed-diff ACK.

1 similar comment
@sipa
Copy link
Member

sipa commented Nov 5, 2015

Skimmed-diff ACK.

@fanquake
Copy link
Member

fanquake commented Nov 6, 2015

utACK

1 similar comment
@laanwj
Copy link
Member

laanwj commented Nov 6, 2015

utACK

@laanwj laanwj merged commit af6edac into bitcoin:0.11 Nov 6, 2015
laanwj added a commit that referenced this pull request Nov 6, 2015
af6edac *: alias -h for --help (Daniel Cousens)
131d7f9 Change URLs to https in debian/control (Matt Corallo)
7ce2c91 Update debian/changelog and slight tweak to debian/control (Matt Corallo)
4fbfebe Correct spelling mistakes in doc folder (Mitchell Cash)
e42bf16 Clarification of unit test build instructions. (Eric Lombrozo)
54f9dee Update bluematt-key, the old one is long-since revoked (Matt Corallo)
bfc6154 [Trivial] Fixed typo when referring to a previous section in depends/README.md [skip ci] (Chris Kleeschulte)
9e45157 build: disable -Wself-assign (Wladimir J. van der Laan)
33d6825 Bugfix: Allow mining on top of old tip blocks for testnet (fixes testnet-in-a-box use case) (Luke Dashjr)
87a797a build: Remove dependency of bitcoin-cli on secp256k1 (Wladimir J. van der Laan)
a33cd5b [trivial] Fix rpc message "help generate" (MarcoFalke)
6fd0019 Drop "with minimal dependencies" from description (Zak Wilcox)
2394f4d Split bitcoin-tx into its own package (Zak Wilcox)
1e672ae Include bitcoin-tx binary on Debian/Ubuntu (Zak Wilcox)
b3eaa30 [Qt] Raise debug window when requested (MarcoFalke)
01878c9 Fix locking in GetTransaction. (Alex Morcos)
9b9acc2 Fix spelling of Qt (Diego Viola)
@luke-jr luke-jr deleted the backport-bugfixes-to-0.11-20151014 branch November 8, 2015 04:56
zkbot added a commit to zcash/zcash that referenced this pull request Dec 18, 2019
Bitcoin 0.12 cleanup PRs 2

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6631
- bitcoin/bitcoin#6664
  - Only the first commit (we already had the second through bitcoin/bitcoin#6825).
- bitcoin/bitcoin#6669
- bitcoin/bitcoin#6887
  - Only the non-QT parts.
- bitcoin/bitcoin#6962
- bitcoin/bitcoin#6822
  - Only first and third commits (we already had the second through an earlier PR).
- bitcoin/bitcoin#7136
  - Excludes Travis CI changes, and fixes to documents we don't have anymore.
- bitcoin/bitcoin#7084
- bitcoin/bitcoin#7509
- bitcoin/bitcoin#7617
- bitcoin/bitcoin#7726

Part of #2074.
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet