summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2016-09-23 03:37:57 (GMT)
committerKaz Kylheku <kaz@kylheku.com>2016-09-23 03:37:57 (GMT)
commite9db3a4cf7a6a292e74a8d77868eb356107591ca (patch)
treec1a3772cbc15bf7438f3e69fde9b24f832de4e28
parentdf256d21a107b9bc30f571e0b7220186ff999e62 (diff)
downloadtxr-e9db3a4cf7a6a292e74a8d77868eb356107591ca.zip
txr-e9db3a4cf7a6a292e74a8d77868eb356107591ca.tar.gz
txr-e9db3a4cf7a6a292e74a8d77868eb356107591ca.tar.bz2
Going back to unmodified 2-Clause BSD License.
* LICENSE: Reverted to Two-Clause BSD license. The copyright of the Linenoise library are included, because it uses exactly the same license. A note is added about MPI being in the public domain. * LICENSE-CYG: Revised text to clarify the situation that Cygnal is only bundled with a particular Windows build of TXR. * METALICENSE: Revised text. All references to modifications to the BSD license are removed. Gives pointers to the MPI and linenoise license files. Notes that linenoise is under the Two-Clause BSD also. Makes a note about Cygnal and points to LICENSE-CYG. * inst.nsi: Remove the text which tells the user that use of the program requires agreement with the license; refer only to redistribution. The "Agree" buttons are renamed "Acknowledge". * mpi/make-logtab, mpi/mpi.c, mpi/mpi.h, mpi/mplogic.c, mpi/mplogic.h: Remove copyright notices and "all rights reserved", since the author had placed this into the public domain, as made explicit in the README file.
-rw-r--r--LICENSE53
-rw-r--r--LICENSE-CYG12
-rw-r--r--METALICENSE58
-rw-r--r--inst.nsi4
-rwxr-xr-xmpi/make-logtab3
-rw-r--r--mpi/mpi.c3
-rw-r--r--mpi/mpi.h3
-rw-r--r--mpi/mplogic.c3
-rw-r--r--mpi/mplogic.h3
9 files changed, 67 insertions, 75 deletions
diff --git a/LICENSE b/LICENSE
index 280c83c..cb4c695 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,29 +1,36 @@
-TXR is copyright (C) 2009-2016, Kaz Kylheku.
-The MPI library is copyright (C) 2002 Michael J. Fromberger.
-The Linenoise library is copyright (C) 2010-2015 Salvatore Sanfilippo
- and copyright (C) 2010-2013 Peter Noordhuis.
+The license below covers all of the code comprising the TXR program.
+For more information, see the METALICENSE file.
-All rights reserved.
+TXR:
+ Copyright (C) 2009-2016, Kaz Kylheku.
+ All rights reserved.
-Please see the document METALICENSE for notes about this license.
+Linenoise:
+ Copyright (c) 2010-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ Copyright (c) 2010-2013, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ All rights reserved.
-Redistribution of this software in source and binary forms, with or without
-modification, is permitted provided that the following two conditions are met.
+MPI:
+ Written Michael Fromberger 1998-2006; assigned into the public
+ domain in, or prior to 2002.
-Use of this software in any manner constitutes agreement with the disclaimer
-which follows the two conditions.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-DAMAGES, HOWEVER CAUSED, AND UNDER ANY THEORY OF LIABILITY, ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSE-CYG b/LICENSE-CYG
index edcf5cc..b52dc1f 100644
--- a/LICENSE-CYG
+++ b/LICENSE-CYG
@@ -1,6 +1,10 @@
-This build of TXR is linked against the Cygnal library, which is a patched
-derivative of the Cygwin library. It is also linked against a redistibutable
-GCC runtime.
+This special build of TXR for Microsoft Windows is linked against the Cygnal
+library which is distributed inside the installer and installed together
+with TXR. Cygnal is a patched derivative of the Cygwin library. This
+build of TXR is is also linked against a redistributable GCC runtime which
+comes from Cygwin. Neither Cygnal nor the GCC redistributable run-time are a
+component of TXR; the TXR source code base contains no portion of these
+libraries, and other ports of TXR to other platforms do not use them.
Cygwin is Copyright (C) 1995-2016 Red Hat Inc. and the Cygnal version
is distributed and used with TXR in accordance with the Lesser GNU Public
@@ -9,4 +13,4 @@ License (LGPL), Version 3 <https://cygwin.com/COPYING.LIB>.
The Cygnal project is hosted at <http://www.kylheku.com/cygnal>.
The redistributable GCC runtime is also under the Lesser GNU Public License,
-and is Copryight (C) 2016 The Free Software Foundation, Inc.
+and is Copyright (C) 2016 The Free Software Foundation, Inc.
diff --git a/METALICENSE b/METALICENSE
index 493a680..b09f93b 100644
--- a/METALICENSE
+++ b/METALICENSE
@@ -1,41 +1,14 @@
Copyright (C) 2009-2016, Kaz Kylheku <kaz@kylheku.com>.
All rights reserved.
-The document named LICENSE specifies the license for the TXR program.
+The document named LICENSE specifies the license for the TXR program,
+including the linenoise library which it uses, found in the
+linenoise/ subdirectory. Linenoise uses exactly the same Two-Clause
+BSD License, and so the two licenses are combined.
-This METALICENSE document provides explanatory notes about the license, and
-does not constitute part of that license.
-
-The license is closely based on the two-clause BSD license, and is believed to
-be identical to that license in intent. For all practical intents and purposes,
-excluding situations of legal proceedings in a court of law or elsewhere, it is
-accurate to say that this software is "BSD licensed".
-
-Here is a summary, not guaranteed to be complete and correct, of the
-differences between the TXR LICENSE file and the BSD license.
-
-1. The introductory paragraph uses the phrase "of this software" to clarify
- what the license refers to. The BSD license does not (but it does use
- "THIS SOFTWARE" several times in the disclaimer).
-
-2. The introductory paragraph has been modified. The original introductory
- paragraph states that the redistribution and use are subject to
- the conditions. The modified paragraph states that only redistribution is
- subject to the conditions, which is obvious from the interpretation of the
- meaning of those conditions.
-
-4. The second, new, introductory paragraph states that use of the program
- constitutes agreement with the disclaimer. The original BSD two-clause
- license neglects to make such an assertion explicitly. However, it is
- obvious that it has this intent.
-
-3. The conditions are unmodified.
-
-4. The disclaimer is substantially abridged from the verbose original.
- Interested parties are hereby encouraged to research the differences.
-
-Regarding the MPI library, the README file in the mpi-1.8.6.tar.gz
-archive states:
+The MPI library, found in the mpi/ subdirectory, was developed over
+the yeras 1998-2006 by Michael J. Fromberger. Its license consists
+of the mpi/README file, which states:
This software is in the public domain. It is entirely free, and you
may use it and/or redistribute it for whatever purpose you choose;
@@ -44,11 +17,14 @@ archive states:
a particular purpose.
Whether or not software can be explicitly deposited into the public domain is
-legally questionable, so the MPI library must be regarded as being copyrighted
+controversial, so the MPI library may have to be regarded as being copyrighted
by Michael J. Fromberger. The above text can be reasonably understood to
-constitute a license which is compatible with the TXR LICENSE file
-in the sense that it is at least as permissive.
-
-TXR is ported to Windows with the help of the Cygwin library. For user
-conveninence, a packaged version of TXR includes the CYGWIN.DLL, in accordance
-with the terms of Cywgin's license, the GNU Lesser Public License, Version 3.
+constitute a license grant which is compatible with TXR's Two-Clause BSD
+license in the sense that it is at least as permissive.
+
+TXR is ported to Windows with the help of a derivative of the Cygwin library.
+For user convenience, a packaged version of TXR includes the CYGWIN1.DLL, in
+accordance with the terms of Cygwin's license, the GNU Lesser Public License,
+Version 3. More details are in the document LICENSE-CYG, which is incorporated
+into the Windows installer and displayed to users during installation to inform
+them of the dependency on a LGPL-ed library.
diff --git a/inst.nsi b/inst.nsi
index 5505605..bf735b3 100644
--- a/inst.nsi
+++ b/inst.nsi
@@ -23,13 +23,13 @@ Function .onInstSuccess
FunctionEnd
PageEx license
- LicenseText "Use and redistribution of TXR requires agreement with terms of the license." "Agree"
+ LicenseText "Redistribution of TXR requires agreement with terms of the license." "Acknowledge"
LicenseData LICENSE
Caption ": Licensing"
PageExEnd
PageEx license
- LicenseText "Use and redistribution of this version of TXR also requires agreement with Cygwin's license." "Agree"
+ LicenseText "Redistribution of this version of TXR also requires agreement with Cygwin's license." "Acknowledge"
LicenseData LICENSE-CYG
Caption ": Licensing"
PageExEnd
diff --git a/mpi/make-logtab b/mpi/make-logtab
index bb4eea3..ea0e91a 100755
--- a/mpi/make-logtab
+++ b/mpi/make-logtab
@@ -7,7 +7,8 @@
# estimating the output sizes of various bases.
#
# by Michael J. Fromberger <sting@linguist.dartmouth.edu>
-# Copyright (C) 1999 Michael J. Fromberger, All Rights Reserved
+# Developed 1999-2006.
+# Assigned to the public domain as of 2002; see README.
#
# $Id: make-logtab,v 1.2 2006/07/07 19:35:02 sting Exp $
#
diff --git a/mpi/mpi.c b/mpi/mpi.c
index 178b5fe..1e236e2 100644
--- a/mpi/mpi.c
+++ b/mpi/mpi.c
@@ -2,7 +2,8 @@
mpi.c
by Michael J. Fromberger <http://www.dartmouth.edu/~sting/>
- Copyright (C) 1998 Michael J. Fromberger, All Rights Reserved
+ Developed 1998-2004.
+ Assigned to the public domain as of 2002; see README.
Arbitrary precision integer arithmetic library
diff --git a/mpi/mpi.h b/mpi/mpi.h
index aac4901..70f0e7d 100644
--- a/mpi/mpi.h
+++ b/mpi/mpi.h
@@ -2,7 +2,8 @@
mpi.h
by Michael J. Fromberger <http://www.dartmouth.edu/~sting/>
- Copyright (C) 1998 Michael J. Fromberger, All Rights Reserved
+ Developed 1998-2004.
+ Assigned to the public domain as of 2002; see README.
Arbitrary precision integer arithmetic library
diff --git a/mpi/mplogic.c b/mpi/mplogic.c
index 63baeef..94992eb 100644
--- a/mpi/mplogic.c
+++ b/mpi/mplogic.c
@@ -2,7 +2,8 @@
mplogic.c
by Michael J. Fromberger <http://www.dartmouth.edu/~sting/>
- Copyright (C) 1998 Michael J. Fromberger, All Rights Reserved
+ Developed 1998-2004.
+ Assigned to the public domain as of 2002; see README.
Bitwise logical operations on MPI values
diff --git a/mpi/mplogic.h b/mpi/mplogic.h
index 8400da3..a481ac1 100644
--- a/mpi/mplogic.h
+++ b/mpi/mplogic.h
@@ -2,7 +2,8 @@
mplogic.h
by Michael J. Fromberger <http://www.dartmouth.edu/~sting/>
- Copyright (C) 1998 Michael J. Fromberger, All Rights Reserved
+ Developed 1998-2004.
+ Assigned to the public domain as of 2002; see README.
Bitwise logical operations on MPI values