Skip to content

Commit

Permalink
Merge pull request #428 from tox-rs/gpl
Browse files Browse the repository at this point in the history
Drop MIT license
  • Loading branch information
kpp committed Jun 22, 2020
2 parents 84136e2 + e446cbc commit 4d0b1e6
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 37 deletions.
13 changes: 13 additions & 0 deletions COPYING.iOS
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
The tox-rs developers are aware that the terms of service that apply
to apps distributed via Apple's App Store services may conflict with
rights granted under the tox-rs license, the GNU General Public
License, version 3 or (at your option) any later version. The
copyright holders of the tox-rs do not wish this conflict to prevent
the otherwise-compliant distribution of derived apps via the App
Store. Therefore, we have committed not to pursue any license
violation that results solely from the conflict between the GNU GPLv3
or any later version and the Apple App Store terms of service. In
other words, as long as you comply with the GPL in all other respects,
including its requirements to provide users with source code and the
text of the license, we will not object to your distribution of the
tox-rs through the App Store.
File renamed without changes.
28 changes: 0 additions & 28 deletions LICENSE-MIT

This file was deleted.

5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,7 @@ tox-rs has contributions from many users. See [AUTHORS.md](/AUTHORS.md). Thanks

## License

Dual licensed under the MIT or GPLv3+ licenses. You may use this project under the
terms of either the MIT License or the GNU General Public License (GPL) Version 3+.

For details, see [LICENSE-MIT](/LICENSE-MIT) and [LICENSE-GPL](/LICENSE-GPL).
Licensed under [GPLv3+](/LICENSE) with [Apple app store exception](/COPYING.iOS).

[Reference source repository]: https://github.com/zetok/tox-spec
[Rust]: https://www.rust-lang.org/
Expand Down
2 changes: 1 addition & 1 deletion tox/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ documentation = "https://docs.rs/tox/"
repository = "https://github.com/tox-rs/tox/"
keywords = ["p2p", "instant-messaging", "tox", "toxcore", "networking"]
categories = ["multimedia"]
license = "MIT OR GPL-3.0+"
license = "GPL-3.0+"
edition = "2018"

[badges]
Expand Down
2 changes: 1 addition & 1 deletion tox_binary_io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ authors = [
]
documentation = "https://docs.rs/tox_binary_io/"
repository = "https://github.com/tox-rs/tox/"
license = "MIT OR GPL-3.0+"
license = "GPL-3.0+"
edition = "2018"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion tox_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ documentation = "https://docs.rs/tox_core/"
repository = "https://github.com/tox-rs/tox/"
keywords = ["p2p", "instant-messaging", "tox", "toxcore", "networking"]
categories = ["multimedia"]
license = "MIT OR GPL-3.0+"
license = "GPL-3.0+"
edition = "2018"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion tox_encryptsave/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ documentation = "https://docs.rs/tox_encryptsave/"
repository = "https://github.com/tox-rs/tox/"
keywords = ["p2p", "instant-messaging", "tox", "toxcore", "networking"]
categories = ["multimedia"]
license = "MIT OR GPL-3.0+"
license = "GPL-3.0+"
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion tox_packet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ documentation = "https://docs.rs/tox_packet/"
repository = "https://github.com/tox-rs/tox/"
keywords = ["p2p", "instant-messaging", "tox", "toxcore", "networking"]
categories = ["multimedia"]
license = "MIT OR GPL-3.0+"
license = "GPL-3.0+"
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down

0 comments on commit 4d0b1e6

Please sign in to comment.