diff --git a/LICENSE b/LICENSE index 6110e313..52d0f5ff 100644 --- a/LICENSE +++ b/LICENSE @@ -1,257 +1,49 @@ -Copyright © 2000-2009 Lucent Technologies. All Rights Reserved. +Copyright © 2021 Plan 9 Foundation Portions Copyright © 2001-2008 Russ Cox Portions Copyright © 2008-2009 Google Inc. -=================================================================== +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 bulk of this software is derived from Plan 9 and is thus distributed -under the Lucent Public License, Version 1.02, reproduced below. +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. -There are a few exceptions: libutf, libfmt, and libregexp are distributed -under simpler BSD-like boilerplates. See the LICENSE files in those -directories. There are other exceptions, also marked with LICENSE files -in their directories or marked at the top of the file. - -The bitmap fonts in the font/luc, font/lucm, font/lucsans, and font/pelm -directory are copyright B&H Inc. and distributed under more restricted -terms under agreement with B&H. See the NOTICE file in those directories. +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. =================================================================== -Lucent Public License Version 1.02 +This software is derived from Plan 9, originally copyright Lucent Technologies +and distributed under the Lucent Public License, Version 1.02. +Lucent was bought by Alcatel, which was bought by Nokia. +On March 23, 2021, Nokia announced the transfer of the Plan 9 copyrights to the +Plan 9 Foundation, which in turn relicensed Plan 9 under the the MIT license, +reproduced above. -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE -PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. +There are a few exceptions, noted with LICENSE files in their own directories: -1. DEFINITIONS +The bzip2 program uses the bzip2 license; see src/cmd/bzip2/LICENSE. -"Contribution" means: +The fonts from Bigelow and Holmes were licensed only for Plan 9 itself, +not for derivatives like Plan 9 from User Space. - a. in the case of Lucent Technologies Inc. ("LUCENT"), the Original - Program, and - b. in the case of each Contributor, - - i. changes to the Program, and - ii. additions to the Program; - - where such changes and/or additions to the Program were added to the - Program by such Contributor itself or anyone acting on such - Contributor's behalf, and the Contributor explicitly consents, in - accordance with Section 3C, to characterization of the changes and/or - additions as Contributions. - -"Contributor" means LUCENT and any other entity that has Contributed a -Contribution to the Program. - -"Distributor" means a Recipient that distributes the Program, -modifications to the Program, or any part thereof. - -"Licensed Patents" mean patent claims licensable by a Contributor -which are necessarily infringed by the use or sale of its Contribution -alone or when combined with the Program. - -"Original Program" means the original version of the software -accompanying this Agreement as released by LUCENT, including source -code, object code and documentation, if any. - -"Program" means the Original Program and Contributions or any part -thereof - -"Recipient" means anyone who receives the Program under this -Agreement, including all Contributors. - -2. GRANT OF RIGHTS - - a. Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare derivative works of, publicly display, - publicly perform, distribute and sublicense the Contribution of such - Contributor, if any, and such derivative works, in source code and - object code form. - - b. Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, if - any, in source code and object code form. The patent license granted - by a Contributor shall also apply to the combination of the - Contribution of that Contributor and the Program if, at the time the - Contribution is added by the Contributor, such addition of the - Contribution causes such combination to be covered by the Licensed - Patents. The patent license granted by a Contributor shall not apply - to (i) any other combinations which include the Contribution, nor to - (ii) Contributions of other Contributors. No hardware per se is - licensed hereunder. - - c. Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. Each - Contributor disclaims any liability to Recipient for claims brought by - any other entity based on infringement of intellectual property rights - or otherwise. As a condition to exercising the rights and licenses - granted hereunder, each Recipient hereby assumes sole responsibility - to secure any other intellectual property rights needed, if any. For - example, if a third party patent license is required to allow - Recipient to distribute the Program, it is Recipient's responsibility - to acquire that license before distributing the Program. - - d. Each Contributor represents that to its knowledge it has sufficient - copyright rights in its Contribution, if any, to grant the copyright - license set forth in this Agreement. - -3. REQUIREMENTS - -A. Distributor may choose to distribute the Program in any form under -this Agreement or under its own license agreement, provided that: - - a. it complies with the terms and conditions of this Agreement; - - b. if the Program is distributed in source code or other tangible - form, a copy of this Agreement or Distributor's own license agreement - is included with each copy of the Program; and - - c. if distributed under Distributor's own license agreement, such - license agreement: - - i. effectively disclaims on behalf of all Contributors all warranties - and conditions, express and implied, including warranties or - conditions of title and non-infringement, and implied warranties or - conditions of merchantability and fitness for a particular purpose; - ii. effectively excludes on behalf of all Contributors all liability - for damages, including direct, indirect, special, incidental and - consequential damages, such as lost profits; and - iii. states that any provisions which differ from this Agreement are - offered by that Contributor alone and not by any other party. - -B. Each Distributor must include the following in a conspicuous - location in the Program: - - Copyright (C) 2003, Lucent Technologies Inc. and others. All Rights - Reserved. - -C. In addition, each Contributor must identify itself as the -originator of its Contribution in a manner that reasonably allows -subsequent Recipients to identify the originator of the Contribution. -Also, each Contributor must agree that the additions and/or changes -are intended to be a Contribution. Once a Contribution is contributed, -it may not thereafter be revoked. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain -responsibilities with respect to end users, business partners and the -like. While this license is intended to facilitate the commercial use -of the Program, the Distributor who includes the Program in a -commercial product offering should do so in a manner which does not -create potential liability for Contributors. Therefore, if a -Distributor includes the Program in a commercial product offering, -such Distributor ("Commercial Distributor") hereby agrees to defend -and indemnify every Contributor ("Indemnified Contributor") against -any losses, damages and costs (collectively"Losses") arising from -claims, lawsuits and other legal actions brought by a third party -against the Indemnified Contributor to the extent caused by the acts -or omissions of such Commercial Distributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. -In order to qualify, an Indemnified Contributor must: a) promptly -notify the Commercial Distributor in writing of such claim, and b) -allow the Commercial Distributor to control, and cooperate with the -Commercial Distributor in, the defense and any related settlement -negotiations. The Indemnified Contributor may participate in any such -claim at its own expense. - -For example, a Distributor might include the Program in a commercial -product offering, Product X. That Distributor is then a Commercial -Distributor. If that Commercial Distributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Distributor's responsibility -alone. Under this section, the Commercial Distributor would have to -defend claims against the Contributors related to those performance -claims and warranties, and if a court requires any Contributor to pay -any damages as a result, the Commercial Distributor must pay those -damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -PROVIDED ON AN"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY -WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY -OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely -responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement, including but not limited to -the risks and costs of program errors, compliance with applicable -laws, damage to or loss of data, programs or equipment, and -unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR -ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING -WITHOUT LIMITATION LOST PROFITS), 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 OR -DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. EXPORT CONTROL - -Recipient agrees that Recipient alone is responsible for compliance -with the United States export administration regulations (and the -export control laws and regulation of any other countries). - -8. GENERAL - -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further -action by the parties hereto, such provision shall be reformed to the -minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against a Contributor with -respect to a patent applicable to software (including a cross-claim or -counterclaim in a lawsuit), then any patent licenses granted by that -Contributor to such Recipient under this Agreement shall terminate as -of the date such litigation is filed. In addition, if Recipient -institutes patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Program -itself (excluding combinations of the Program with other software or -hardware) infringes such Recipient's patent(s), then such Recipient's -rights granted under Section 2(b) shall terminate as of the date such -litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of -time after becoming aware of such noncompliance. If all Recipient's -rights under this Agreement terminate, Recipient agrees to cease use -and distribution of the Program as soon as reasonably practicable. -However, Recipient's obligations under this Agreement and any licenses -granted by Recipient relating to the Program shall continue and -survive. - -LUCENT may publish new versions (including revisions) of this -Agreement from time to time. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new -version of the Agreement is published, Contributor may elect to -distribute the Program (including its Contributions) under the new -version. No one other than LUCENT has the right to modify this -Agreement. Except as expressly stated in Sections 2(a) and 2(b) above, -Recipient receives no rights or licenses to the intellectual property -of any Contributor under this Agreement, whether expressly, by -implication, estoppel or otherwise. All rights in the Program not -expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and -the intellectual property laws of the United States of America. No -party to this Agreement will bring a legal action under this Agreement -more than one year after the cause of action arose. Each party waives -its rights to a jury trial in any resulting litigation. +Plan 9 from User Space arranged a separate agreement with B&H to include +the bitmap fonts in the font/luc, font/lucm, font/lucsans, and font/pelm +directories. Other bitmap fonts have other licenses. See font/LICENSE. +The Lucida Sans Unicode PostScript fonts were licensed from B&H only for Plan 9 +itself, not derivatives like Plan 9 from User Space. In their place, Plan 9 from +User Space provides Luxi Sans, also by B&H but available under a more liberal +license, and Deja Vu, a Unicode extension of the Bitstream Vera family of fonts. +Luxi Sans is similar to Lucida Sans, but it has no Unicode support. +Deja Vu does have good Unicode support. diff --git a/dist/unix.html b/dist/unix.html index 9948da2f..33f428a6 100644 --- a/dist/unix.html +++ b/dist/unix.html @@ -23,7 +23,7 @@ Edit ./^$/,s/ - +
supported systems @@ -49,7 +49,7 @@ Edit ./^$/,s/
make PREFIX=/usr/elsewhere install.
- + On unsupported systems, you will need to create Make.YourOS-YourArch. See the existing ones for examples. If you write one for a new system, @@ -62,27 +62,25 @@ Edit ./^$/,s/
- + Libutf is a port of Plan 9's support library for UTF-8 and Unicode. - +
- - manual: + + manual: isalpharune(3), rune(3), runestrcat(3), utf(7) - -
- - download: libutf.tgz (checksums) -
- - license: original Bell Labs MIT-like - or Lucent Public License + + download: libutf.tgz + +
+ + license: MIT
@@ -91,7 +89,7 @@ Edit ./^$/,s/
- + Libfmt is a port of Plan 9's formatted print library. As a base it provides all the syntax of ANSI C's printf but adds the ability for client programs to install new print verbs. @@ -99,108 +97,104 @@ Edit ./^$/,s/perror("foo"), you can write fprint(2, "foo: %r\n");. - This is especially nice when you write verbs to format the + This is especially nice when you write verbs to format the data structures used by your particular programs. Needs libutf. - +
- - manual: + + manual: print(3), fmtinstall(3), quote(3), fmtstrtod(3) - +
- - download: libfmt.tgz (checksums) - + + download: libfmt.tgz +
- - License: original Bell Labs MIT-like - or Lucent Public License + + license: MIT
- +
libbio
- + Libbio is a port of Plan 9's buffered I/O library. It provides most of the same functionality as stdio or sfio, but with a simpler interface and smaller footprint. Needs libutf and libfmt. - +
- - manual: + + manual: bio(3) - +
- - download: libbio.tgz (checksums) - + + download: libbio.tgz +
- - License: Vita Nuova MIT-like - or Lucent Public License + + license: MIT
- +
libregexp9
- + Libregexp9 is a port of Plan 9's Unicode-capable regular expression library. It is small and simple and provides the traditional extended regular - expressions (without modern complications like + expressions (without modern complications like {} and various \x character classes). It supports Unicode via wide character or UTF-8 encoding. Needs libutf and libfmt. - +
- - manual: + + manual: regexp9(3), regexp9(7) - +
- - download: libregexp9.tgz (checksums) - + + download: libregexp9.tgz +
- - License: original Bell Labs MIT-like - or Lucent Public License + + license: MIT
- +
mk
- + Mk is a simple replacement for make. Needs libutf, libfmt, libbio, and libregexp9. - +
- - manual: + + manual: mk(1) - +
- - download: mk.tgz (checksums) - + + download: mk.tgz +
- - License: Vita Nuova MIT-like - or Lucent Public License + + license: MIT
@@ -208,12 +202,11 @@ Edit ./^$/,s/
- + Includes mk and all the libraries. - +
- - download: mk-with-libs.tgz (checksums) + download: mk-with-libs.tgz
diff --git a/font/LICENSE b/font/LICENSE index 6ca96ce6..19b048ac 100644 --- a/font/LICENSE +++ b/font/LICENSE @@ -1,5 +1,6 @@ Many of the fonts in this directory come from other sources -and are distributed under licenses other than the Lucent Public License. +and are distributed under licenses other than the MIT-style license +that governs the main distribution. In particular, see: @@ -13,4 +14,4 @@ In particular, see: naga10/README pelm/NOTICE shinonome/README - + diff --git a/src/cmd/awk/README b/src/cmd/awk/README deleted file mode 100644 index e3efb50d..00000000 --- a/src/cmd/awk/README +++ /dev/null @@ -1,13 +0,0 @@ -This 'awk' source is directly downloaded from the Plan 9 source - -http://cm.bell-labs.com/sources/plan9/sys/src/cmd/awk/ - -as such, it's copyright is held by Lucent Technologies and distributed under the -Lucent Public License version 1.02 [http://www.opensource.org/licenses/lucent1.02.php]. - -Modifications were made by Jeff Sickel in order to build using Plan 9 from User -Space [https://9fans.github.io/plan9port/] to the following files: - - mkfile - re.c - diff --git a/src/cmd/mk/NOTICE b/src/cmd/mk/NOTICE index 9911f992..f9fa9e36 100644 --- a/src/cmd/mk/NOTICE +++ b/src/cmd/mk/NOTICE @@ -1,27 +1,21 @@ -Copyright © 1994-1999 Lucent Technologies Inc. All rights reserved. -Portions Copyright © 1995-1997 C H Forsyth (forsyth@caldo.demon.co.uk). All rights reserved. -Portions Copyright © 1997-1999 Vita Nuova Limited. All rights reserved. -Portions Copyright © 2000-2002 Vita Nuova Holdings Limited (www.vitanuova.com). All rights reserved. +Copyright © 2021 Plan 9 Foundation +Portions Copyright © 1997-1999 Vita Nuova Limited +Portions Copyright © 2000-2015 Vita Nuova Holdings Limited -Under a licence agreement with Lucent Technologies Inc. effective 1st March 2000, -Vita Nuova Holdings Limited has the right to determine (within a specified scope) -the form and content of sublicences for this software. +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: -Vita Nuova Holdings Limited now makes this software available as Free -Software under the terms of the `GNU General Public LIcense, Version 2' -(see the file LICENCE or http://www.fsf.org/copyleft/gpl.html for -the full terms and conditions). One of the conditions of that licence -is that you must keep intact all notices that refer to that licence and to the absence of -of any warranty: for this software, note that includes this NOTICE file in particular. - -This suite of programs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -`GNU General Public License' for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -This copyright NOTICE applies to all files in this directory and -subdirectories, unless another copyright notice appears in a given -file or subdirectory. If you take code from this software to use in -other programs, you must somehow include with it an appropriate -copyright notice that includes the copyright notice and the other -notices above. +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/src/lib9/LICENSE b/src/lib9/LICENSE index 12e3eba5..c6665b2b 100644 --- a/src/lib9/LICENSE +++ b/src/lib9/LICENSE @@ -1,8 +1,7 @@ -The files listed below may be redistributed either under the -terms of the Lucent Public License version 1.02 or under the -terms of the simpler MIT-style license at the bottom of this file. The files listed below were written from scrach for plan9port and do not derive from the Plan 9 from Bell Labs distribution. +They are made available under an MIT-style license, using the +same terms as the main distribution. ../../include/u.h non-Plan 9 code in ../../include/libc.h @@ -70,11 +69,7 @@ and do not derive from the Plan 9 from Bell Labs distribution. time.c truerand.c udp.c - unsharp.c - -The other source files in this directory do derive from Plan 9 and -are distributed only under the terms of the Lucent Public License -version 1.02, as detailed in ../../LICENSE. + unsharp.c Copyright 2001-2007 Russ Cox. All Rights Reserved. diff --git a/src/lib9/fmt/NOTICE b/src/lib9/fmt/NOTICE deleted file mode 100644 index 5dc21cb5..00000000 --- a/src/lib9/fmt/NOTICE +++ /dev/null @@ -1,19 +0,0 @@ -/* - * The authors of this software are Rob Pike and Ken Thompson. - * Copyright (c) 2002 by Lucent Technologies. - * Permission to use, copy, modify, and distribute this software for any - * purpose without fee is hereby granted, provided that this entire notice - * is included in all copies of any software which is or includes a copy - * or modification of this software and in all copies of the supporting - * documentation for such software. - * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY - * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY - * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. -*/ - -This is a Unix port of the Plan 9 formatted I/O package. - -Please send comments about the packaging -to Russ Cox . - diff --git a/src/lib9/utf/NOTICE b/src/lib9/utf/NOTICE deleted file mode 100644 index ad76cd52..00000000 --- a/src/lib9/utf/NOTICE +++ /dev/null @@ -1,13 +0,0 @@ -/* - * The authors of this software are Rob Pike and Ken Thompson. - * Copyright (c) 1998-2002 by Lucent Technologies. - * Permission to use, copy, modify, and distribute this software for any - * purpose without fee is hereby granted, provided that this entire notice - * is included in all copies of any software which is or includes a copy - * or modification of this software and in all copies of the supporting - * documentation for such software. - * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY - * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY - * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. - */ diff --git a/src/lib9/zoneinfo.c b/src/lib9/zoneinfo.c index f8ae442d..36b4b6ef 100644 --- a/src/lib9/zoneinfo.c +++ b/src/lib9/zoneinfo.c @@ -6,7 +6,7 @@ * Formats 0 and 2 are supported, and 4-byte timestamps * * Copyright © 2008 M. Teichgräber - * Contributed under the terms of the Lucent Public License 1.02. + * Contributed under the MIT license used in the rest of the distribution. */ #include "zoneinfo.h" diff --git a/unix/NOTICE.bio b/unix/NOTICE.bio index 24bef790..3e5dcdba 100644 --- a/unix/NOTICE.bio +++ b/unix/NOTICE.bio @@ -1,13 +1,8 @@ -This copyright NOTICE applies to all files in this directory and -subdirectories, unless another copyright notice appears in a given -file or subdirectory. If you take substantial code from this software to use in -other programs, you must somehow include with it an appropriate -copyright notice that includes the copyright notice and the other -notices below. It is fine (and often tidier) to do that in a separate -file such as NOTICE, LICENCE or COPYING. +This is a Unix port of the Plan 9 buffered I/O library. +Please send comments about the packaging to Russ Cox . - Copyright © 1994-1999 Lucent Technologies Inc. All rights reserved. - Revisions Copyright © 2000-2005 Vita Nuova Holdings Limited (www.vitanuova.com). All rights reserved. +Copyright © 2021 Plan 9 Foundation +Revisions Copyright © 2000-2005 Vita Nuova Holdings Limited (www.vitanuova.com). All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -26,9 +21,3 @@ 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. - ----- - -This software is also made available under the Lucent Public License -version 1.02; see http://9p.io/plan9/license.html - diff --git a/unix/NOTICE.fmt b/unix/NOTICE.fmt index e4024070..3c66bac3 100644 --- a/unix/NOTICE.fmt +++ b/unix/NOTICE.fmt @@ -1,25 +1,22 @@ -/* - * The authors of this software are Rob Pike and Ken Thompson. - * Copyright (c) 2002 by Lucent Technologies. - * Permission to use, copy, modify, and distribute this software for any - * purpose without fee is hereby granted, provided that this entire notice - * is included in all copies of any software which is or includes a copy - * or modification of this software and in all copies of the supporting - * documentation for such software. - * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY - * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY - * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. -*/ +This is a Unix port of the Plan 9 formatted I/O library, by Rob Pike and Ken Thompson. +Please send comments about the packaging to Russ Cox . -This is a Unix port of the Plan 9 formatted I/O package. +Copyright © 2021 Plan 9 Foundation -Please send comments about the packaging -to Russ Cox . +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. ----- - -This software is also made available under the Lucent Public License -version 1.02; see http://9p.io/plan9/license.html - +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/unix/NOTICE.mk b/unix/NOTICE.mk index 4fb98fb7..9b7350ef 100644 --- a/unix/NOTICE.mk +++ b/unix/NOTICE.mk @@ -1,13 +1,9 @@ -This copyright NOTICE applies to all files in this directory and -subdirectories, unless another copyright notice appears in a given -file or subdirectory. If you take substantial code from this software to use in -other programs, you must somehow include with it an appropriate -copyright notice that includes the copyright notice and the other -notices below. It is fine (and often tidier) to do that in a separate -file such as NOTICE, LICENCE or COPYING. +This is a Unix port of the Plan 9 build tool mk, by Andrew Hume. +Please send comments about the packaging to Russ Cox . - Copyright © 1994-1999 Lucent Technologies Inc. All rights reserved. - Revisions Copyright © 2000-2003 Vita Nuova Holdings Limited (www.vitanuova.com). All rights reserved. +Copyright © 2021 Plan 9 Foundation +Portions Copyright © 1997-1999 Vita Nuova Limited +Portions Copyright © 2000-2015 Vita Nuova Holdings Limited Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -26,9 +22,3 @@ 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. - ----- - -This software is also made available under the Lucent Public License -version 1.02; see http://9p.io/plan9/license.html - diff --git a/unix/NOTICE.regexp b/unix/NOTICE.regexp index 686891c1..076a901b 100644 --- a/unix/NOTICE.regexp +++ b/unix/NOTICE.regexp @@ -1,25 +1,22 @@ -/* - * The authors of this software is Rob Pike. - * Copyright (c) 2002 by Lucent Technologies. - * Permission to use, copy, modify, and distribute this software for any - * purpose without fee is hereby granted, provided that this entire notice - * is included in all copies of any software which is or includes a copy - * or modification of this software and in all copies of the supporting - * documentation for such software. - * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY - * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY - * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. -*/ +This is a Unix port of the Plan 9 regular expression library, by Rob Pike. +Please send comments about the packaging to Russ Cox . -This is a Unix port of the Plan 9 regular expression library. +Copyright © 2021 Plan 9 Foundation -Please send comments about the packaging -to Russ Cox . +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. ----- - -This software is also made available under the Lucent Public License -version 1.02; see http://9p.io/plan9/license.html - +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/unix/NOTICE.utf b/unix/NOTICE.utf index e4024070..b39ee1ec 100644 --- a/unix/NOTICE.utf +++ b/unix/NOTICE.utf @@ -1,25 +1,22 @@ -/* - * The authors of this software are Rob Pike and Ken Thompson. - * Copyright (c) 2002 by Lucent Technologies. - * Permission to use, copy, modify, and distribute this software for any - * purpose without fee is hereby granted, provided that this entire notice - * is included in all copies of any software which is or includes a copy - * or modification of this software and in all copies of the supporting - * documentation for such software. - * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY - * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY - * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. -*/ +This is a Unix port of the Plan 9 UTF-8 library, by Rob Pike and Ken Thompson. +Please send comments about the packaging to Russ Cox . -This is a Unix port of the Plan 9 formatted I/O package. +Copyright © 2021 Plan 9 Foundation -Please send comments about the packaging -to Russ Cox . +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. ----- - -This software is also made available under the Lucent Public License -version 1.02; see http://9p.io/plan9/license.html - +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/unix/README.dot b/unix/README.dot index 9479bbb5..819d7569 100644 --- a/unix/README.dot +++ b/unix/README.dot @@ -13,6 +13,9 @@ mk new-utf new-fmt new-bio new-regexp new-mk mk test-utf test-fmt test-bio test-regexp test-mk create the directory, populate it, and run a test build +mk test + run the above tests and then clean up + mk libutf.tgz libfmt.tgz libbio.tgz libregexp9.tgz mk.tgz create the directory, populate it, and build a tar file diff --git a/unix/mkfile b/unix/mkfile index 1c4319c6..ba641bc6 100644 --- a/unix/mkfile +++ b/unix/mkfile @@ -34,7 +34,12 @@ test-%:V: if(! test -f `{echo $i | sed 's/.c$/.o/'}) echo XXX not building $i cd .. - rm -r $td + +test:V: test-utf test-fmt test-bio test-regexp test-mk + mk test-clean + +test-clean:V: + rm -rf libutf libfmt libbio libregexp mk lib%.tgz:V: mk new-$stem @@ -49,7 +54,7 @@ mk.tgz:V: tar cf /dev/stdout mk | gzip > $target mk-with-libs.tgz:V: - mk new-utf + mk new-utf mk new-fmt mk new-bio mk new-regexp @@ -64,9 +69,6 @@ mk-with-libs.tgz:V: tgz:V: libutf.tgz libfmt.tgz libregexp9.tgz libbio.tgz mk.tgz mk-with-libs.tgz +# run from 'mk push' in ../dist, which sets 9fansweb push:V: - rm -f *.sha1 *.md5 *.sha256 - for (i in *.tgz) - sha1sum $i >$i.sha1 cp *.tgz $9fansweb/plan9port/unix - cp *.tgz.sha1 $9fansweb/plan9port/unix