commit 23beeedce6a5a56ce4a12dbb96178fc165e913b4
parent 473b289e3176157e7674cf676ec1ef56a8c04e02
Author: Roberto E. Vargas Caballero <k0ga@shike2.net>
Date: Fri, 18 Apr 2025 22:52:50 +0200
doc: Unify license information
Diffstat:
| M | LICENSE | | | 104 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- |
| D | doc/caldera.txt | | | 53 | ----------------------------------------------------- |
| D | doc/isc.txt | | | 41 | ----------------------------------------- |
3 files changed, 100 insertions(+), 98 deletions(-)
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,101 @@
-Caldera license contained in file doc/caldera.txt applies to:
- - scripts/lorder
+scripts/lorder
+--------------
-ISC license contained in file doc/isc.txt applies to:
- - All the remaining files
+Caldera International, Inc. hereby grants a fee free license that includes
+the rights use, modify and distribute this named source code, including
+creating derived binary products created from the source code. The source
+code for which Caldera International, Inc. grants rights are limited
+to the following UNIX Operating Systems that operate on the 16-Bit
+PDP-11 CPU and early versions of the 32-Bit UNIX Operating System, with
+specific exclusion of UNIX System III and UNIX System V and successor
+operating systems:
+
+32-bit 32V UNIX
+
+16 bit UNIX Versions 1, 2, 3, 4, 5, 6, 7
+
+Caldera International, Inc. makes no guarantees or commitments that any
+source code is available from Caldera International, Inc.
+
+The following copyright notice applies to the source code files for
+which this license is granted.
+
+Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+Redistributions of source code and documentation must retain the above
+copyright notice, this list of conditions and the following disclaimer.
+
+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.
+
+All advertising materials mentioning features or use of this software
+must display the following acknowledgement:
+
+This product includes software developed or owned by Caldera
+International, Inc.
+
+Neither the name of Caldera International, Inc. nor the names of other
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
+INTERNATIONAL, INC. 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 CALDERA INTERNATIONAL, INC. 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.
+
+All remaining files
+-------------------
+
+ISC License
+
+(c) 2012-2025 Roberto E. Vargas Caballero <k0ga@shike2.com>
+
+(c) 2016 Alexander Krotov <ilabdsf@yandex.ru>
+(c) 2021 Anders Damsgaard <anders@adamsgaard.dk>
+(c) 2016-2022 Andrew Chambers <andrewchamberss@gmail.com>
+(c) 2018 Antonio Niño Díaz <antonio_nd@outlook.com>
+(c) 2017 Christopher M. Graff <cm0graff@gmail.com>
+(c) 2017-2021 Christoph Lohmann <20h@r-36.net>
+(c) 2016 Alejandro Berna <alejandro.berna@sener.es>
+(c) 2015-2018 Dimitris Papastamos <sin@2f30.org>
+(c) 2019-2020 Eddie Thieda <eddie.thieda@gmail.com>
+(c) 2015 Evan Gates <evan.gates@gmail.com>
+(c) 2015-2016 Laslo Hunhold <dev@frign.de>
+(c) 2017 Lucas Gabriel Vuotto <l.vuotto92@gmail.com>
+(c) 2015-2022 Hiltjo Posthuma <hiltjo@codemadness.org>
+(c) 2018 John Tsichritzis <john.tsichritzis@gmail.com>
+(c) 2018 Josuah Demangeon <mail@josuah.net>
+(c) 2017-2021 Michael Forney <mforney@mforney.org>
+(c) 2021 Mikhail Konovalov <m.konovalov@trustlab.center>
+(c) 2015-2021 Quentin Rameau <quinq@fifth.space>
+(c) 2015-2017 Quentin Carbonneaux <quentin@c9x.me>
+(c) 2016 Raymond Nicholson <rain1@openmailbox.org>
+(c) 2023 Tim Kelly <gtkelly@dialectronics.com>
+(c) 2016 Pekka Jylhä-Ollila <pekka.jylha.ollila@gmail.com>
+(c) 2015 Sören Tempel <soeren+git@soeren-tempel.net>
+(c) 2022 Xavier Del Campo Romero <xavi.dcr@tutanota.com>
+(c) 2018-2021 zerous Naveen Narayanan <zerous@nocebo.space>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/doc/caldera.txt b/doc/caldera.txt
@@ -1,53 +0,0 @@
-Caldera International, Inc. hereby grants a fee free license that includes
-the rights use, modify and distribute this named source code, including
-creating derived binary products created from the source code. The source
-code for which Caldera International, Inc. grants rights are limited
-to the following UNIX Operating Systems that operate on the 16-Bit
-PDP-11 CPU and early versions of the 32-Bit UNIX Operating System, with
-specific exclusion of UNIX System III and UNIX System V and successor
-operating systems:
-
-32-bit 32V UNIX
-
-16 bit UNIX Versions 1, 2, 3, 4, 5, 6, 7
-
-Caldera International, Inc. makes no guarantees or commitments that any
-source code is available from Caldera International, Inc.
-
-The following copyright notice applies to the source code files for
-which this license is granted.
-
-Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-Redistributions of source code and documentation must retain the above
-copyright notice, this list of conditions and the following disclaimer.
-
-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.
-
-All advertising materials mentioning features or use of this software
-must display the following acknowledgement:
-
-This product includes software developed or owned by Caldera
-International, Inc.
-
-Neither the name of Caldera International, Inc. nor the names of other
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
-INTERNATIONAL, INC. 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 CALDERA INTERNATIONAL, INC. 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/doc/isc.txt b/doc/isc.txt
@@ -1,41 +0,0 @@
-ISC License
-
-(c) 2012-2024 Roberto E. Vargas Caballero <k0ga@shike2.com>
-
-(c) 2016 Alexander Krotov <ilabdsf@yandex.ru>
-(c) 2021 Anders Damsgaard <anders@adamsgaard.dk>
-(c) 2016-2022 Andrew Chambers <andrewchamberss@gmail.com>
-(c) 2018 Antonio Niño Díaz <antonio_nd@outlook.com>
-(c) 2017 Christopher M. Graff <cm0graff@gmail.com>
-(c) 2017-2021 Christoph Lohmann <20h@r-36.net>
-(c) 2016 Alejandro Berna <alejandro.berna@sener.es>
-(c) 2015-2018 Dimitris Papastamos <sin@2f30.org>
-(c) 2019-2020 Eddie Thieda <eddie.thieda@gmail.com>
-(c) 2015 Evan Gates <evan.gates@gmail.com>
-(c) 2015-2016 Laslo Hunhold <dev@frign.de>
-(c) 2017 Lucas Gabriel Vuotto <l.vuotto92@gmail.com>
-(c) 2015-2022 Hiltjo Posthuma <hiltjo@codemadness.org>
-(c) 2018 John Tsichritzis <john.tsichritzis@gmail.com>
-(c) 2018 Josuah Demangeon <mail@josuah.net>
-(c) 2017-2021 Michael Forney <mforney@mforney.org>
-(c) 2021 Mikhail Konovalov <m.konovalov@trustlab.center>
-(c) 2015-2021 Quentin Rameau <quinq@fifth.space>
-(c) 2015-2017 Quentin Carbonneaux <quentin@c9x.me>
-(c) 2016 Raymond Nicholson <rain1@openmailbox.org>
-(c) 2023 Tim Kelly <gtkelly@dialectronics.com>
-(c) 2016 Pekka Jylhä-Ollila <pekka.jylha.ollila@gmail.com>
-(c) 2015 Sören Tempel <soeren+git@soeren-tempel.net>
-(c) 2022 Xavier Del Campo Romero <xavi.dcr@tutanota.com>
-(c) 2018-2021 zerous Naveen Narayanan <zerous@nocebo.space>
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
