Skip to content

Commit

Permalink
Merge pull request #14 from wolfmcnally/develop
Browse files Browse the repository at this point in the history
Sync Develop Branches
  • Loading branch information
ChristopherA authored May 20, 2020
2 parents b4462e9 + 4e12355 commit 7ce4ea0
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
ignore = dirty
[submodule "deps/cbor-lite"]
path = deps/cbor-lite
url = https://github.com/wolfmcnally/cbor-lite.git
url = https://github.com/blockchaincommons/cbor-lite.git
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Pull Requests are the best way to propose changes to the codebase (we use [Githu
6. Issue that Pull Request!

## Any code contributions you make will be under the BSD-2-Clause Plus Patent License
In short, when you submit code changes, your submissions are understood will be available under the same [BSD-2-Clause Plus Patent License](./LICENSE.md) that covers the project. We also ask all code contributors to GPG sign the [CONTRIBUTOR-LICENSE-AGREEMENT.md](./CONTRIBUTOR-LICENSE-AGREEMENT.md) to protect future users of this project. Feel free to contact the maintainers if that's a concern.
In short, when you submit code changes, your submissions are understood will be available under the same [BSD-2-Clause Plus Patent License](./LICENSE.md) that covers the project. We also ask all code contributors to GPG sign the [Contributor License Agreement (CLA.md)](./CLA.md) to protect future users of this project. Feel free to contact the maintainers if that's a concern.

## Use a Consistent Coding Style
* We indent using two spaces (soft tabs)
Expand Down
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,29 @@ To build `seedtool` you'll need to use the following tools:

- autotools - Gnu Build System from Free Software Foundation ([intro](https://www.gnu.org/software/automake/manual/html_node/Autotools-Introduction.html)).

## Financial Support

Seedtool is a project of [Blockchain Commons](https://www.blockchaincommons.com/). We are proudly a "not-for-profit" social benefit corporation committed to open source & open development. Our work is funded entirely by donations and collaborative partnerships with people like you. Every contribution will be spent on building open tools, technologies, and techniques that sustain and advance blockchain and internet security infrastructure and promote an open web.

To financially support further development of Seedtool and other projects, please consider becoming a Patron of Blockchain Commons through ongoing monthly patronage as a [GitHub Sponsor](https://github.com/sponsors/BlockchainCommons). You can also support Blockchain Commons with bitcoins at our [BTCPay Server](https://btcpay.blockchaincommons.com/).

## Contributing

We encourage public contributions through issues and pull-requests! Please review [CONTRIBUTING.md](./CONTRIBUTING.md) for details on our development process. All contributions to this repository require a GPG signed [Contributor License Agreement](./CLA.md).

### Questions & Support

As an open-source, open-development community, Blockchain Commons does not have the resources to provide direct support of our projects. If you have questions or problems, please use this repository's [issues](./issues) feature. Unfortunately, we can not make any promises on response time.

If your company requires support to use our projects, please feel free to contact us directly about options. We may be able to offer you a contract for support from one of our contributors, or we might be able to point you to another entity who can offer the contractual support that you need.

### Credits

The following people directly contributed to this repository. You can add your name here by getting involved — the first step is to learn how to contribute from our [CONTRIBUTING.md](./CONTRIBUTING.md) documentation.

| Name | Role | Github | Email | GPG Fingerprint |
| ----------------- | ------------------- | ------------------------------------------------- | ------------------------------------- | -------------------------------------------------- |
| Christopher Allen | Principal Architect | [@ChristopherA](https://github.com/@ChristopherA) | \<[email protected]\> | FDFE 14A5 4ECB 30FC 5D22 74EF F8D3 6C91 3574 05ED |
| Christopher Allen | Principal Architect | [@ChristopherA](https://github.com/ChristopherA) | \<[email protected]\> | FDFE 14A5 4ECB 30FC 5D22 74EF F8D3 6C91 3574 05ED |
| Wolf McNally | Project Lead | [@WolfMcNally](https://github.com/wolfmcnally) | \<[email protected]\> | 9436 52EE 3844 1760 C3DC  3536 4B6C 2FCF 8947 80AE |

## Responsible Disclosure
Expand Down
5 changes: 0 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,30 @@ GREEN=`tput setaf 2`
RESET=`tput sgr0`

pushd deps/bc-crypto-base
git checkout develop
./configure --prefix ${LIBS}
make check
make install
popd

pushd deps/bc-shamir
git checkout develop
./configure --prefix ${LIBS}
make check
make install
popd

pushd deps/bc-slip39
git checkout develop
./configure --prefix ${LIBS}
make check
make install
popd

pushd deps/bc-bip39
git checkout develop
./configure --prefix ${LIBS}
make check
make install
popd

pushd deps/bc-bech32
git checkout develop
./configure --prefix ${LIBS}
make check
make install
Expand Down
2 changes: 1 addition & 1 deletion deps/bc-bech32
Submodule bc-bech32 updated 2 files
+1 −1 CONTRIBUTING.md
+2 −2 README.md
2 changes: 1 addition & 1 deletion deps/bc-bip39
Submodule bc-bip39 updated 2 files
+1 −1 CONTRIBUTING.md
+13 −1 README.md
2 changes: 1 addition & 1 deletion deps/bc-crypto-base
Submodule bc-crypto-base updated 2 files
+1 −1 CONTRIBUTING.md
+13 −1 README.md
2 changes: 1 addition & 1 deletion deps/bc-shamir
Submodule bc-shamir updated 2 files
+1 −1 CONTRIBUTING.md
+16 −4 README.md
2 changes: 1 addition & 1 deletion deps/bc-slip39
Submodule bc-slip39 updated 2 files
+1 −1 CONTRIBUTING.md
+13 −1 README.md

0 comments on commit 7ce4ea0

Please sign in to comment.