summaryrefslogtreecommitdiff
path: root/nuttx/COPYING
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-03-11 09:14:15 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-03-11 09:14:15 -0600
commit957812708a9289dc1469b2a2305ce580f579e753 (patch)
tree8f842bb62eb1dece7f69c460885789a4043ec345 /nuttx/COPYING
parent5fc714c4968c0db423ae358007cca8aadf3786ad (diff)
downloadpx4-nuttx-957812708a9289dc1469b2a2305ce580f579e753.tar.gz
px4-nuttx-957812708a9289dc1469b2a2305ce580f579e753.tar.bz2
px4-nuttx-957812708a9289dc1469b2a2305ce580f579e753.zip
Update COPYING file with special license requirements for PPPD
Diffstat (limited to 'nuttx/COPYING')
-rw-r--r--nuttx/COPYING47
1 files changed, 45 insertions, 2 deletions
diff --git a/nuttx/COPYING b/nuttx/COPYING
index 8b294040a..1c82d0ca2 100644
--- a/nuttx/COPYING
+++ b/nuttx/COPYING
@@ -9,10 +9,12 @@ have any licensing concerns.
NuttX
^^^^^^
-License for NuttX in general (authorship of individual files may vary):
+License for NuttX in general (authorship and copyright dates on
+individual files will vary):
+
/*************************************************************************
*
- * Copyright (C) 2007-2014 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -223,3 +225,44 @@ drivers/video/ov2640
content of those tables and still retain this BSD license. I am guessing
so, but I am not a copyright attorney so you should use this driver in
products at your own risk.
+
+apps/netutils/pppd
+^^^^^^^^^^^^^^^^^^
+
+ This implementation of PPPD has a license that is mostly compatible the
+ NuttX 3-clause BSD license, but includes a fourth clause that required
+ acknowledgement of Mike Johnson/Mycal Labs if it is built into your
+ product:
+
+ Copyright (C) 2000, Mycal Labs www.mycal.com
+ Copyright (c) 2003, Mike Johnson, Mycal Labs, www.mycal.net
+ All rights reserved.
+
+ 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.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by Mike Johnson/Mycal Labs
+ www.mycal.net.
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.