From 94c9d20a33d357ede70b4d72cd2d679b75772fb6 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Mon, 21 Feb 2011 19:36:16 +0000 Subject: [PATCH] Make a written offer pointing to a central WordPress.org URL for obtaining the source to any binary programs included in WordPress, instead of relying on third party sites. Include the MIT license file that the swfupload project omitted from their codebase. fixes #16517 for trunk git-svn-id: http://svn.automattic.com/wordpress/trunk@17472 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- license.txt | 7 ++++++ wp-includes/js/swfupload/license.txt | 32 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 wp-includes/js/swfupload/license.txt diff --git a/license.txt b/license.txt index 5e6b5d5788..4ee132077d 100644 --- a/license.txt +++ b/license.txt @@ -279,3 +279,10 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS + +WRITTEN OFFER + +The source code for any program binaries that are included with WordPress +can be freely obtained at the following URL: + + http://wordpress.org/download/source/ diff --git a/wp-includes/js/swfupload/license.txt b/wp-includes/js/swfupload/license.txt new file mode 100644 index 0000000000..8252ca9e24 --- /dev/null +++ b/wp-includes/js/swfupload/license.txt @@ -0,0 +1,32 @@ +/** + * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com + * + * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/, http://www.vinterwebb.se/ + * + * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilzén and Mammon Media and is released under the MIT License: + * http://www.opensource.org/licenses/mit-license.php + * + * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License: + * http://www.opensource.org/licenses/mit-license.php + * + */ + +The MIT License + +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. \ No newline at end of file