From 6bd310decf5ddb5c39e03dc91362726af38ecae9 Mon Sep 17 00:00:00 2001 From: MollyM Date: Mon, 6 May 2019 10:56:15 -0700 Subject: [PATCH 1/6] License update to dual MIT and Apache 2 This series of commits aims to update go-ipfs to follow a dual-licensing best practice based on research into open-source licensing by @ianjdarrow. He recommends a dual MIT and Apache 2.0 license - > This has two major benefits: > - There are concerns in the open source community about whether the MIT license leaves users vulnerable to patent infringement claims. We think the pure legal risk is small, but the way the open source community interacts with our project is really important. It makes sense to pick the license that makes the largest number of people comfortable. - There's now no reason to adopt a separate DCO, since the Apache-2 license grant addresses the same issue. > Why use a dual license, instead of just Apache-2? The Apache-2 license is incompatible with the GPLv2 license, which includes things like the Linux kernel. With a dual license, GPLv2 projects can just use the MIT license instead. Our goal is to make our software available to as many projects as possible, so we'd rather adopt a licensing scheme that doesn't exclude anyone. In addition to these commits, we also need to get an explicit OK from current and past contributors to give their consent to relicensing - which will happen in an issue thread. --- LICENSE => LICENSE-MIT | 2 -- 1 file changed, 2 deletions(-) rename LICENSE => LICENSE-MIT (96%) diff --git a/LICENSE b/LICENSE-MIT similarity index 96% rename from LICENSE rename to LICENSE-MIT index 833dabb85ef..72dc60d84b6 100644 --- a/LICENSE +++ b/LICENSE-MIT @@ -1,7 +1,5 @@ The MIT License (MIT) -Copyright (c) 2014-2016 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 From 4941b499d9afc74f7270a7376f1f4bd78ddfd0ee Mon Sep 17 00:00:00 2001 From: MollyM Date: Mon, 6 May 2019 10:58:33 -0700 Subject: [PATCH 2/6] Create COPYRIGHT --- COPYRIGHT | 1 + 1 file changed, 1 insertion(+) create mode 100644 COPYRIGHT diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 00000000000..39e6a3b42a1 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1 @@ +This library is dual-licensed under Apache 2.0 and MIT terms. From c1b700304222395b3b8de82afa74e4f0af443c83 Mon Sep 17 00:00:00 2001 From: MollyM Date: Mon, 6 May 2019 11:01:16 -0700 Subject: [PATCH 3/6] Create LICENSE-APACHE --- LICENSE-APACHE | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 LICENSE-APACHE diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 00000000000..14478a3b60f --- /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. From 407a3752b6af775ad13fa084b4c4c7cc8ed87e07 Mon Sep 17 00:00:00 2001 From: MollyM Date: Mon, 6 May 2019 12:06:08 -0700 Subject: [PATCH 4/6] add transitional comments described here: https://github.com/ipfs/team-mgmt/issues/849 --- LICENSE | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000000..969711093f0 --- /dev/null +++ b/LICENSE @@ -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-05-06 and not contributed by +a user listed in [this signoff issue](https://github.com/ipfs/go-ipfs/issues/6302) is +licensed under MIT-only. All new contributions (and past contributions since 2019-05-06) +are licensed under a dual MIT/Apache-2.0 license. From 52aa24d08564abf0d6e72e0e3dea035efd4023c9 Mon Sep 17 00:00:00 2001 From: MollyM Date: Mon, 6 May 2019 12:11:07 -0700 Subject: [PATCH 5/6] Delete LICENSE moving to copyright file --- LICENSE | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 969711093f0..00000000000 --- a/LICENSE +++ /dev/null @@ -1,5 +0,0 @@ -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-05-06 and not contributed by -a user listed in [this signoff issue](https://github.com/ipfs/go-ipfs/issues/6302) is -licensed under MIT-only. All new contributions (and past contributions since 2019-05-06) -are licensed under a dual MIT/Apache-2.0 license. From e421447208b708c2c5277e3d59b635a7519e0b99 Mon Sep 17 00:00:00 2001 From: MollyM Date: Mon, 6 May 2019 12:11:27 -0700 Subject: [PATCH 6/6] Update COPYRIGHT transitional comments --- COPYRIGHT | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/COPYRIGHT b/COPYRIGHT index 39e6a3b42a1..969711093f0 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1 +1,5 @@ -This library is dual-licensed under Apache 2.0 and MIT terms. +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-05-06 and not contributed by +a user listed in [this signoff issue](https://github.com/ipfs/go-ipfs/issues/6302) is +licensed under MIT-only. All new contributions (and past contributions since 2019-05-06) +are licensed under a dual MIT/Apache-2.0 license.