From d2d7783f2469bcd8e8f818970556f4291ce9b1bd Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sat, 29 Sep 2018 10:19:15 +0200 Subject: [PATCH 1/2] Add App Store exception, credit Signal --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 293686b..fcd49be 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,17 @@ For more details please see [CONTRIBUTING][contrib-readme]. ## License -This project is licensed under the [GPLv3 license][license-gpl3], which can be found [here][license-content]. I can provide a different license on request, e.g. if you want to use the library on the App Store. Feel free to contact me in such case. +### Part I + +Copyright 2018-present Davide De Rosa + +This project is licensed under the [GPLv3 license][license-gpl3], which can be found [here][license-content]. + +### Part II + +As seen in [libsignal-protocol-c][license-signal]: + +> Additional Permissions For Submission to Apple App Store: Provided that you are otherwise in compliance with the GPLv3 for each covered work you convey (including without limitation making the Corresponding Source available in compliance with Section 6 of the GPLv3), the Author also grants you the additional permission to convey through the Apple App Store non-source executable versions of the Program as incorporated into each applicable covered work as Executable Versions only under the Mozilla Public License version 2.0 (https://www.mozilla.org/en-US/MPL/2.0/). ## Credits @@ -159,6 +169,7 @@ Bitcoin address: [16w2AWamiH2SS68NYSMDcrbh5MnZ1c5eju][me-btc] [license-content]: /LICENSE [license-gpl3]: https://choosealicense.com/licenses/gpl-3.0/ +[license-signal]: https://github.com/signalapp/libsignal-protocol-c#license [license-mit]: https://choosealicense.com/licenses/mit/ [contrib-cla]: /CLA.rst From 5d868b9e590ba5d8c33c5a383a168e6e120b4be1 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sat, 29 Sep 2018 10:21:47 +0200 Subject: [PATCH 2/2] Rearrange credits/acknowledgements --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fcd49be..c5aa267 100644 --- a/README.md +++ b/README.md @@ -137,10 +137,10 @@ As seen in [libsignal-protocol-c][license-signal]: > Additional Permissions For Submission to Apple App Store: Provided that you are otherwise in compliance with the GPLv3 for each covered work you convey (including without limitation making the Corresponding Source available in compliance with Section 6 of the GPLv3), the Author also grants you the additional permission to convey through the Apple App Store non-source executable versions of the Program as incorporated into each applicable covered work as Executable Versions only under the Mozilla Public License version 2.0 (https://www.mozilla.org/en-US/MPL/2.0/). -## Credits +## Acknowledgements -- [PIATunnel][dep-piatunnel-repo] - TunnelKit is a hard fork of PIATunnel that repurposes it substantially. PIATunnel is licensed under the [MIT (Expat) license][license-mit], which can be found [here][dep-piatunnel-license]. -- [SwiftyBeaver][dep-swiftybeaver-repo] - A convenient logging library. +- [PIATunnel][dep-piatunnel-repo] - Copyright (c) 2018-Present Private Internet Access +- [SwiftyBeaver][dep-swiftybeaver-repo] - Copyright (c) 2015 Sebastian Kreutzberger This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. ([https://www.openssl.org/][dep-openssl])