From 46f082a4dc12d13d90658b81dfe8d0d9e38f655f Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 9 Jul 2016 13:29:35 -0600 Subject: [PATCH] Move portions of NuttX COPYING file that apply to apps/COPYING file --- COPYING | 40 ++++++++++++++++++++++++++++++++++++++++ ChangeLog.txt | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/COPYING b/COPYING index 89ccb6dc4..5aed07c81 100644 --- a/COPYING +++ b/COPYING @@ -135,3 +135,43 @@ 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. +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. diff --git a/ChangeLog.txt b/ChangeLog.txt index 1748e8796..d1ec48278 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1635,7 +1635,7 @@ From Marten Svanfeldt (2016-06-09). * Make sure that APPNAME is defined in all Makefiles that generate applications. From Sebastien Lorquet (2016-06-09). - * apps/netutils/esp8266/: Add logic to set the BAUD rate. From Pierr- + * apps/netutils/esp8266/: Add logic to set the BAUD rate. From Pierre- noel Bouteville (2016-06-11). * apps/netutils/esp8266/: CONFIG_SERIAL_TERMIOS must be defined in order to set BAUD (2016-06-11).