aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-02-18 13:05:35 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-02-18 13:05:35 +0200
commit487cc914baefc9f662e53fd5bc125f4b005270b5 (patch)
tree1a0c96a8a0481469d140fc858539c90de5d6c9f5
parent7a6c8f06befe6f412a525490f25928cc7ca2cd93 (diff)
New LICENSE/AUTHORS arrangement
Note that this removes the "unrelated to the OpenSSL project" notice from the LICENSE file (failed that, it will not be recognized as MIT by repository hosting providers such as GitHub). This notice, however, still prominently appears in the README file.
-rw-r--r--AUTHORS11
-rw-r--r--COPYRIGHT11
-rw-r--r--LICENSE49
-rw-r--r--buildfile2
4 files changed, 31 insertions, 42 deletions
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..91e3340
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,11 @@
+This file contains information about the build2 authors for copyright
+purposes.
+
+Note that the openssl/agent/pkcs11/pkcs11.h file is from OpenSC/libp11 with
+"unlimited permission to copy and/or distribute"; see the file header for
+details on its copyright and licensing terms.
+
+The copyright for the code is held by the contributors of the code. The
+revision history in the version control system is the primary source of
+authorship information for copyright purposes. Contributors that have
+requested to also be noted explicitly in this file are listed below:
diff --git a/COPYRIGHT b/COPYRIGHT
deleted file mode 100644
index eec7815..0000000
--- a/COPYRIGHT
+++ /dev/null
@@ -1,11 +0,0 @@
-Copyright (c) 2014-2020 Code Synthesis Ltd and the build2 contributors.
-
-For the full list of contributors, see the revision history in version control
-system.
-
-The copyright for the code is held by the contributors of the code. The code
-is licensed under permissive open source licensing terms (see the accompanying
-LICENSE file). When you contribute code to this project, you license it under
-these terms. Before contributing please make sure these terms are acceptable
-to you (or the organization that employs you) and that you are the author of
-the code being contributed.
diff --git a/LICENSE b/LICENSE
index 6a9d27d..2cf3738 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,32 +1,21 @@
-Note that this project is not affiliated with OpenSSL. OpenSSL is a registered
-trademark owned by the OpenSSL Software Foundation used with permission.
-
-openssl/agent/pkcs11/pkcs11.h:
-
-From OpenSC/libp11 with "unlimited permission to copy and/or distribute",
-see the file header for details.
-
-The rest:
-
MIT License
-See the accompanying COPYRIGHT file for the copyright information.
-
-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.
+Copyright (c) 2014-2020 the build2 authors (see the AUTHORS file).
+
+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/buildfile b/buildfile
index 15a6039..d4dc7af 100644
--- a/buildfile
+++ b/buildfile
@@ -1,7 +1,7 @@
# file : buildfile
# license : MIT; see accompanying LICENSE file
-./: {*/ -build/} doc{INSTALL LICENSE COPYRIGHT NEWS README} manifest
+./: {*/ -build/} doc{INSTALL LICENSE AUTHORS NEWS README} manifest
# Don't install tests or the INSTALL file.
#