MarcoFalke
660c027cd5
Merge #9510 : [trivial] Fix typos in comments
...
cc16d99 [trivial] Fix typos in comments (practicalswift)
2018-01-21 12:48:34 +01:00
Wladimir J. van der Laan
ef6297cdd6
Merge #9617 : [Trivial] Update license year range to 2017
...
be31a2b [Trivial] Update license year range to 2017 (Lauda)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
96b4910fbe
Merge #9607 : Remove redundant semicolons in Python code
...
5cdf106 Remove redundant semicolons in Python code (practicalswift)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
78a7a9f30b
Merge #9552 : Add IPv6 support to qos.sh
...
fc089ae Add IPv6 support to qos.sh (James White)
2018-01-21 12:48:33 +01:00
MarcoFalke
be63fb7953
Merge #9508 : Remove unused Python imports
...
95bab82 Remove unused Python imports (practicalswift)
2018-01-21 12:48:33 +01:00
Alexander Block
e5daae2913
Dashify "linearize" README.md and switch the tool to mainnet
2018-01-18 19:39:43 +01:00
Alexander Block
b3ee3fc355
Dashify example config and help strings
2018-01-18 19:39:43 +01:00
Wladimir J. van der Laan
882e2cdb9f
Merge #9373 : Linearize script update (hash byte reversal and Python 3 support)
...
3c8f63b Make linearize scripts Python 3-compatible. (Doug)
d5aa198 Allow linearization scripts to support hash byte reversal (Doug)
2018-01-18 07:33:44 +01:00
MarcoFalke
125adda41a
Merge #9401 : Make rpcauth help message clearer, add example in example .conf
...
0513c70 Make rpcauth help message clearer, add example in example .conf (Gregory Sanders)
2018-01-18 07:33:43 +01:00
Jonas Schnelli
a590da317c
Merge #9412 : build: Fix 'make deploy' for OSX
...
2fb98f6 Fix bug in dmg builder so that it actually reads in the configuration file (Don Patterson)
b01667c Mention RSVG dependency when creating the disk image on OSX (Jonas Schnelli)
09aefb5 build: Fix 'make deploy' for OSX (Cory Fields)
2018-01-18 07:33:42 +01:00
MarcoFalke
47a7ec79fe
Merge #9083 : Enforcing consistency, 'gitian' to 'Gitian'
...
66ca6cd Enforcing consistency, 'gitian' to 'Gitian' (S. Matthew English)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
9d661f4337
Merge #8675 : Make copyright header lines uniform
...
4b04e32 [copyright] copyright header style uniform (isle2983)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
0b93a58947
Merge #8674 : tools for analyzing, updating and adding copyright headers in source files
...
159597a [devtools] script support for managing source file copyright headers (isle2983)
2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
4d0f28545e
Merge #8948 : [TRIVIAL] reorder Windows gitian build order to match Linux
...
3f7581d [TRIVIAL] reorder Windows gitian build order to match Linux (Micha)
2018-01-13 13:44:38 +01:00
Jonas Schnelli
b02e461fae
Merge #8908 : Update bitcoin-qt.desktop
...
164196b Simple Update to File 'bitcoin-qt.desktop' (matthias)
2018-01-12 09:58:15 +01:00
Wladimir J. van der Laan
4fc77cc3a1
Merge #8954 : contrib: Add README for pgp keys
...
fab5ca8 contrib: Add README for pgp keys (MarcoFalke)
2018-01-12 09:58:14 +01:00
Wladimir J. van der Laan
8edc2a78cb
Merge #8249 : Enable (and check for) 64-bit ASLR on Windows
...
62c2915 build: supply `-Wl,--high-entropy-va` (Wladimir J. van der Laan)
9a75d29 devtools: Check for high-entropy ASLR in 64-bit PE executables (Wladimir J. van der Laan)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
9ad1f3ffb9
Merge #8779 : [contrib] Delete spendfrom
...
fa81d09 [contrib] Delete spendfrom (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
24c69691c2
Merge #8781 : [contrib] delete qt_translations.py
...
faf87af [contrib] delete qt_translations.py (MarcoFalke)
2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
a5a9e46042
Merge #8700 : [copyright] add MIT license headers to .sh scripts where missing
...
0766d1c [copyright] add MIT license headers to .sh scripts where missing (isle2983)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
d95a9728be
Merge #8676 : Add missing copyright headers
...
783e930 [copyright] Add missing copyright headers (isle2983)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
473ffa0641
Merge #8702 : [copyright] add MIT License copyright header to remaining Python files
...
4677b19 [copyright] add MIT License copyright header to remaining Python files (isle2983)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
45fe44ed27
Merge #8701 : [copyright] add MIT License copyright header to zmq_sub.py
...
37a7fe9 [copyright] add MIT License copyright header to zmq_sub.py (isle2983)
2018-01-11 13:20:57 +01:00
Alexander Block
f9694badb9
Dashify gen-manpages.sh
2018-01-09 14:31:17 +01:00
Wladimir J. van der Laan
5691cee8dd
Merge #8608 : Install manpages via make install, also add some autogenerated manpages
...
d19583f improved gen-manpages.sh, includes bitcoin-tx and strips commit tag, now also runs binaries from build dir by default, added variables for more control (nomnombtc)
09546ca regenerated all manpages with commit tag stripped, also add bitcoin-tx (nomnombtc)
ae6e754 change help string --enable-man to --disable-man (nomnombtc)
a32c102 add conditional for --enable-man, default is yes (nomnombtc)
dc84b6f add doc/man to subdir if configure flag --enable-man is set (nomnombtc)
00dba72 add doc/man/Makefile.am to include manpages (nomnombtc)
eb5643b add autogenerated manpages by help2man (nomnombtc)
6edf2fd add gen-manpages.sh description to README.md (nomnombtc)
d2cd9c0 add script to generate manpages with help2man (nomnombtc)
2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
79d550d563
Merge #8557 : [contrib] Rework verifybinaries
...
faaed88 [contrib] verifybinaries: Mention mandatory preparation step (MarcoFalke)
fa917f6 [contrib] verifybinaries: Keep downloads by default (MarcoFalke)
fab1f92 [contrib] verifybinaries: Adjust parsing to new rc path (MarcoFalke)
2018-01-09 14:16:38 +01:00
MarcoFalke
ae0aca909e
[contrib] Remove reference to sf and add doc to verify.sh
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
aed0b04133
contrib: remove hardcoded version from verify.sh
...
Closes #7595 as by removing the hardcoded version number from
`verify.sh`.
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
d16b2e5ecb
Merge #8621 : [contrib] python: Don't use shell=True
...
fa994a7 contrib: Don't use shell=True (MarcoFalke)
2018-01-09 14:16:37 +01:00
Alexander Block
40202ef819
Dashify gitian-build.sh
2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
fc34ec4b3f
Merge #8566 : Easy to use gitian building script
...
3fe0b68 Set defaults to gitian defaults (Andrew Chow)
6ffd6b4 Create option to detach sign gitian builds and not commit the files in the script (Andrew Chow)
498d8da Check for OSX SDK (Andrew Chow)
eda4cfb Create an easy to use gitian building script (Andrew Chow)
2018-01-09 14:04:21 +01:00
Pieter Wuille
e7da915844
Merge #8617 : Include instructions to extract Mac OS X SDK on Linux using 7zip and SleuthKit
...
b729fcd Include instructions to extract Mac OS X SDK on Linux using 7zip and SleuthKit (Luke Dashjr)
2018-01-09 14:04:21 +01:00
Wladimir J. van der Laan
22604cbbcc
Merge #8607 : [doc] Fix doxygen off-by-one comments, fix typos
...
fafe7b3 contrib: Make fix-copyright-headers.py more portable (MarcoFalke)
fa27c0a [doc] Fix typos in comments, doxygen: Fix comment syntax (MarcoFalke)
fabfd5d [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke)
67a5502 init: Fix typo in help message for -whitelistforcerelay (Wladimir J. van der Laan)
2018-01-09 14:04:21 +01:00
Pieter Wuille
f81e4f5fa9
Merge #8545 : [doc] Update git-subtree-check.sh README
...
fa3d974 [doc] Update git-subtree-check.sh README (MarcoFalke)
2018-01-09 14:04:20 +01:00
Alexander Block
ae90d0f09e
Align HD wallet status icon code with Bitcoin code
...
Rename labelEncryptionIcon to labelWalletEncryptionIcon
Reorder icons in Makefile.qt.include
Add missing entries in debian/copyright
2018-01-08 18:04:55 +01:00
MarcoFalke
bc659c3e6e
Merge #8270 : Tests: Use portable #! in python scripts (/usr/bin/env)
...
7b01ce2 Favour python over python2 as per PR #7723 (Matthew King)
873e81f Use portable #! in python scripts (/usr/bin/env) (Matthew King)
2018-01-08 18:04:55 +01:00
Alexander Block
9c2e970858
Fix review nits
2017-12-28 15:53:17 +01:00
Wladimir J. van der Laan
f9f3b8d938
Merge #8295 : Mining-related fixups for 0.13.0
...
c1d61fb Add warning if -blockminsize is used. (Suhas Daftuar)
27362dd Remove -blockminsize option (Suhas Daftuar)
d2e46e1 Remove addScoreTxs() (Suhas Daftuar)
6dd4bc2 Exclude witness transactions in addPackageTxs() pre-segwit activation (Suhas Daftuar)
f15c2cd CreateNewBlock: add support for size-accounting to addPackageTxs (Suhas Daftuar)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
26540aa5d1
Merge #8289 : bash-completion: Adapt for 0.12 and 0.13
...
1ba3db6 bash-completion: Adapt for 0.12 and 0.13 (Christian von Roques)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
e6b071ab0a
Merge #8315 : gitian: Don't require sudo for Linux.
...
099d4b0 gitian: use a wrapped gcc/g++ to avoid the need for a system change (Cory Fields)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
573d9314e8
Merge #7713 : Fixes for verify-commits script
...
1e9aab0 Remove sipa's old revoked key from verify-commits (Peter Todd)
966151e Add README for verify-commits (Peter Todd)
11164ec Remove keys that are no longer used for merging (Peter Todd)
22421fa Remove pointless warning (Peter Todd)
9523e8a Make verify-commits path-independent (Matt Corallo)
f7d4a25 Make verify-commits POSIX-compliant (Matt Corallo)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
68757db683
Merge #8210 : [Qt] Bump to Qt5.6.1
...
2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli)
59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli)
6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli)
f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake)
f25209a depends: bump OSX toolchain (Cory Fields)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
61a667fc49
Merge #8194 : [gitian] set correct PATH for wrappers
...
fa61756 [gitian] set correct PATH for wrappers (MarcoFalke)
2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
06a73ad7c4
Merge #8188 : Add armhf/aarch64 gitian builds
...
9d25362 build: add armhf/aarch64 gitian builds (Cory Fields)
980e7eb depends: only build qt on linux for x86_64/x86 (Cory Fields)
2017-12-22 17:20:42 +01:00
Wladimir J. van der Laan
856e546785
Merge #7283 : [gitian] Default reference_datetime to commit author date
...
fa42a67 [gitian] hardcode datetime for depends (MarcoFalke)
fa58c76 [gitian] Default reference_datetime to commit author date (MarcoFalke)
2017-12-22 17:20:31 +01:00
Alexander Block
a60d4d64c6
Remove 'LDFLAGS=-static-libstdc++' from CONFIGFLAGS in gitian-linux.yml
...
This seems to have been re-added by accident in older out-of-order backports.
2017-12-22 17:20:28 +01:00
Wladimir J. van der Laan
9bed9ac9f1
Merge #7975 : [doc] Update bitcoin-core GitHub links
...
faf3d11 [doc] Update bitcoin-core GitHub links (MarcoFalke)
2017-12-20 17:25:03 +01:00
Wladimir J. van der Laan
f1197476ab
Merge #7870 : [contrib] Add MarcoFalke key and move all keys to contrib/gitian-keys
...
faf4c83 [gitian] Move keys to contrib/gitian-keys (MarcoFalke)
fa93936 [gitian] Add marcofalke-key.pgp (MarcoFalke)
2017-12-20 17:25:02 +01:00
Wladimir J. van der Laan
1f8ca7546e
depends: mac deploy Py3 compatibility
...
This fixes the gitian MacOSX build, it was broken in #7723 .
The patch to `native_mac_alias` should probably make it upstream.
2017-12-20 08:49:46 +01:00
Wladimir J. van der Laan
1cd653cc54
Merge #7781 : devtools: Auto-set branch to merge to in github-merge
...
10d3ae1 devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)
2017-12-19 13:42:36 +01:00