From 75ca8540052ac82892970301e1ff6dc93ebe771b Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 28 Jun 2022 12:25:47 +0100 Subject: [PATCH 1/2] Projects that rely on BOSL exceptions should say that they do. fixes #576 Signed-off-by: Daira Hopwood --- README.md | 8 +++++++ components/zcash_note_encryption/README.md | 7 ++++++ zcash_client_backend/README.md | 7 ++++++ zcash_client_sqlite/README.md | 7 ++++++ zcash_extensions/README.md | 27 ++++++++++++++++++++++ zcash_primitives/README.md | 7 ++++++ zcash_proofs/README.md | 7 ++++++ 7 files changed, 70 insertions(+) create mode 100644 zcash_extensions/README.md diff --git a/README.md b/README.md index 3df799fe0..fcf6d6027 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,14 @@ All code in this workspace is licensed under either of at your option. +Downstream code forks should note that some (but not all) of these crates +and components depend on the 'orchard' crate, which is licensed under the +[Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). +An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is +provided that makes this a "permissive" license when used in Zcash or some +of its chain forks. See the `README.md` files in subdirectories for which +crates and components this applies to. + ### Contribution Unless you explicitly state otherwise, any contribution intentionally diff --git a/components/zcash_note_encryption/README.md b/components/zcash_note_encryption/README.md index 612b7a64f..faf09dbef 100644 --- a/components/zcash_note_encryption/README.md +++ b/components/zcash_note_encryption/README.md @@ -22,6 +22,13 @@ Licensed under either of at your option. +Downstream code forks should note that 'zcash_note_encryption' depends on the +'orchard' crate, which is licensed under the +[Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). +An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is +provided that makes this a "permissive" license when used in Zcash or some +of its chain forks. + ### Contribution Unless you explicitly state otherwise, any contribution intentionally diff --git a/zcash_client_backend/README.md b/zcash_client_backend/README.md index af9a7ff87..99357672d 100644 --- a/zcash_client_backend/README.md +++ b/zcash_client_backend/README.md @@ -13,6 +13,13 @@ Licensed under either of at your option. +Downstream code forks should note that 'zcash_client_backend' depends on the +'orchard' crate, which is licensed under the +[Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). +An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is +provided that makes this a "permissive" license when used in Zcash or some +of its chain forks. + ### Contribution Unless you explicitly state otherwise, any contribution intentionally diff --git a/zcash_client_sqlite/README.md b/zcash_client_sqlite/README.md index af077e8d5..db7335655 100644 --- a/zcash_client_sqlite/README.md +++ b/zcash_client_sqlite/README.md @@ -24,6 +24,13 @@ Licensed under either of at your option. +Downstream code forks should note that 'zcash_client_sqlite' depends on the +'orchard' crate, which is licensed under the +[Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). +An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is +provided that makes this a "permissive" license when used in Zcash or some +of its chain forks. + ### Contribution Unless you explicitly state otherwise, any contribution intentionally diff --git a/zcash_extensions/README.md b/zcash_extensions/README.md new file mode 100644 index 000000000..4786d5568 --- /dev/null +++ b/zcash_extensions/README.md @@ -0,0 +1,27 @@ +# zcash_extensions + +This library contains Rust code to support [Transparent Zcash Extensions](https://zips.z.cash/zip-0222). + +## License + +Licensed under either of + + * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or + http://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +at your option. + +Downstream code forks should note that 'zcash_extensions' depends on the +'orchard' crate, which is licensed under the +[Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). +An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is +provided that makes this a "permissive" license when used in Zcash or some +of its chain forks. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally +submitted for inclusion in the work by you, as defined in the Apache-2.0 +license, shall be dual licensed as above, without any additional terms or +conditions. diff --git a/zcash_primitives/README.md b/zcash_primitives/README.md index 02a0c33a1..c7560c841 100644 --- a/zcash_primitives/README.md +++ b/zcash_primitives/README.md @@ -12,6 +12,13 @@ Licensed under either of at your option. +Downstream code forks should note that 'zcash_primitives' depends on the +'orchard' crate, which is licensed under the +[Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). +An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is +provided that makes this a "permissive" license when used in Zcash or some +of its chain forks. + ### Contribution Unless you explicitly state otherwise, any contribution intentionally diff --git a/zcash_proofs/README.md b/zcash_proofs/README.md index f365c5a38..eefd15199 100644 --- a/zcash_proofs/README.md +++ b/zcash_proofs/README.md @@ -13,6 +13,13 @@ Licensed under either of at your option. +Downstream code forks should note that 'zcash_proofs' depends on the +'orchard' crate, which is licensed under the +[Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). +An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is +provided that makes this a "permissive" license when used in Zcash or some +of its chain forks. + ### Contribution Unless you explicitly state otherwise, any contribution intentionally From a9aa2929d282d84ff4a2182d88cf69cd48e79060 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 28 Jun 2022 16:46:13 +0100 Subject: [PATCH 2/2] Address feedback about the use of "permissive". Signed-off-by: Daira Hopwood --- README.md | 11 +++++++---- components/zcash_note_encryption/README.md | 9 ++++++--- zcash_client_backend/README.md | 9 ++++++--- zcash_client_sqlite/README.md | 9 ++++++--- zcash_extensions/README.md | 9 ++++++--- zcash_primitives/README.md | 9 ++++++--- zcash_proofs/README.md | 9 ++++++--- 7 files changed, 43 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index fcf6d6027..c10053bd8 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,13 @@ at your option. Downstream code forks should note that some (but not all) of these crates and components depend on the 'orchard' crate, which is licensed under the [Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). -An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is -provided that makes this a "permissive" license when used in Zcash or some -of its chain forks. See the `README.md` files in subdirectories for which -crates and components this applies to. +A license exception is provided allowing some derived works that are linked or +combined with the 'orchard' crate to be copied or distributed under the original +licenses (in this case MIT / Apache 2.0), provided that the included portions of +the 'orchard' code remain subject to BOSL. +See for details of which +derived works can make use of this exception, and the `README.md` files in +subdirectories for which crates and components this applies to. ### Contribution diff --git a/components/zcash_note_encryption/README.md b/components/zcash_note_encryption/README.md index faf09dbef..ffa132516 100644 --- a/components/zcash_note_encryption/README.md +++ b/components/zcash_note_encryption/README.md @@ -25,9 +25,12 @@ at your option. Downstream code forks should note that 'zcash_note_encryption' depends on the 'orchard' crate, which is licensed under the [Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). -An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is -provided that makes this a "permissive" license when used in Zcash or some -of its chain forks. +A license exception is provided allowing some derived works that are linked or +combined with the 'orchard' crate to be copied or distributed under the original +licenses (in this case MIT / Apache 2.0), provided that the included portions of +the 'orchard' code remain subject to BOSL. +See https://github.com/zcash/orchard/blob/main/COPYING for details of which +derived works can make use of this exception. ### Contribution diff --git a/zcash_client_backend/README.md b/zcash_client_backend/README.md index 99357672d..eb8a6cd61 100644 --- a/zcash_client_backend/README.md +++ b/zcash_client_backend/README.md @@ -16,9 +16,12 @@ at your option. Downstream code forks should note that 'zcash_client_backend' depends on the 'orchard' crate, which is licensed under the [Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). -An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is -provided that makes this a "permissive" license when used in Zcash or some -of its chain forks. +A license exception is provided allowing some derived works that are linked or +combined with the 'orchard' crate to be copied or distributed under the original +licenses (in this case MIT / Apache 2.0), provided that the included portions of +the 'orchard' code remain subject to BOSL. +See https://github.com/zcash/orchard/blob/main/COPYING for details of which +derived works can make use of this exception. ### Contribution diff --git a/zcash_client_sqlite/README.md b/zcash_client_sqlite/README.md index db7335655..fb71ab098 100644 --- a/zcash_client_sqlite/README.md +++ b/zcash_client_sqlite/README.md @@ -27,9 +27,12 @@ at your option. Downstream code forks should note that 'zcash_client_sqlite' depends on the 'orchard' crate, which is licensed under the [Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). -An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is -provided that makes this a "permissive" license when used in Zcash or some -of its chain forks. +A license exception is provided allowing some derived works that are linked or +combined with the 'orchard' crate to be copied or distributed under the original +licenses (in this case MIT / Apache 2.0), provided that the included portions of +the 'orchard' code remain subject to BOSL. +See https://github.com/zcash/orchard/blob/main/COPYING for details of which +derived works can make use of this exception. ### Contribution diff --git a/zcash_extensions/README.md b/zcash_extensions/README.md index 4786d5568..0b38603ca 100644 --- a/zcash_extensions/README.md +++ b/zcash_extensions/README.md @@ -15,9 +15,12 @@ at your option. Downstream code forks should note that 'zcash_extensions' depends on the 'orchard' crate, which is licensed under the [Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). -An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is -provided that makes this a "permissive" license when used in Zcash or some -of its chain forks. +A license exception is provided allowing some derived works that are linked or +combined with the 'orchard' crate to be copied or distributed under the original +licenses (in this case MIT / Apache 2.0), provided that the included portions of +the 'orchard' code remain subject to BOSL. +See https://github.com/zcash/orchard/blob/main/COPYING for details of which +derived works can make use of this exception. ### Contribution diff --git a/zcash_primitives/README.md b/zcash_primitives/README.md index c7560c841..efa356ba3 100644 --- a/zcash_primitives/README.md +++ b/zcash_primitives/README.md @@ -15,9 +15,12 @@ at your option. Downstream code forks should note that 'zcash_primitives' depends on the 'orchard' crate, which is licensed under the [Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). -An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is -provided that makes this a "permissive" license when used in Zcash or some -of its chain forks. +A license exception is provided allowing some derived works that are linked or +combined with the 'orchard' crate to be copied or distributed under the original +licenses (in this case MIT / Apache 2.0), provided that the included portions of +the 'orchard' code remain subject to BOSL. +See https://github.com/zcash/orchard/blob/main/COPYING for details of which +derived works can make use of this exception. ### Contribution diff --git a/zcash_proofs/README.md b/zcash_proofs/README.md index eefd15199..ccbdcfd73 100644 --- a/zcash_proofs/README.md +++ b/zcash_proofs/README.md @@ -16,9 +16,12 @@ at your option. Downstream code forks should note that 'zcash_proofs' depends on the 'orchard' crate, which is licensed under the [Bootstrap Open Source License](https://github.com/zcash/orchard/blob/main/LICENSE-BOSL). -An [exception](https://github.com/zcash/orchard/blob/main/COPYING) is -provided that makes this a "permissive" license when used in Zcash or some -of its chain forks. +A license exception is provided allowing some derived works that are linked or +combined with the 'orchard' crate to be copied or distributed under the original +licenses (in this case MIT / Apache 2.0), provided that the included portions of +the 'orchard' code remain subject to BOSL. +See https://github.com/zcash/orchard/blob/main/COPYING for details of which +derived works can make use of this exception. ### Contribution