COPYING, CONTRIBUTING.md: Specifically mention the MIT license

This is the license we encourage contributors to use for new code, so
we should certainly have a reference copy of it.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-05-18 14:04:58 +01:00 committed by Ralf Habacker
parent 272928bbbf
commit cd689f3d32
3 changed files with 25 additions and 5 deletions

View file

@ -180,11 +180,15 @@ http://vsftpd.beasts.org/ has other good security suggestions.
### Licensing
Please match the existing licensing (a dual-license: AFL-2.1 or GPL-2+,
recipient's choice). Entirely new modules can be placed under a more
permissive license: to avoid license proliferation, our preferred
permissive license is the variant of the MIT/X11 license used by the
Expat XML library (for example see the top of tools/ci-build.sh).
Please match the existing licensing, which is generally a dual-license:
AFL-2.1 or GPL-2+, recipient's choice (`AFL-2.1 OR GPL-2.0-or-later`
in SPDX notation).
Entirely new modules can be placed under a more permissive license:
to avoid license proliferation, our preferred permissive license is
the variant of the MIT/X11 license used by the Expat XML library (`MIT`
in SPDX notation), which can be found in LICENSES/MIT.txt. For example,
tools/ci-build.sh is under this license.
### Build systems

View file

@ -4,6 +4,13 @@ License version 2.1, or the GNU General Public License version 2
The full text of these licenses can be found in LICENSES/AFL-2.1.txt
and LICENSES/GPL-2-or-later.txt.
Some source files are under more permissive BSD-/MIT-style licenses
that are compatible with the AFL and GPL.
When contributing new code, our preferred license for new code is the
version of the MIT/X11 license used by the Expat library, referred to
as "MIT" by SPDX, which can be found in LICENSES/MIT.txt.
Some of the standalone binaries are under the GPL only; in particular,
but not limited to, tools/dbus-cleanup-sockets.c and test/decode-gcov.c.

9
LICENSES/MIT.txt Normal file
View file

@ -0,0 +1,9 @@
MIT License
Copyright (c) <year> <copyright holders>
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.