From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1590833-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C779158ADC for <garchives@archives.gentoo.org>; Mon, 15 Jan 2024 09:17:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21023E29DD; Mon, 15 Jan 2024 09:17:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1A60E29DD for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jan 2024 09:17:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE50734324C for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jan 2024 09:17:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F34A14B1 for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jan 2024 09:17:45 +0000 (UTC) From: "Ulrich Müller" <ulm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org> Message-ID: <1705310205.df2c9c7c6aeb3f78102d0b82922c595d7d4876ed.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: licenses/ X-VCS-Repository: repo/gentoo X-VCS-Files: licenses/BSD-2-with-patent X-VCS-Directories: licenses/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: df2c9c7c6aeb3f78102d0b82922c595d7d4876ed X-VCS-Branch: master Date: Mon, 15 Jan 2024 09:17:45 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 92d68a63-ee0d-44c3-8de3-d3a21ecbbeff X-Archives-Hash: 239d1a157ece691c67a9a7a379342847 commit: df2c9c7c6aeb3f78102d0b82922c595d7d4876ed Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 15 09:14:05 2024 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon Jan 15 09:16:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2c9c7c licenses: Reformat BSD-2-with-patent Rewrap lines as in BSD-2 license, for easier comparison. Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> licenses/BSD-2-with-patent | 78 ++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 33 deletions(-) diff --git a/licenses/BSD-2-with-patent b/licenses/BSD-2-with-patent index 6ecef73b758b..12e5d2b41708 100644 --- a/licenses/BSD-2-with-patent +++ b/licenses/BSD-2-with-patent @@ -1,42 +1,54 @@ LICENSE - BSD+Patent SPDX short identifier: BSD-2-Clause-Patent -Note: This license is designed to provide: a) a simple permissive license; b) that is compatible with the GNU General -Public License (GPL), version 2; and c) which also has an express patent grant included. +Note: This license is designed to provide: a) a simple permissive license; +b) that is compatible with the GNU General Public License (GPL), version 2; +and c) which also has an express patent grant included. Copyright (c) <year>, <copyright holder> -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. - -Subject to the terms and conditions of this license, each copyright holder and contributor hereby grants to those -receiving rights under this license a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except -for failure to satisfy the conditions of this license) patent license to make, have made, use, offer to sell, sell, -import, and otherwise transfer this software, where such license applies only to those patent claims, already acquired -or hereafter acquired, licensable by such copyright holder or contributor that are necessarily infringed by: - -(a) their Contribution(s) (the licensed copyrights of copyright holders and non-copyrightable additions of contributors, -in source or binary form) alone; or - -(b) combination of their Contribution(s) with the work of authorship to which such Contribution(s) was added by such -copyright holder or contributor, if, at the time the Contribution is added, such addition causes such combination to be -necessarily infringed. The patent license shall not apply to any other combinations which include the Contribution. - -Except as expressly stated above, no rights or licenses from any copyright holder or contributor is granted under this -license, whether expressly, by implication, estoppel or otherwise. +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. + +Subject to the terms and conditions of this license, each copyright holder +and contributor hereby grants to those receiving rights under this license +a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except for failure to satisfy the conditions of this license) patent +license to make, have made, use, offer to sell, sell, import, and otherwise +transfer this software, where such license applies only to those patent +claims, already acquired or hereafter acquired, licensable by such +copyright holder or contributor that are necessarily infringed by: + +(a) their Contribution(s) (the licensed copyrights of copyright holders and + non-copyrightable additions of contributors, in source or binary form) + alone; or +(b) combination of their Contribution(s) with the work of authorship to + which such Contribution(s) was added by such copyright holder or + contributor, if, at the time the Contribution is added, such addition + causes such combination to be necessarily infringed. The patent license + shall not apply to any other combinations which include the + Contribution. + +Except as expressly stated above, no rights or licenses from any copyright +holder or contributor is granted under this license, whether expressly, by +implication, estoppel or otherwise. DISCLAIMER -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 HOLDERS 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. +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 HOLDERS 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.