From 3604b79b88ed9816292916eb073d353e8160d22a Mon Sep 17 00:00:00 2001 From: Fred Emmott Date: Thu, 10 May 2018 08:57:28 -0700 Subject: [PATCH] Relicense to MIT --- CONTRIBUTING.md | 2 +- LICENSE | 51 ++++++++------------ PATENTS | 33 ------------- base/BuildChecker.php | 7 ++- base/DatabaseInstaller.php | 7 ++- base/HHVMDaemon.php | 7 ++- base/NginxDaemon.php | 8 +-- base/PHP5Daemon.php | 7 ++- base/PHPEngine.php | 7 ++- base/PerfOptions.php | 7 ++- base/PerfRunner.php | 7 ++- base/PerfSettings.php | 7 ++- base/PerfTarget.php | 7 ++- base/Process.php | 7 ++- base/RequestMode.php | 7 ++- base/Siege.php | 7 ++- base/SiegeFields.php | 7 ++- base/SiegeStats.php | 7 ++- base/SystemChecks.php | 8 +++ base/Utils.php | 7 ++- base/cli-init.php | 7 ++- base/config_check_base.php | 7 ++- base/hhvm_config_check.php | 7 ++- base/php-src_config_check.php | 7 ++- batch-run.php | 7 ++- json_to_csv.php | 8 +++ perf.php | 7 ++- targets/codeigniter/CodeIgniterTarget.php | 7 ++- targets/drupal7/Drupal7Target.php | 7 ++- targets/drupal8/Drupal8NoCacheTarget.php | 7 ++- targets/drupal8/Drupal8PageCacheTarget.php | 7 ++- targets/drupal8/Drupal8Target.php | 7 ++- targets/drupal8/settings/settings.php | 8 +++ targets/drupal8/settings/setup.php | 8 +++ targets/laravel4/Laravel4Target.php | 7 ++- targets/laravel5/Laravel5Target.php | 7 ++- targets/magento1/Magento1Target.php | 7 ++- targets/mediawiki/LocalSettings.php | 8 +++ targets/mediawiki/MediaWikiTarget.php | 7 ++- targets/sugarcrm/SugarCRMHomePageTarget.php | 7 ++- targets/sugarcrm/SugarCRMLoginPageTarget.php | 7 ++- targets/sugarcrm/SugarCRMTarget.php | 7 ++- targets/sugarcrm/config.php | 8 +++ targets/toys/FibonacciTarget.php | 7 ++- targets/toys/HelloWorldTarget.php | 7 ++- targets/toys/fibonacci.php | 7 ++- targets/toys/helloworld.php | 8 +++ targets/wordpress/WordpressTarget.php | 7 ++- targets/wordpress/wp-config.php | 8 +++ 49 files changed, 201 insertions(+), 216 deletions(-) delete mode 100644 PATENTS diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2159658..7fe6f44 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,4 +45,4 @@ outlined on that page and do not file a public issue. ## License By contributing to oss-performance, you agree that your contributions will be -licensed under its BSD license. +licensed under its MIT license. diff --git a/LICENSE b/LICENSE index 4d31576..d694cbf 100644 --- a/LICENSE +++ b/LICENSE @@ -4,33 +4,24 @@ notices inside the archives for details. ------ -BSD License - -For OSS benchmarking software - -Copyright (c) 2014, Facebook, Inc. 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 Facebook 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 HOLDER 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. +MIT License + +Copyright (c) 2014-present, Facebook, Inc. + +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/PATENTS b/PATENTS deleted file mode 100644 index 2568d6e..0000000 --- a/PATENTS +++ /dev/null @@ -1,33 +0,0 @@ -Additional Grant of Patent Rights Version 2 - -"Software" means the oss-performance software distributed by Facebook, Inc. - -Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software -("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable -(subject to the termination provision below) license under any Necessary -Claims, to make, have made, use, sell, offer to sell, import, and otherwise -transfer the Software. For avoidance of doubt, no license is granted under -Facebook’s rights in any patent claims that are infringed by (i) modifications -to the Software made by you or any third party or (ii) the Software in -combination with any software or other technology. - -The license granted hereunder will terminate, automatically and without notice, -if you (or any of your subsidiaries, corporate affiliates or agents) initiate -directly or indirectly, or take a direct financial interest in, any Patent -Assertion: (i) against Facebook or any of its subsidiaries or corporate -affiliates, (ii) against any party if such Patent Assertion arises in whole or -in part from any software, technology, product or service of Facebook or any of -its subsidiaries or corporate affiliates, or (iii) against any party relating -to the Software. Notwithstanding the foregoing, if Facebook or any of its -subsidiaries or corporate affiliates files a lawsuit alleging patent -infringement against you in the first instance, and you respond by filing a -patent infringement counterclaim in that lawsuit against that party that is -unrelated to the Software, the license granted hereunder will not terminate -under section (i) of this paragraph due to such counterclaim. - -A "Necessary Claim" is a claim of a patent owned by Facebook that is -necessarily infringed by the Software standing alone. - -A "Patent Assertion" is any lawsuit or other action alleging direct, indirect, -or contributory infringement or inducement to infringe any patent, including a -cross-claim or counterclaim. diff --git a/base/BuildChecker.php b/base/BuildChecker.php index 31103b9..dc0e8fc 100644 --- a/base/BuildChecker.php +++ b/base/BuildChecker.php @@ -1,11 +1,10 @@ string, diff --git a/perf.php b/perf.php index df65df1..c0a57d5 100644 --- a/perf.php +++ b/perf.php @@ -1,11 +1,10 @@ false, diff --git a/targets/toys/FibonacciTarget.php b/targets/toys/FibonacciTarget.php index ca52c5d..48e4189 100644 --- a/targets/toys/FibonacciTarget.php +++ b/targets/toys/FibonacciTarget.php @@ -1,11 +1,10 @@