Thirdparty: Fill copyright for lws, miniupnpc, clipper

modules/websocket/SCsub

@@ -7,7 +7,7 @@ Import('env_modules')
 
 env_lws = env_modules.Clone()
 
-thirdparty_dir = "#thirdparty/lws/"
+thirdparty_dir = "#thirdparty/libwebsockets/"
 helper_dir = "win32helpers/"
 thirdparty_sources = [
     "client/client.c",
@@ -67,7 +67,7 @@ else:
     env_lws.add_source_files(env.modules_sources, thirdparty_sources)
     env_lws.Append(CPPPATH=[thirdparty_dir])
 
-    wrapper_includes = ["#thirdparty/lws/mbedtls_wrapper/include/" + inc for inc in ["internal", "openssl", "platform", ""]]
+    wrapper_includes = ["#thirdparty/libwebsockets/mbedtls_wrapper/include/" + inc for inc in ["internal", "openssl", "platform", ""]]
     env_lws.Prepend(CPPPATH=wrapper_includes)
 
     if env['builtin_mbedtls']:

thirdparty/README.md

@@ -15,6 +15,7 @@ Important: Some files have Godot-made changes.
 They are marked with `// -- GODOT start --` and `// -- GODOT end --`
 comments.
 
+
 ## bullet
 
 - Upstream: https://github.com/bulletphysics/bullet3
@@ -76,6 +77,7 @@ Important: Some files have Godot-made changes.
 They are marked with `// -- GODOT start --` and `// -- GODOT end --`
 comments.
 
+
 ## fonts
 
 ### Noto Sans
@@ -175,6 +177,7 @@ Important: Some files have Godot-made changes.
 They are marked with `// -- GODOT start --` and `// -- GODOT end --`
 comments.
 
+
 ## libtheora
 
 - Upstream: https://www.theora.org
@@ -246,12 +249,13 @@ File extracted from upstream source:
 - Also copy `win32helpers/` from `win32port/`
 - `mbedtls_wrapper/include/platform/ssl_port.h` has a small change to check for OSX and FreeBSD (missing `malloc.h`).
   The bug is fixed in upstream master via `LWS_HAVE_MALLOC_H`, but not in the 2.4.1 branch (as the file structure has changed).
-- You might need to apply the patch in `thirdparty/lws/mbedtls_verify.diff` (port of PR 1215) to future `2.4.x` releases if it does not get cherry picked.
+- You might need to apply the patch in `thirdparty/libwebsockets/mbedtls_verify.diff` (port of PR 1215) to future `2.4.x` releases if it does not get cherry picked.
 
 Important: `lws_config.h` and `lws_config_private.h` contains custom
 Godot build configurations, check them out when updating.
 
-## mbedTLS
+
+## mbedtls
 
 - Upstream: https://tls.mbed.org/
 - Version: 2.8.0
@@ -264,6 +268,7 @@ File extracted from upstream release tarball `mbedtls-2.8.0-apache.tgz`:
   Be sure to check the Godot addition to only redfine it when undefined or `< 0x0501` (PRed upstream).
 - Applied the patch in `thirdparty/mbedtls/1453.diff` (PR 1453). Soon to be merged upstream. Check it out at next update.
 
+
 ## miniupnpc
 
 - Upstream: https://github.com/miniupnp/miniupnp/tree/master/miniupnpc
@@ -272,6 +277,7 @@ File extracted from upstream release tarball `mbedtls-2.8.0-apache.tgz`:
 
 The only modified file is miniupnpcstrings.h, which was created for Godot (is usually autogenerated by cmake).
 
+
 ## minizip
 
 - Upstream: http://www.zlib.net
@@ -301,6 +307,10 @@ Collection of single-file libraries used in Godot components.
   * Upstream: http://episec.com/people/edelkind/c.html
   * Version: latest, as of April 2017
   * License: Public Domain
+ - `clipper.{cpp,hpp}`
+  * Upstream: https://sourceforge.net/projects/polyclipping
+  * Version: 6.4.2
+  * License: BSL-1.0
 - `fastlz.{c,h}`
   * Upstream: https://github.com/ariya/FastLZ
   * Version: git (f121734, 2007)
@@ -369,6 +379,7 @@ Files extracted from the upstream source:
 - All .h files in `src/`
 - LICENSE.txt
 
+
 ## opus
 
 - Upstream: https://opus-codec.org

thirdparty/lws/mbedtls_verify.diff → thirdparty/libwebsockets/mbedtls_verify.diff

-diff --git a/thirdparty/lws/client/ssl-client.c b/thirdparty/lws/client/ssl-client.c
+diff --git a/thirdparty/libwebsockets/client/ssl-client.c b/thirdparty/libwebsockets/client/ssl-client.c
 index 6626e0844..962c6e3cb 100644
---- a/thirdparty/lws/client/ssl-client.c
-+++ b/thirdparty/lws/client/ssl-client.c
+--- a/thirdparty/libwebsockets/client/ssl-client.c
++++ b/thirdparty/libwebsockets/client/ssl-client.c
 @@ -176,11 +176,7 @@ lws_ssl_client_bio_create(struct lws *wsi)
  #endif
  #else
@@ -15,10 +15,10 @@ index 6626e0844..962c6e3cb 100644
  #else
  #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
  	SSL_set_tlsext_host_name(wsi->ssl, hostname);
-diff --git a/thirdparty/lws/mbedtls_wrapper/platform/ssl_pm.c b/thirdparty/lws/mbedtls_wrapper/platform/ssl_pm.c
+diff --git a/thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_pm.c b/thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_pm.c
 index 63504919c..4e3d61109 100644
---- a/thirdparty/lws/mbedtls_wrapper/platform/ssl_pm.c
-+++ b/thirdparty/lws/mbedtls_wrapper/platform/ssl_pm.c
+--- a/thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_pm.c
++++ b/thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_pm.c
 @@ -218,7 +218,7 @@ static int ssl_pm_reload_crt(SSL *ssl)
      struct x509_pm *crt_pm = (struct x509_pm *)ssl->cert->x509->x509_pm;
  

thirdparty/mbedtls/LICENSE

+Unless specifically indicated otherwise in a file, files are licensed
+under the Apache 2.0 license, as can be found in: apache-2.0.txt