aboutsummaryrefslogtreecommitdiff
path: root/contrib
AgeCommit message (Collapse)Author
2016-08-15Merge #8270: Tests: Use portable #! in python scripts (/usr/bin/env)MarcoFalke
7b01ce2 Favour python over python2 as per PR #7723 (Matthew King) 873e81f Use portable #! in python scripts (/usr/bin/env) (Matthew King)
2016-07-18Merge #8295: Mining-related fixups for 0.13.0Wladimir J. van der Laan
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)
2016-07-11Merge #8289: bash-completion: Adapt for 0.12 and 0.13Wladimir J. van der Laan
1ba3db6 bash-completion: Adapt for 0.12 and 0.13 (Christian von Roques)
2016-07-07gitian: use a wrapped gcc/g++ to avoid the need for a system changeCory Fields
C_INCLUDE_PATH and CPLUS_INCLUDE_PATH work globally as though -isystem was used for each invocation. Since that changes the build results, force a rebuild of x86 depends by adding the value to $HOST_ID_SALT.
2016-07-07bash-completion: Adapt for 0.12 and 0.13Christian von Roques
* separate completion for bitcoind and bitcoin-cli * remove RPC support from bitcoind completion * add completion for bitcoin-tx and bitcoin-qt * rely on autoloading of completions
2016-07-05Add warning if -blockminsize is used.Suhas Daftuar
2016-06-28Favour python over python2 as per PR #7723Matthew King
2016-06-26Use portable #! in python scripts (/usr/bin/env)Matthew King
2016-06-22[qa] Add rpc test for segwitAlex Morcos
Amended by Pieter Wuille to use multisig 1-of-1 for P2WSH tests, and BIP9 based switchover logic. Fixes and py3 conversion by Marco Falke.
2016-06-20Merge #7713: Fixes for verify-commits scriptWladimir J. van der Laan
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)
2016-06-18Remove sipa's old revoked key from verify-commitsPeter Todd
Now that the trusted root is past all commits signed by that key we don't need it in the trusted-keys list, nor do we need to whitelist those commits in allow-revsig-commits
2016-06-18Use runtime linking of QT libdbus, use custom/temp. SDK URLJonas Schnelli
2016-06-17Fix bitcoin_qt.m4 and fix-xcb-include-order.patchJonas Schnelli
2016-06-14Merge #8194: [gitian] set correct PATH for wrappersWladimir J. van der Laan
fa61756 [gitian] set correct PATH for wrappers (MarcoFalke)
2016-06-12[gitian] set correct PATH for wrappersMarcoFalke
2016-06-10build: add armhf/aarch64 gitian buildsCory Fields
- create a script to handle split debug. This will also eventually need to check targets, and use dsymutil for osx. - update config.guess/config.sub for bdb for aarch64. - temporarily disable symbol checks for arm/aarch64 - quit renaming to linux32/linux64 and use the host directly This also adds a hack to work around an Ubuntu bug in the gcc-multilib package: https://bugs.launchpad.net/ubuntu/+source/gcc-defaults-armhf-cross/+bug/1347820 The problem is that gcc-multilib conflicts with the aarch toolchain. gcc-multilib installs a symlink that points /usr/include/asm -> /usr/include/x86_64-linux-gnu/asm. Without this link, gcc -m32 can't find asm/errno.h (and others), since /usr/include/x86_64-linux-gnu isn't in its default include path. But /usr/include/i386-linux-gnu is (though it doesn't exist on disk). So work around the problem by linking /usr/include/i386-linux-gnu/asm -> /usr/include/x86_64-linux-gnu/asm. The symlink fix is actually quite reasonable, but echoing the password into sudo is nasty, and should probably be addressed in gitian itself. It makes more sense to enable passwordless sudo for the build user by default.
2016-06-09Add README for verify-commitsPeter Todd
2016-06-09Merge #8180: Update luke-jr's PGP keyWladimir J. van der Laan
0d53a9e Update luke-jr's PGP key (Luke Dashjr)
2016-06-09Merge #7283: [gitian] Default reference_datetime to commit author dateWladimir J. van der Laan
fa42a67 [gitian] hardcode datetime for depends (MarcoFalke) fa58c76 [gitian] Default reference_datetime to commit author date (MarcoFalke)
2016-06-09Merge #8169: OSX diskimages need 0775 folder permissionsWladimir J. van der Laan
cdf7dff OSX diskimages need 0775 folder permissions Avoids endless Gatekeeper warnings (#7085) (Jonas Schnelli)
2016-06-09Update luke-jr's PGP keyLuke Dashjr
Same key, extended expiration date
2016-06-09gitian: Add --disable-bench to config flags for windowsWladimir J. van der Laan
Forgot to do this in #7776.
2016-06-08OSX diskimages need 0775 folder permissionsJonas Schnelli
Avoids endless Gatekeeper warnings (#7085)
2016-06-07gitian: create debug packages for linux/windowsCory Fields
The -debug tarballs/zips contain detached debugging symbols. To use them, place in the same dir as the target binary, and invoke gdb as usual. Also, because the debug symbols add a substantial space requirement, the build dirs are now deleted when they're no longer needed.
2016-06-07gitian: use CONFIG_SITE rather than hijacking the prefixCory Fields
2016-05-21Remove keys that are no longer used for mergingPeter Todd
Also updated trusted git root to be right after gmaxwell's last merge.
2016-05-21Remove pointless warningPeter Todd
Any attacker who managed to make an evil commit that changed something in the contrib/verify-commits/ directory could just as easily remove the warning and/or modify it to not display the evil commits; telling the user to check those commits specifically misleads them into checking just those commits rather than the script itself.
2016-05-21Make verify-commits path-independentMatt Corallo
2016-05-21Make verify-commits POSIX-compliantMatt Corallo
2016-04-29[doc] Update bitcoin-core GitHub linksMarcoFalke
2016-04-26Merge #7920: Switch Travis to TrustyWladimir J. van der Laan
a33b7c9 travis: temporarily disable qt to avoid timeouts (Cory Fields) 174023c travis: Don't disable writing ccache for pull-requests (Cory Fields) cf77fcd travis: drop MAKEJOBS=2 for windows compilers (Cory Fields) 9267a47 depends: enable pre-compiled headers for qt (Cory Fields) 06fdffd travis: switch to Trusty (Cory Fields) a6666b2 depends: mac deploy Py3 compatibility (Wladimir J. van der Laan)
2016-04-25Merge #7881: Update release processWladimir J. van der Laan
f154470 [contrib] Remove reference to sf and add doc to verify.sh (MarcoFalke) 182bec4 contrib: remove hardcoded version from verify.sh (Wladimir J. van der Laan) c907f4d doc: Update release process (Wladimir J. van der Laan)
2016-04-25[contrib] Remove reference to sf and add doc to verify.shMarcoFalke
2016-04-25contrib: remove hardcoded version from verify.shWladimir J. van der Laan
Closes #7595 as by removing the hardcoded version number from `verify.sh`.
2016-04-21depends: mac deploy Py3 compatibilityWladimir J. van der Laan
This fixes the gitian MacOSX build, it was broken in #7723. The patch to `native_mac_alias` should probably make it upstream.
2016-04-21[contrib] verify-commits: Add MarcoFalke fingerprintMarcoFalke
2016-04-19Merge #7762: [ZMQ] append a message sequence number to every ZMQ notificationWladimir J. van der Laan
0b25a9f [ZMQ] append a message sequence number to every ZMQ notification (Jonas Schnelli) de821d5 [ZMQ] refactor message string (Jonas Schnelli)
2016-04-19[ZMQ] append a message sequence number to every ZMQ notificationJonas Schnelli
2016-04-15[gitian] Move keys to contrib/gitian-keysMarcoFalke
2016-04-15[gitian] Add marcofalke-key.pgpMarcoFalke
2016-04-11Add jl2012 public key for gitian buildJohnson Lau
2016-04-10[gitian] hardcode datetime for dependsMarcoFalke
2016-04-05Merge #7776: build: Remove unnecessary executables from gitian releaseWladimir J. van der Laan
f063863 build: Remove unnecessary executables from gitian release (Wladimir J. van der Laan)
2016-04-03build: Remove unnecessary executables from gitian releaseWladimir J. van der Laan
This removes the following executables from the binary gitian release: - test_bitcoin-qt[.exe] - bench_bitcoin[.exe] @jonasschnelli and me discussed this on IRC a few days ago - unlike the normal `bitcoin_tests` which is useful to see if it is safe to run bitcoin on a certain OS/environment combination, there is no good reason to include these. Better to leave them out to reduce the download size. Sizes from the 0.12 release: ``` 2.4M bitcoin-0.12.0/bin/bench_bitcoin.exe 22M bitcoin-0.12.0/bin/test_bitcoin-qt.exe ```
2016-04-02devtools: Auto-set branch to merge to in github-mergeWladimir J. van der Laan
As we are already using the API to retrieve the pull request title, also retrieve the base branch. This makes sure that pull requests for 0.12 automatically end up in 0.12, and pull requests for master automatically end up in master, and so on. It is still possible to override the branch from the command line or using the `githubmerge.branch` git option.
2016-03-29Merge #7723: build: python 3 compatibilityWladimir J. van der Laan
18f05c7 build: python 3 compatibility (Wladimir J. van der Laan)
2016-03-29build: python 3 compatibilityWladimir J. van der Laan
Ubuntu 16.04 "xenial xerus" does not come with Python 2.x by default. It is possible to install a python-2.7 package, but this has its own problem: no `python` or `python2` symlink (see #7717). This fixes the following scripts to work with python 3: - `make check` (bctest,py, bitcoin-util-test.py) - `make translate` (extract_strings_qt.py) - `make symbols-check` (symbol-check.py) - `make security-check` (security-check.py) Explicitly call the python commands using $(PYTHON) instead of relying on the interpreter line at the top of the scripts.
2016-03-29Merge #7737: devtools: make github-merge.py use py3Wladimir J. van der Laan
f11c5a3 devtools: make github-merge.py use py3 (Wladimir J. van der Laan)
2016-03-24Merge #7609: All files related to my RPM spec file project in one commitWladimir J. van der Laan
0e4b50a Description of RPM directory (Alice Wonder) 146746b All files related to my RPM spec file project in one commit (Alice Wonder)
2016-03-23devtools: make github-merge.py use py3Wladimir J. van der Laan
This makes github-merge.py the first developer tool to go all Python 3 (for context see #7717). The changes are straightforward as the script already was `from __future__ import division,print_function,unicode_literals`. However urllib2 changed name, and json will only accept unicode data not bytes. This retains py2 compatibility for now: not strictly necessary as it's not used by the build system - but it was easy.