YOUR_RIGHTS_AND_OBLIGATIONS: Include the WIZnet DHCP license

6 files changed, 76 insertions, 9 deletions

diff --git a/3rd-party/COPYING.wiznet-dhcp.txt b/3rd-party/COPYING.wiznet-dhcp.txt
new file mode 100644
index 0000000..363bc9c
--- /dev/null
+++ b/3rd-party/COPYING.wiznet-dhcp.txt
@@ -0,0 +1,60 @@
+-----------------------------------------------------------------------------
+https://github.com/Wiznet/ioLibrary_Driver/blob/b981401e7f3d07015619adf44c13998e13e777f9/Internet/DHCP/dhcp.c
+https://github.com/Wiznet/ioLibrary_Driver/blob/b981401e7f3d07015619adf44c13998e13e777f9/Internet/DHCP/dhcp.h
+
+Copyright (c)  2013, WIZnet Co., LTD.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of the <ORGANIZATION> 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.
+
+SPDX-License-Identifier: BSD-3-Clause
+
+-----------------------------------------------------------------------------
+https://github.com/Wiznet/ioLibrary_Driver/blob/b981401e7f3d07015619adf44c13998e13e777f9/license.txt
+
+Copyright (c) 2014 WIZnet Co.,Ltd.
+Copyright (c) WIZnet ioLibrary Project.
+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
+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.
+
+SPDX-License-Identifier: MIT
diff --git a/3rd-party/pico-fmt b/3rd-party/pico-fmt
-Subproject beaecdcba7fdf0d584d245a9d0ad6be6bdc94a1
+Subproject a69f6e22e9bf3da849b128d3a0ed3e77da5997d
diff --git a/GNUmakefile b/GNUmakefile
index 8636973..e5e59b2 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -55,12 +55,14 @@ libusb/include/libusb/tusb_helpers.h 3rd-party/MS-LCID.pdf 3rd-party/MS-LCID.txt
 
 generate/files += build-aux/sources.mk
 ifeq ($(INNER),)
+nonsource/files = $(generate/files)
+nonsource/files += 3rd-party/COPYING.wiznet-dhcp.txt
 build-aux/sources.mk: $(if $(wildcard .git),FORCE)
-	git ls-files | grep -vFx $(foreach f,$(generate/files),-e $f) \
-	| sed 's,^,$(CURDIR)/,' | xargs editorconfig                  \
-	| sed -nE -e 's,\[$(CURDIR)/(.*)\],\1,p' -e 's/^_mode=//p'    \
-	| sed -E '{N;s/(.*)\n(.*)/sources_\2 += \1/;}'                \
-	| sort                                                        \
+	git ls-files | grep -vFx $(foreach f,$(nonsource/files),-e $f) \
+	| sed 's,^,$(CURDIR)/,' | xargs editorconfig                   \
+	| sed -nE -e 's,\[$(CURDIR)/(.*)\],\1,p' -e 's/^_mode=//p'     \
+	| sed -E '{N;s/(.*)\n(.*)/sources_\2 += \1/;}'                 \
+	| sort                                                         \
 	>$@.tmp
 	if ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi
 	@echo '################################################################################'
diff --git a/cmd/sbc_harness/CMakeLists.txt b/cmd/sbc_harness/CMakeLists.txt
index 6e722d7..878e151 100644
--- a/cmd/sbc_harness/CMakeLists.txt
+++ b/cmd/sbc_harness/CMakeLists.txt
@@ -72,10 +72,11 @@ pico_set_program_url(sbc_harness "https://git.lukeshu.com/sbc-harness")
 target_embed_sources(sbc_harness_objs sbc_harness static.h
 	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS.md
 	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/agpl-3.0.txt
+	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/dhcp.bsd3-mit.txt
+	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/newlib.txt
 	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/pico-sdk.bsd3.txt
 	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/printf.mit.txt
 	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/tinyusb.mit.txt
-	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/newlib.txt
 	static/Documentation/harness_rom_bin.txt
 	static/Documentation/harness_flash_bin.txt
 	static/Documentation/harness_uptime_txt.txt
diff --git a/cmd/sbc_harness/main.c b/cmd/sbc_harness/main.c
index 7d6c085..b6f485f 100644
--- a/cmd/sbc_harness/main.c
+++ b/cmd/sbc_harness/main.c
@@ -71,6 +71,12 @@ struct lib9p_srv_file root =
 		                                 STATIC_FILE("agpl-3.0.txt",
 		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_agpl_3_0_txt_start,
 		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_agpl_3_0_txt_end),
+		                                 STATIC_FILE("dhcp.bsd3-mit.txt",
+		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_dhcp_bsd3_mit_txt_start,
+		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_dhcp_bsd3_mit_txt_end),
+		                                 STATIC_FILE("newlib.txt",
+		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_newlib_txt_start,
+		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_newlib_txt_end),
 		                                 STATIC_FILE("pico-sdk.bsd3.txt",
 		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_pico_sdk_bsd3_txt_start,
 		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_pico_sdk_bsd3_txt_end),
@@ -80,9 +86,6 @@ struct lib9p_srv_file root =
 		                                 STATIC_FILE("tinyusb.mit.txt",
 		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_tinyusb_mit_txt_start,
 		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_tinyusb_mit_txt_end),
-		                                 STATIC_FILE("newlib.txt",
-		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_newlib_txt_start,
-		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_newlib_txt_end),
 		                                 ),
 		                      STATIC_FILE("harness_rom_bin.txt",
 		                                  .data_start = _binary_static_Documentation_harness_rom_bin_txt_start,
diff --git a/cmd/sbc_harness/static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/dhcp.bsd3-mit.txt b/cmd/sbc_harness/static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/dhcp.bsd3-mit.txt
new file mode 120000
index 0000000..0277bc8
--- /dev/null
+++ b/cmd/sbc_harness/static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/dhcp.bsd3-mit.txt
@@ -0,0 +1 @@
+../../../../../3rd-party/COPYING.wiznet-dhcp.txt
\ No newline at end of file