From 478783d84bdd6993e719904f2be8770ae19075da Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Tue, 29 Dec 2020 09:58:45 +0300 Subject: [PATCH] [legal] Replace CLA with DCO This project doesn't use Contributor License Agreement (CLA) anymore. To contribute you must assure that you have read and are following the rules stated in the [Developers Certificate of Origin](docs/DCO.md). To sign-off a patch, just add a line in the commit message saying: Signed-off-by: Some Developer somedev@example.com Git has a flag that can sign a commit for you. An example using it is: git commit -s -m 'An example commit message' Use your real name or on some rare cases a company email address, but we disallow pseudonyms or anonymous contributions. Signed-off-by: Roman Tsisyk --- docs/CLA.md | 83 -------------------------------------------- docs/CONTRIBUTING.md | 19 ++++++++-- docs/DCO.md | 37 ++++++++++++++++++++ 3 files changed, 53 insertions(+), 86 deletions(-) delete mode 100644 docs/CLA.md create mode 100644 docs/DCO.md diff --git a/docs/CLA.md b/docs/CLA.md deleted file mode 100644 index 7b3ec66afd..0000000000 --- a/docs/CLA.md +++ /dev/null @@ -1,83 +0,0 @@ -# Contributor License Agreement - -To participate in MAPS.ME development you need to sign an agreement. -It protects your and our rights to the code. Please read -[this nice article](http://infrequently.org/2008/06/why-do-i-need-to-sign-this/) -for an elaboration on reasons to sign such agreements. - -NOTE: This is only a preview of the individual agreement. -Head to [maps.me/cla](http://maps.me/cla/) to sign the actual form. - -## My.com Individual Contributor License Agreement - -In order to clarify the intellectual property license granted with Contributions from any person -or entity, My.com B.V. ("My.com") must have a Contributor License Agreement ("CLA") on file that has -been signed by each Contributor, indicating agreement to the license terms below. This license is -for your protection as a Contributor as well as the protection of My.com; it does not change your -rights to use your own Contributions for any other purpose. - -You accept and agree to the following terms and conditions for Your present and future Contributions -submitted to My.com. Except for the license granted herein to My.com and recipients of software -distributed by My.com, You reserve all right, title, and interest in and to Your Contributions. - -1. Definitions. - * "You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright -owner that is making this Agreement with My.com. For legal entities, the entity making a Contribution -and all other entities that control, are controlled by, or are under common control with that -entity are considered to be a single Contributor. For the purposes of this definition, "control" -means (i) the power, direct or indirect, to cause the direction or management of such entity, -whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding -shares, or (iii) beneficial ownership of such entity. - * "Contribution" shall mean any original work of authorship, including any modifications or -additions to an existing work, that is intentionally submitted by You to My.com for inclusion in, -or documentation of, any of the products owned or managed by My.com (the "Work"). For the purposes -of this definition, "submitted" means any form of electronic, verbal, or written communication sent -to My.com or its representatives, including but not limited to communication on electronic mailing -lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, -My.com for the purpose of discussing and improving the Work, but excluding communication that is -conspicuously marked or otherwise designated in writing by You as "Not a Contribution." - -2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant -to My.com and to recipients of software distributed by My.com a perpetual, worldwide, non-exclusive, -no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, -publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. - -3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant -to My.com and to recipients of software distributed by My.com a perpetual, worldwide, non-exclusive, -no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, -have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license -applies only to those patent claims licensable by You that are necessarily infringed by Your -Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such -Contribution(s) was submitted. If any entity institutes patent litigation against You or any other -entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or -the Work to which you have contributed, constitutes direct or contributory patent infringement, -then any patent licenses granted to that entity under this Agreement for that Contribution or Work -shall terminate as of the date such litigation is filed. - -4. You represent that you are legally entitled to grant the above license. If your employer(s) has -rights to intellectual property that you create that includes your Contributions, you represent that -you have received permission to make Contributions on behalf of that employer, that your employer -has waived such rights for your Contributions to My.com, or that your employer has executed -a separate Corporate CLA with My.com. - -5. You represent that each of Your Contributions is Your original creation (see section 7 for -submissions on behalf of others). You represent that Your Contribution submissions include complete -details of any third-party license or other restriction (including, but not limited to, related patents -and trademarks) of which you are personally aware and which are associated with any part of Your -Contributions. - -6. You are not expected to provide support for Your Contributions, except to the extent You desire -to provide support. You may provide support for free, for a fee, or not at all. Unless required -by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, -any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR -PURPOSE. - -7. Should You wish to submit work that is not Your original creation, You may submit it to My.com -separately from any Contribution, identifying the complete details of its source and of any license -or other restriction (including, but not limited to, related patents, trademarks, and license agreements) -of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of -a third-party: [named here]". - -8. You agree to notify My.com of any facts or circumstances of which you become aware that would -make these representations inaccurate in any respect. diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index be73d1b96a..75c9b409c1 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -60,12 +60,25 @@ See [CPP_STYLE.md](CPP_STYLE.md). Use `clang-format` when in doubt. ## Pull Requests All contributions to MAPS.ME source code should be submitted via github pull requests. -Each pull request is reviewed by MAPS.ME employees, to ensure consistent code style +Each pull request is reviewed by MAPS.ME maintainers, to ensure consistent code style and quality. Sometimes the review process even for smallest commits can be very thorough. -To contribute you must sign the [license agreement](CLA.md): the same one you -sign for Google or Facebook open-source projects. +To contribute you must assure that you have read and are following the rules +stated in the [Developers Certificate of Origin](DCO.md) (DCO). We have +borrowed this procedure from the Linux kernel project to improve tracking of +who did what, and for legal reasons. + +To sign-off a patch, just add a line in the commit message saying: + + Signed-off-by: Some Developer somedev@example.com + +Git has a flag that can sign a commit for you. An example using it is: + + git commit -s -m 'An example commit message' + +Use your real name or on some rare cases a company email address, but we +disallow pseudonyms or anonymous contributions. ## Directories diff --git a/docs/DCO.md b/docs/DCO.md new file mode 100644 index 0000000000..8201f99215 --- /dev/null +++ b/docs/DCO.md @@ -0,0 +1,37 @@ +Developer Certificate of Origin +Version 1.1 + +Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +1 Letterman Drive +Suite D4700 +San Francisco, CA, 94129 + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + + +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved.