diff --git a/apps/COPYING b/apps/COPYING deleted file mode 100644 index 7e8fd8407a..0000000000 --- a/apps/COPYING +++ /dev/null @@ -1,137 +0,0 @@ -COPYING -- Describes the terms under which Nuttx is distributed. A -copy of the BSD-style licensing is included in this file. In my -words -- I believe that you should free to use NuttX in any -environment, private, private, commercial, open, closed, etc. -provided only that you repect the modest copyright notices as -described in license (below). Please feel free to contact me if you -have any licensing concerns. - -NuttX -^^^^^^ - -License for NuttX in general (authorship of individual files may vary): - - Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. - Author: Gregory Nutt - -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. Neither the name NuttX nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 THE -COPYRIGHT OWNER OR CONTRIBUTORS 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. - -uIP -^^^ - -Some lower-level networking middle-ware components of NuttX -derive from uIP which has a similar BSD style license: - - Copyright (c) 2001-2003, Adam Dunkels. - All rights reserved. - -FreeModbus -^^^^^^^^^ - -FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. -Copyright (c) 2006 Christian Walter -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. 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. - -THTTPD -^^^^^^ - -Derived from the original THTTPD package: - - Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer . - 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. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 THE AUTHOR OR CONTRIBUTORS 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. - -cJSON -^^^^^ - -Derives from the cJSON Project which has an MIT license: - - Copyright (c) 2009 Dave Gamble - -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. - -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/apps/ChangeLog.txt b/apps/ChangeLog.txt index c1c5189c43..7375adccfc 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -349,7 +349,7 @@ * apps/NxWidgets/Kconfig: Add option to turn on the memory monitor feature of the NxWidgets/NxWM unit tests. -6.23 2012-11-05 Gregory Nutt +6.23 2012-xx-xx Gregory Nutt * vsn: Moved all NSH commands from vsn/ to system/. Deleted the vsn/ directory. @@ -368,57 +368,3 @@ recent check-ins (Darcy Gong). * apps/netutils/webclient/webclient.c: Fix another but that I introduced when I was trying to add correct handling for loss of connection (Darcy Gong) - * apps/nshlib/nsh_telnetd.c: Add support for login to Telnet session via - username and password (Darcy Gong). - * apps/netutils/resolv/resolv.c (and files using the DNS resolver): Various - DNS address resolution improvements from Darcy Gong. - * apps/nshlib/nsh_netcmds.c: The ping command now passes a maximum round - trip time to uip_icmpping(). This allows pinging of hosts on complex - networks where the ICMP ECHO round trip time may exceed the ping interval. - * apps/examples/nxtext/nxtext_main.c: Fix bad conditional compilation - when CONFIG_NX_KBD is not defined. Submitted by Petteri Aimonen. - * apps/examples/nximage/nximage_main.c: Add a 5 second delay after the - NX logo is presented so that there is time for the image to be verified. - Suggested by Petteri Aimonen. - * apps/Makefile: Small change that reduces the number of shell invocations - by one (Mike Smith). - * apps/examples/elf: Test example for the ELF loader. - * apps/examples/elf: The ELF module test example appears fully functional. - * apps/netutils/json: Add a snapshot of the cJSON project. Contributed by - Darcy Gong. - * apps/examples/json: Test example for cJSON from Darcy Gong - * apps/nshlib/nsh_netinit.c: Fix static IP DNS problem (Darcy Gong) - * apps/netutils/resolv/resolv.c: DNS fixes from Darcy Gong. - * COPYING: Licensing information added. - * apps/netutils/codec and include/netutils/urldecode.h, base64.h, and md5.h: - A port of the BASE46, MD5 and URL CODEC library from Darcy Gong. - * nsnlib/nsh_codeccmd.c: NSH commands to use the CODEC library. - Contributed by Darcy Gong. - * apps/examples/wgetjson: Test example contributed by Darcy Gong - * apps/examples/cxxtest: A test for the uClibc++ library provided by - Qiang Yu and the RGMP team. - * apps/netutils/webclient, apps/netutils.codes, and apps/examples/wgetjson: - Add support for wget POST interface. Contributed by Darcy Gong. - * apps/examples/relays: A relay example contributed by Darcy Gong. - * apps/nshlib/nsh_netcmds: Add ifup and ifdown commands (from Darcy - Gong). - * apps/nshlib/nsh_netcmds: Extend the ifconfig command so that it - supports setting IP addresses, network masks, name server addresses, - and hardware address (from Darcy Gong). - -6.24 2012-xx-xx Gregory Nutt - - * apps/examples/ostest/roundrobin.c: Replace large tables with - algorithmic prime number generation. This allows the roundrobin - test to run on platforms with minimal SRAM (Freddie Chopin). - * apps/nshlib/nsh_dbgcmds.c: Add hexdump command to dump the contents - of a file (or character device) to the console Contributed by Petteri - Aimonen. - * apps/examples/modbus: Fixes from Freddie Chopin - * apps/examples/modbus/Kconfig: Kconfig logic for FreeModBus contributed - by Freddie Chopin. - * Makefile, */Makefile: Various fixes for Windows native build. Now uses - make foreach loops instead of shell loops. - * apps/examples/elf/test/*/Makefile: OSX doesn't support install -D, use - mkdir -p then install without the -D. From Mike Smith. -