From fb82797752a66b6aa9657528a3282bc9d2a2caa1 Mon Sep 17 00:00:00 2001 From: ay2306 Date: Thu, 21 Nov 2019 17:18:02 +0530 Subject: [PATCH 1/3] License update to dual MIT and Apache 2 --- COPYRIGHT | 5 +++++ LICENSE-APACHE | 5 +++++ LICENSE => LICENSE-MIT | 4 +--- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 COPYRIGHT create mode 100644 LICENSE-APACHE rename LICENSE => LICENSE-MIT (95%) diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000000..026076c44b --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,5 @@ +This project is transitioning from an MIT-only license to a dual MIT/Apache-2.0 license. +Unless otherwise noted, all code contributed prior to 2019-11-21 and not contributed by +a user listed in [this signoff issue](https://github.com/ipfs/js-ipfs/issues/2552) is +licensed under MIT-only. All new contributions (and past contributions since 2019-11-21) +are licensed under a dual MIT/Apache-2.0 license. \ No newline at end of file diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 0000000000..14478a3b60 --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,5 @@ +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 + +http://www.apache.org/licenses/LICENSE-2.0 + +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. diff --git a/LICENSE b/LICENSE-MIT similarity index 95% rename from LICENSE rename to LICENSE-MIT index c7386b3c94..749aa1ecd9 100644 --- a/LICENSE +++ b/LICENSE-MIT @@ -1,7 +1,5 @@ The MIT License (MIT) -Copyright (c) 2014 Juan Batiz-Benet - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights @@ -18,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +THE SOFTWARE. \ No newline at end of file From 9d72b5b9eaa767179ec61ec9ae1d4a0d02424072 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 22 Nov 2019 16:19:07 +0000 Subject: [PATCH 2/3] docs: correct signoff issue link --- COPYRIGHT | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 026076c44b..e085a877e2 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ This project is transitioning from an MIT-only license to a dual MIT/Apache-2.0 license. Unless otherwise noted, all code contributed prior to 2019-11-21 and not contributed by -a user listed in [this signoff issue](https://github.com/ipfs/js-ipfs/issues/2552) is +a user listed in [this signoff issue](https://github.com/ipfs/js-ipfs/issues/2624) is licensed under MIT-only. All new contributions (and past contributions since 2019-11-21) -are licensed under a dual MIT/Apache-2.0 license. \ No newline at end of file +are licensed under a dual MIT/Apache-2.0 license. From ad1ccfadb2e2436f1ea7cf3e195c4a86d15337ab Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 22 Nov 2019 16:26:20 +0000 Subject: [PATCH 3/3] docs: update license in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 18a7f1be85..41bd3565b3 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ ], "homepage": "https://js.ipfs.io", "bugs": "https://github.com/ipfs/js-ipfs/issues", - "license": "MIT", + "license": "(Apache-2.0 OR MIT)", "leadMaintainer": "Alan Shaw ", "files": [ "src",