From 69348458a830f4808f7c8513c9a98ae3cf23849c Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 29 Jun 2021 13:29:31 +0200 Subject: [PATCH 1/5] Adopt the MIT licence for future contributions - Add LICENCE.MIT for all contributions from July 2021 onward - Explain the licencing situation - Start a list of people who agree to relicence their past contributions to MIT Addresses: https://github.com/python-ldap/python-ldap/issues/233 --- LICENCE.MIT | 30 ++++++++++++++++++++++++++++++ README | 24 ++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 LICENCE.MIT diff --git a/LICENCE.MIT b/LICENCE.MIT new file mode 100644 index 00000000..cf0c53a6 --- /dev/null +++ b/LICENCE.MIT @@ -0,0 +1,30 @@ +The MIT License applies to contributions committed after July 1st, 2021, and +to all contributions by the following authors: + +* Petr Viktorin +* Christian Heimes + + +------------------------------------------------------------------------------- + +MIT License + +Copyright (c) 2021 python-ldap contributors + +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 +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +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. diff --git a/README b/README index 81db9bb3..d7254e4b 100644 --- a/README +++ b/README @@ -127,3 +127,27 @@ their contributions and input into this package. Thanks! We may have missed someone: please mail us if we have omitted your name. + +Licence +======= + +The python-ldap project comes with a LICENCE file. + +We aware that its text is unclear, but it cannot be changed: +all authors of python-ldap would need to approve the licence change, +but a complete list of all the authors is not available. +(Note that the Git repository of the project is incomplete. +Furthermore, commits imported from CVS lack authorship information; users +"stroeder" or "leonard" are commiters (reviewers), but sometimes not +authors of the committed code.) + +The current maintainers assume that the license is the sentence that refers +to "Python-style license" and assume this means a highly permissive open source +license that only requires preservation of the text of the LICENCE file +(including the disclaimer paragraph). + +------------------------------------------------------------------------------- + +All contributions committed since July 1st, 2021, as well as some past +contributions, are licensed under the MIT license. +The MIT licence and more details are listed in the file LICENCE.MIT. From 804ae52da6116356b3f8b66c929a683d900b057e Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 29 Jun 2021 14:31:35 +0200 Subject: [PATCH 2/5] Add first batch of names From: https://github.com/python-ldap/python-ldap/pull/417#issuecomment-870532080 --- LICENCE.MIT | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/LICENCE.MIT b/LICENCE.MIT index cf0c53a6..22406df3 100644 --- a/LICENCE.MIT +++ b/LICENCE.MIT @@ -1,8 +1,15 @@ The MIT License applies to contributions committed after July 1st, 2021, and to all contributions by the following authors: +* Eyal Cherevatzki +* Ivan A. Melnikov +* johnthagen +* Jonathon Reinhart * Petr Viktorin -* Christian Heimes +* Pieterjan De Potter +* Raphaël Barrois +* Robert Kuska +* Tom van Dijk ------------------------------------------------------------------------------- From 26301f220c3c25c86099a7b46c93f694f0fc8266 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 29 Jun 2021 14:50:00 +0200 Subject: [PATCH 3/5] Fix typo --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index d7254e4b..8045555d 100644 --- a/README +++ b/README @@ -133,7 +133,7 @@ Licence The python-ldap project comes with a LICENCE file. -We aware that its text is unclear, but it cannot be changed: +We are aware that its text is unclear, but it cannot be changed: all authors of python-ldap would need to approve the licence change, but a complete list of all the authors is not available. (Note that the Git repository of the project is incomplete. From dd007ae0ac246a93c7b1f3b0722c49d96acb5100 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 29 Jun 2021 15:43:15 +0200 Subject: [PATCH 4/5] Add another batch of names --- LICENCE.MIT | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LICENCE.MIT b/LICENCE.MIT index 22406df3..689a115e 100644 --- a/LICENCE.MIT +++ b/LICENCE.MIT @@ -5,10 +5,13 @@ to all contributions by the following authors: * Ivan A. Melnikov * johnthagen * Jonathon Reinhart +* Jon Dufresne +* Miro Hrončok * Petr Viktorin * Pieterjan De Potter * Raphaël Barrois * Robert Kuska +* Tobias Bräutigam * Tom van Dijk From 5393e9baa97fe5dcf136b932a778775ed52f09b3 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 1 Jul 2021 13:58:42 +0200 Subject: [PATCH 5/5] Add another batch of names --- LICENCE.MIT | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/LICENCE.MIT b/LICENCE.MIT index 689a115e..c78bcb9b 100644 --- a/LICENCE.MIT +++ b/LICENCE.MIT @@ -1,18 +1,29 @@ The MIT License applies to contributions committed after July 1st, 2021, and to all contributions by the following authors: +* ​A. Karl Kornel +* Alex Willmer +* Aymeric Augustin +* Bernhard M. Wiedemann +* Bradley Baetz +* Éloi Rivard * Eyal Cherevatzki +* Fred Thomsen * Ivan A. Melnikov * johnthagen * Jonathon Reinhart * Jon Dufresne +* Martin Basti +* Marti Raudsepp * Miro Hrončok * Petr Viktorin * Pieterjan De Potter * Raphaël Barrois * Robert Kuska +* Stanislav Láznička * Tobias Bräutigam * Tom van Dijk +* William Brown -------------------------------------------------------------------------------