diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/awk/README | 13 | ||||
| -rw-r--r-- | src/cmd/mk/NOTICE | 42 | ||||
| -rw-r--r-- | src/lib9/LICENSE | 11 | ||||
| -rw-r--r-- | src/lib9/fmt/NOTICE | 19 | ||||
| -rw-r--r-- | src/lib9/utf/NOTICE | 13 | ||||
| -rw-r--r-- | src/lib9/zoneinfo.c | 2 |
6 files changed, 22 insertions, 78 deletions
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 <rsc@post.harvard.edu>. - 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" |