diff --git a/src/licensedcode/data/licenses/lbnl-bsd.LICENSE b/src/licensedcode/data/licenses/lbnl-bsd.LICENSE index 87ee6ccb434..c0a29a19efc 100644 --- a/src/licensedcode/data/licenses/lbnl-bsd.LICENSE +++ b/src/licensedcode/data/licenses/lbnl-bsd.LICENSE @@ -9,17 +9,8 @@ spdx_license_key: BSD-3-Clause-LBNL other_urls: - https://fedoraproject.org/wiki/Licensing/LBNLBSD minimum_coverage: 90 -ignorable_copyrights: - - Copyright (c) 2003, The Regents of the University of California, through Lawrence Berkeley - National Laboratory -ignorable_holders: - - The Regents of the University of California, through Lawrence Berkeley National Laboratory --- -Copyright (c) 2003, The Regents of the University of California, through -Lawrence Berkeley National Laboratory (subject to receipt of any required -approvals from the U.S. Dept. of Energy). All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/src/licensedcode/data/rules/lbnl-bsd_13.RULE b/src/licensedcode/data/rules/lbnl-bsd_13.RULE new file mode 100644 index 00000000000..a5c4245b52b --- /dev/null +++ b/src/licensedcode/data/rules/lbnl-bsd_13.RULE @@ -0,0 +1,50 @@ +--- +license_expression: lbnl-bsd +is_license_text: yes +ignorable_copyrights: + - Copyright (c) 2003, The Regents of the University of California, through Lawrence Berkeley + National Laboratory +ignorable_holders: + - The Regents of the University of California, through Lawrence Berkeley National Laboratory +--- + +Copyright (c) 2003, The Regents of the University of California, through +Lawrence Berkeley National Laboratory (subject to receipt of any required +approvals from the U.S. Dept. of Energy). All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +(1) Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +(2) 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. + +(3) Neither the name of the University of California, Lawrence Berkeley National +Laboratory, U.S. Dept. of Energy 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. + +You are under no obligation whatsoever to provide any bug fixes, patches, +or upgrades to the features, functionality or performance of the source code +("Enhancements") to anyone; however, if you choose to make your Enhancements +available either publicly, or directly to Lawrence Berkeley National Laboratory, +without imposing a separate written license agreement for such Enhancements, +then you hereby grant the following license: a non-exclusive, royalty-free +perpetual license to install, use, modify, prepare derivative works, incorporate +into other computer software, distribute, and sublicense such Enhancements +or derivative works thereof, in binary and source code form. \ No newline at end of file diff --git a/src/licensedcode/data/rules/lbnl-bsd_2.RULE b/src/licensedcode/data/rules/lbnl-bsd_2.RULE index a1d092d546f..c6d9bdc70f8 100644 --- a/src/licensedcode/data/rules/lbnl-bsd_2.RULE +++ b/src/licensedcode/data/rules/lbnl-bsd_2.RULE @@ -1,6 +1,7 @@ --- license_expression: lbnl-bsd is_license_text: yes +is_deprecated: yes relevance: 100 ---