Skip to content

Commit

Permalink
feat(license): change license to Apache-2.0
Browse files Browse the repository at this point in the history
BREAKING CHANGE: This is a significant licensing change. Please review.
  • Loading branch information
zkat committed Sep 16, 2021
1 parent 27a270b commit dad568f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 156 deletions.
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@ version = "6.0.0"
authors = ["Kat Marchán <kzm@zkat.tech>"]
edition = "2018"
description = "Various utilities for handling Subresource Integrity."
license-file = "LICENSE.md"
license = "Apache-2.0"
repository = "https://github.com/zkat/ssri-rs"
homepage = "https://github.com/zkat/ssri-rs"
readme = "README.md"

[badges]
maintenance = { status = "actively-developed" }

[dependencies]
sha2 = "0.8.0"
base64 = "0.10.1"
Expand Down
13 changes: 0 additions & 13 deletions LICENSE-APACHE.md

This file was deleted.

67 changes: 0 additions & 67 deletions LICENSE-PARITY.md

This file was deleted.

63 changes: 0 additions & 63 deletions LICENSE-PATRON.md

This file was deleted.

14 changes: 10 additions & 4 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
Copyright 2019 Kat Marchán and Contributors
Copyright 2019 Cacache Contributors

This project is licensed under [the Parity License](LICENSE-PARITY.md). Third-party contributions are licensed under [Apache-2.0](LICENSE-APACHE.md) and belong to their respective authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

The Parity License is a copyleft license that, unlike the GPL family, allows you to license derivative and connected works under permissive licenses like MIT or Apache-2.0. It's free to use provided the work you do is freely available!
http://www.apache.org/licenses/LICENSE-2.0

For proprietary use, please [contact me](mailto:kzm@zkat.tech?subject=ssri%20license), or just [sponsor me on GitHub](https://github.com/users/zkat/sponsorship) under the appropriate tier to [acquire a proprietary-use license](LICENSE-PATRON.md)! This funding model helps me make my work sustainable and compensates me for the work it took to write this crate!
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,4 @@ Happy hacking!

## License

This project is licensed under [the Parity License](LICENSE.md). Third-party contributions are licensed under Apache-2.0 and belong to their respective authors.

The Parity License is a copyleft license that, unlike the GPL family, allows you to license derivative and connected works under permissive licenses like MIT or Apache-2.0. It's free to use provided the work you do is freely available!

For proprietary use, please [contact me](mailto:kzm@zkat.tech?subject=ssri%20license), or just [sponsor me on GitHub](https://github.com/users/zkat/sponsorship) under the appropriate tier to [acquire a proprietary-use license](LICENSE-PATRON.md)! This funding model helps me make my work sustainable and compensates me for the work it took to write this crate!
This project is licensed under [the Apache-2.0 License](LICENSE.md).

0 comments on commit dad568f

Please sign in to comment.