[WIP] Backports for 0.11.3 (updated to 93ca5a3) #7047

luke-jr commented at 12:40 AM on November 18, 2015: member

@laanwj Did I get the commit format like you wanted here?

build: Split hardening/fPIE options out

This allows for fPIE to be used selectively.

Github-Pull: #6978
Rebased-From: 17c4d9d1647bbac4b0557136b1c3d98c951feb79

90de0e1c2f

build: Use fPIC rather than fPIE for qt objects.

But only if qt was built with reduced relocations.

Github-Pull: #6978
Rebased-From: 69d05134367da9a897ad14562a1d266750db450a

5c0b357bf6

MarcoFalke commented at 11:28 AM on November 30, 2015: member

@luke-jr Mind to get this up to master?

luke-jr renamed this:
~~[WIP] Backports for 0.11.3 (updated to e8df8a5)~~
[WIP] Backports for 0.11.3 (updated to 34e02e0)
on Nov 30, 2015

luke-jr commented at 11:56 PM on November 30, 2015: member

@MarcoFalke Updated.

Note, the following are currently excluded from this branch, as they require non-trivial evaluation for backporting:

    a83f3c2 (origin-pull/6899/head) Add explicit shared_ptr constructor due to C++11 error
    Is 6a07eb6 a bugfix hiding inside [#6424](/bitcoin-bitcoin/6424/) ? O.o
    7085728 doc: there is no libboost-base-dev, add missing sudo
    513686d (origin-pull/6951/head) [qt] Use maxTxFee instead of 10000000
    a0953cd [qa] python-bitcoinrpc is no longer a subtree
    072e2f8 Alter assumptions in CCoinsViewCache::BatchWrite
    4ec3561 Replace scriptnum_test's normative ScriptNum implementation
    9b63758 util: Don't set strMiscWarning on every exception
    e482a7f (origin-pull/6942/head) Fix CCoins serialization documentation
    * 96b8025 Merge pull request [#7112](/bitcoin-bitcoin/7112/)
        9af5f9c Move uiInterface.NotifyBlockTip signal above the core/wallet signal - This will keep getbestblockhash more in sync with blocknotify callbacks
        4082e46 [Qt] call GuessVerificationProgress synchronous during core signal, pass double over UI signal
        947d20b [Qt] reduce cs_main in getVerificationProgress()
        e6d50fc [Qt] update block tip (height and date) without locking cs_main, update always (each block)
        012fc91 NotifyBlockTip signal: switch from hash (uint256) to CBlockIndex* - also adds a boolean for indication if the tip update was happening during initial sync - emit notification also during initial sync
    1bb289f Assert now > 0 in GetTime GetTimeMillis GetTimeMicros

luke-jr renamed this:
~~[WIP] Backports for 0.11.3 (updated to 34e02e0)~~
[WIP] Backports for 0.11.3 (updated to 4077ad2)
on Dec 1, 2015

MarcoFalke commented at 11:17 PM on December 3, 2015: member

#7026 should go in as well.

MarcoFalke commented at 11:23 PM on December 3, 2015: member

utACK f711635

luke-jr renamed this:
~~[WIP] Backports for 0.11.3 (updated to 4077ad2)~~
[WIP] Backports for 0.11.3 (updated to dc0305d)
on Dec 8, 2015

laanwj commented at 9:29 AM on December 9, 2015: member

@luke-jr Yep, commit format looks good to me.

luke-jr renamed this:
~~[WIP] Backports for 0.11.3 (updated to dc0305d)~~
[WIP] Backports for 0.11.3 (updated to 97d8373)
on Dec 28, 2015

luke-jr renamed this:
~~[WIP] Backports for 0.11.3 (updated to 97d8373)~~
[WIP] Backports for 0.11.3 (updated to 93ca5a3)
on Jan 10, 2016

MarcoFalke commented at 5:09 PM on January 10, 2016: member

utACK 3b21a5e. Note: This also includes OP_CHECKLOCKTIMEVERIFY, which is not in 0.12.0

laanwj commented at 2:13 PM on March 14, 2016: member

This branch has conflicts, BTW

jonasschnelli commented at 7:25 PM on March 24, 2016: contributor

Needs rebase on 0.11er branch.

MarcoFalke commented at 7:31 PM on March 24, 2016: member

Also, documentation changes like 79fba30 could be deferred to a later pull. (And less essential bugfixes such as f31d7d5 prob as well.)

luke-jr commented at 8:51 PM on March 24, 2016: member

(Note: d658fe200e046063179607b9d1b38948b9af49bf and 848699de1f18a3a5c9f3e6c09ae4f6cc5b6da3bb have not been merged to 0.12 yet.)

Merge commit '5c0b357' into backports-for-0.11.3 d626faa06e

build: Set osx permissions in the dmg to make Gatekeeper happy

Github-Pull: #7092
Rebased-From: 392d3c5846db69dcbcc448d7504d0e4e73832ecf

e979f09b6a

luke-jr force-pushed on Mar 24, 2016

luke-jr closed this on Mar 24, 2016

MarcoFalke locked this on Sep 8, 2021