From 10b9e1f47db7e68df62ab845cb4e5d70ac4ee467 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Thu, 11 Oct 2012 12:16:58 -0500 Subject: [PATCH] Change noVNC license to from LGPLv3 to MPL 2.0 The MPL 2.0 license is a "file-level" copyleft license vs the "project-level" nature of the L/GPL. The intention of noVNC has always been that it should be easy to incorporate into existing projects and sites whether free/open or proprietary/commercial. The MPL 2.0 is designed for this sort of combination project but still requires that any distributed modifications to noVNC source files must also be published under the same license. In addition, the MPL 2.0 allows the code to be used in L/GPL projects (the secondary license clause). This means that any projects that are already incorporating noVNC should not be impacted by this change and in fact it should clarify the licensing situation (the exact application of the L/GPL to web applications and interpreted code is somewhat ambiguous). The HTML, CSS, image and font files continue to be under more permissive licenses (see LICENSE.txt). The included websockify python code remains under a LGPLv3 license although the include/websock.js file from the websockify component is now under MPL 2.0 as well. Permission was received from other noVNC authors to make this change to their code license on the following dates: - Chris Gordon (UI): Jun 24, 2012 - Antoine Mercadal (DOM,*util.js): Oct 10, 2012 - William Lightning (UltraVNC repeater): Oct 10, 2012 - Mike Tinglof (tight encoding): Oct 15, 2012 --- LICENSE.txt | 25 ++++++++++++------------- README.md | 2 +- debian/copyright | 39 ++++++++++++++++++++------------------- include/base.css | 2 +- include/black.css | 4 ++-- include/blue.css | 4 ++-- include/display.js | 2 +- include/input.js | 4 ++-- include/playback.js | 2 +- include/rfb.js | 2 +- include/ui.js | 2 +- include/util.js | 2 +- include/vnc.js | 2 +- include/websock.js | 2 +- include/webutil.js | 2 +- tests/arrays.js | 4 ++-- utils/img2js.py | 2 +- utils/json2graph.py | 2 +- utils/rebind.c | 2 +- vnc.html | 2 +- vnc_auto.html | 2 +- 21 files changed, 55 insertions(+), 55 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 7705615..c5aa505 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,7 +1,7 @@ noVNC is Copyright (C) 2011 Joel Martin -The noVNC core library is licensed under the LGPLv3 (GNU Lesser -General Public License). The noVNC core library is composed of the +The noVNC core library files are licensed under the MPL 2.0 (Mozilla +Public License 2.0). The noVNC core library is composed of the Javascript code necessary for full noVNC operation. This includes (but is not limited to): @@ -36,21 +36,15 @@ The HTML, CSS, font and image files are licensed as follows: images/ : Creative Commons Attribution-ShareAlike http://creativecommons.org/licenses/by-sa/3.0/ -In addition the following file, which is part of the noVNC core -library, may be licensed under either the LGPL-2, LGPL-3 or MPL 2.0 -when it used separately from the noVNC core library. - - include/input.js : LGPL-2 or any later version - Some portions of noVNC are copyright to their individual authors. Please refer to the individual source files and/or to the noVNC commit history: https://github.com/kanaka/noVNC/commits/master The are several files and projects that have been incorporated into the noVNC core library. Here is a list of those files and the original -licenses (all LGPL-3 compatible): +licenses (all MPL 2.0 compatible): - include/base64.js : MPL 1.1, GPL-2 or LGPL-2.1 + include/base64.js : MPL 2.0 include/des.js : Various BSD style licenses @@ -62,21 +56,26 @@ licenses (all LGPL-3 compatible): include/chrome-app/tcp-stream.js : Apache 2.0 license + utils/websockify + utils/websocket.py : LGPL 3 + The following license texts are included: + docs/LICENSE.MPL-2.0 docs/LICENSE.LGPL-3 and docs/LICENSE.GPL-3 docs/LICENSE.OFL-1.1 docs/LICENSE.BSD-3-Clause (New BSD) docs/LICENSE.BSD-2-Clause (Simplified BSD / FreeBSD) docs/LICENSE.zlib - docs/LICENSE.MPL-2.0 docs/LICENSE.Apache-2.0 Or alternatively the license texts may be found here: + http://www.mozilla.org/MPL/2.0/ http://www.gnu.org/licenses/lgpl.html and http://www.gnu.org/licenses/gpl.html http://scripts.sil.org/OFL - http://www.mozilla.org/MPL/1.1/ - http://www.mozilla.org/MPL/2.0/ + http://en.wikipedia.org/wiki/BSD_licenses + http://www.gzip.org/zlib/zlib_license.html + http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/README.md b/README.md index cfdac8f..538324f 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Nets](http://www.nothingbutnets.net/), etc. * Clipboard copy/paste * Clipping or scolling modes for large remote screens * Easy site integration and theming (3 example themes included) -* Licensed under the [LGPLv3](http://www.gnu.org/licenses/lgpl.html) +* Licensed under the [MPL 2.0](http://www.mozilla.org/MPL/2.0/) ### Screenshots diff --git a/debian/copyright b/debian/copyright index 79444eb..db00fa1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,35 +2,36 @@ Upstream Project: https://github.com/kanaka/noVNC/ --------------------- Original LICENSE.txt --------------------------- -noVNC is Copyright (C) 2011 Joel Martin +noVNC is Copyright (C) 2012 Joel Martin Some portions of noVNC are copyright to their individual authors. Please refer to the individual source files and/or to the noVNC commit history: https://github.com/kanaka/noVNC/commits/master -noVNC is licensed under the LGPL (GNU Lesser General Public License) -version 3 with the following exceptions: +noVNC is licensed under the MPL 2.0 (Mozilla Public License) with the +following exceptions: - include/input.js : LGPL-2 or any later version - - include/base64.js : Dual GPL-2 or LGPL-2.1 - - incluee/des.js : Various BSD style licenses + *.html, *.css : 2-Clause BSD license - include/web-socket-js/ : New BSD license. Source code at - http://github.com/gimite/web-socket-js + include/Orbitron* : SIL Open Font License 1.1 + (Copyright 2009 Matt McInerney) images/ : Creative Commons Attribution-ShareAlike http://creativecommons.org/licenses/by-sa/3.0/ - Uses of the work must be attributed - to the noVNC project. + + include/base64.js : MPL 2.0 + + include/des.js : Various BSD style licenses + + include/jsunzip.js : zlib/libpng license + + include/web-socket-js/ : New BSD license (3-clause). Source code at + http://github.com/gimite/web-socket-js + + include/chrome-app/tcp-stream.js + : Apache 2.0 license ---------------------------------------------------------------------- -The LGPL-3 license text is located at: - /usr/share/common-licenses/LGPL-3 and - /usr/share/common-licenses/GPL-3 - -Or alternatively the LGPL-3 license text may be found here: - http://www.gnu.org/licenses/lgpl.html and - http://www.gnu.org/licenses/gpl.html +The MPL-2.0 license text may be found here: + http://www.mozilla.org/MPL/2.0/ diff --git a/include/base.css b/include/base.css index 3a2feb3..89b2b57 100644 --- a/include/base.css +++ b/include/base.css @@ -1,7 +1,7 @@ /* * noVNC base CSS * Copyright (C) 2012 Joel Martin - * noVNC is licensed under the LGPL-3 (see LICENSE.txt) + * noVNC is licensed under the MPL 2.0 (see LICENSE.txt) * This file is licensed under the 2-Clause BSD license (see LICENSE.txt). */ diff --git a/include/black.css b/include/black.css index e958ee3..351f7b2 100644 --- a/include/black.css +++ b/include/black.css @@ -1,7 +1,7 @@ /* - * noVNC base CSS + * noVNC black CSS * Copyright (C) 2012 Joel Martin - * noVNC is licensed under the LGPL-3 (see LICENSE.txt) + * noVNC is licensed under the MPL 2.0 (see LICENSE.txt) * This file is licensed under the 2-Clause BSD license (see LICENSE.txt). */ diff --git a/include/blue.css b/include/blue.css index 3dad0b4..6fff89a 100644 --- a/include/blue.css +++ b/include/blue.css @@ -1,7 +1,7 @@ /* - * noVNC base CSS + * noVNC blue CSS * Copyright (C) 2012 Joel Martin - * noVNC is licensed under the LGPL-3 (see LICENSE.txt) + * noVNC is licensed under the MPL 2.0 (see LICENSE.txt) * This file is licensed under the 2-Clause BSD license (see LICENSE.txt). */ diff --git a/include/display.js b/include/display.js index 5ad99ba..04b5d3f 100644 --- a/include/display.js +++ b/include/display.js @@ -1,7 +1,7 @@ /* * noVNC: HTML5 VNC client * Copyright (C) 2012 Joel Martin - * Licensed under LGPL-3 (see LICENSE.txt) + * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. */ diff --git a/include/input.js b/include/input.js index 9298dfe..5aad153 100644 --- a/include/input.js +++ b/include/input.js @@ -1,7 +1,7 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2011 Joel Martin - * Licensed under LGPL-2 or any later version (see LICENSE.txt) + * Copyright (C) 2012 Joel Martin + * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ /*jslint browser: true, white: false, bitwise: false */ diff --git a/include/playback.js b/include/playback.js index a21c7b6..549eb8d 100644 --- a/include/playback.js +++ b/include/playback.js @@ -1,7 +1,7 @@ /* * noVNC: HTML5 VNC client * Copyright (C) 2012 Joel Martin - * Licensed under LGPL-3 (see LICENSE.LGPL-3) + * Licensed under MPL 2.0 (see LICENSE.txt) */ "use strict"; diff --git a/include/rfb.js b/include/rfb.js index f715835..f739574 100644 --- a/include/rfb.js +++ b/include/rfb.js @@ -1,7 +1,7 @@ /* * noVNC: HTML5 VNC client * Copyright (C) 2012 Joel Martin - * Licensed under LGPL-3 (see LICENSE.txt) + * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. * diff --git a/include/ui.js b/include/ui.js index 686853c..44e9162 100644 --- a/include/ui.js +++ b/include/ui.js @@ -1,7 +1,7 @@ /* * noVNC: HTML5 VNC client * Copyright (C) 2012 Joel Martin - * Licensed under LGPL-3 (see LICENSE.txt) + * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. */ diff --git a/include/util.js b/include/util.js index 57ccb54..fc9242e 100644 --- a/include/util.js +++ b/include/util.js @@ -1,7 +1,7 @@ /* * noVNC: HTML5 VNC client * Copyright (C) 2012 Joel Martin - * Licensed under LGPL-3 (see LICENSE.txt) + * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. */ diff --git a/include/vnc.js b/include/vnc.js index 435fdc4..bb4c3ad 100644 --- a/include/vnc.js +++ b/include/vnc.js @@ -1,7 +1,7 @@ /* * noVNC: HTML5 VNC client * Copyright (C) 2012 Joel Martin - * Licensed under LGPL-3 (see LICENSE.txt) + * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. */ diff --git a/include/websock.js b/include/websock.js index ccb7d4c..87d6e8c 100644 --- a/include/websock.js +++ b/include/websock.js @@ -1,7 +1,7 @@ /* * Websock: high-performance binary WebSockets * Copyright (C) 2012 Joel Martin - * Licensed under LGPL-3 (see LICENSE.txt) + * Licensed under MPL 2.0 (see LICENSE.txt) * * Websock is similar to the standard WebSocket object but Websock * enables communication with raw TCP sockets (i.e. the binary stream) diff --git a/include/webutil.js b/include/webutil.js index e9ca9ac..ebf8e89 100644 --- a/include/webutil.js +++ b/include/webutil.js @@ -1,7 +1,7 @@ /* * noVNC: HTML5 VNC client * Copyright (C) 2012 Joel Martin - * Licensed under LGPL-3 (see LICENSE.txt) + * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. */ diff --git a/tests/arrays.js b/tests/arrays.js index 5f6a8c4..69da7fb 100644 --- a/tests/arrays.js +++ b/tests/arrays.js @@ -1,7 +1,7 @@ /* * Javascript binary array performance tests - * Copyright (C) 2011 Joel Martin - * Licensed under LGPL-3 (see LICENSE.txt) + * Copyright (C) 2012 Joel Martin + * Licensed under MPL 2.0 (see LICENSE.txt) */ var ctx, i, j, randlist, diff --git a/utils/img2js.py b/utils/img2js.py index 3ba4598..4d21342 100755 --- a/utils/img2js.py +++ b/utils/img2js.py @@ -3,7 +3,7 @@ # # Convert image to Javascript compatible base64 Data URI # Copyright 2011 Joel Martin -# Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3) +# Licensed under MPL 2.0 (see docs/LICENSE.MPL-2.0) # import sys, base64 diff --git a/utils/json2graph.py b/utils/json2graph.py index 0f6a7ad..f9ae27d 100755 --- a/utils/json2graph.py +++ b/utils/json2graph.py @@ -3,7 +3,7 @@ ''' Use matplotlib to generate performance charts Copyright 2011 Joel Martin -Licensed under GPL version 3 (see docs/LICENSE.GPL-3) +Licensed under MPL-2.0 (see docs/LICENSE.MPL-2.0) ''' # a bar plot with errorbars diff --git a/utils/rebind.c b/utils/rebind.c index c7e83de..caed616 100644 --- a/utils/rebind.c +++ b/utils/rebind.c @@ -1,7 +1,7 @@ /* * rebind: Intercept bind calls and bind to a different port * Copyright 2010 Joel Martin - * Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3) + * Licensed under MPL-2.0 (see docs/LICENSE.MPL-2.0) * * Overload (LD_PRELOAD) bind system call. If REBIND_PORT_OLD and * REBIND_PORT_NEW environment variables are set then bind on the new diff --git a/vnc.html b/vnc.html index a071512..9c3ced2 100644 --- a/vnc.html +++ b/vnc.html @@ -5,7 +5,7 @@ noVNC diff --git a/vnc_auto.html b/vnc_auto.html index f5d2825..2434d97 100644 --- a/vnc_auto.html +++ b/vnc_auto.html @@ -3,7 +3,7 @@