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>

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d141fb8b256d86a0a19d0b55084154c8ee15531a..96413c0b2472cd4001f7c06037026a41ea13ac7c 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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
 

diff --git a/COPYING b/COPYING
index 9ee5d0febab43278bfc22994df99ea1032fcd24c..d5fb92693e9ddaa1322383b6a9818c6c565095f2 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -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.
 

diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt
new file mode 100644 (file)
index 0000000..2071b23
--- /dev/null
+++ b/LICENSES/MIT.txt
@@ -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.