[gentoo-commits] repo/gentoo:master commit in: licenses/, metadata/

[gentoo-commits] repo/gentoo:master commit in: licenses/, metadata/

[Ulrich Müller]

commit:     9fc8ce567d9602686a6c3fa4f031bb93e80f2f7a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 09:38:45 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 09:38:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc8ce56

licenses: Add BUSL-1.1

Business Source License 1.1, text taken from:
https://spdx.org/licenses/BUSL-1.1.html

Bug: https://bugs.gentoo.org/912053
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 licenses/BUSL-1.1             | 76 +++++++++++++++++++++++++++++++++++++++++++
 metadata/license-mapping.conf |  1 +
 2 files changed, 77 insertions(+)

diff --git a/licenses/BUSL-1.1 b/licenses/BUSL-1.1
new file mode 100644
index 000000000000..bfaf8925493d
--- /dev/null
+++ b/licenses/BUSL-1.1
@@ -0,0 +1,76 @@
+Business Source License 1.1
+
+License text copyright © 2017 MariaDB Corporation Ab, All Rights
+Reserved. "Business Source License" is a trademark of MariaDB
+Corporation Ab.
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create
+derivative works, redistribute, and make non-production use of the
+Licensed Work. The Licensor may make an Additional Use Grant, above,
+permitting limited production use.
+
+Effective on the Change Date, or the fourth anniversary of the first
+publicly available distribution of a specific version of the Licensed
+Work under this License, whichever comes first, the Licensor hereby
+grants you rights under the terms of the Change License, and the rights
+granted in the paragraph above terminate.
+
+If your use of the Licensed Work does not comply with the requirements
+currently in effect as described in this License, you must purchase a
+commercial license from the Licensor, its affiliated entities, or
+authorized resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative
+works of the Licensed Work, are subject to this License. This License
+applies separately for each version of the Licensed Work and the Change
+Date may vary for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified
+copy of the Licensed Work. If you receive the Licensed Work in original
+or modified form from a third party, the terms and conditions set forth
+in this License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will
+automatically terminate your rights under this License for the current
+and all other versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of
+Licensor or its affiliates (provided that you may use a trademark or
+logo of Licensor as expressly required by this License).
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED
+ON AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND
+CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION)
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT, AND TITLE.
+
+
+MariaDB hereby grants you permission to use this License's text to
+license your works, and to refer to it using the trademark "Business
+Source License", as long as you comply with the Covenants of Licensor
+below.
+
+Covenants of Licensor
+
+In consideration of the right to use this License's text and the
+"Business Source License" name and trademark, Licensor covenants to
+MariaDB, and to all other recipients of the licensed work to be provided
+by Licensor:
+
+1. To specify as the Change License the GPL Version 2.0 or any later
+   version, or a license that is compatible with GPL Version 2.0 or a
+   later version, where "compatible" means that software provided under
+   the Change License can be included in a program with software
+   provided under GPL Version 2.0 or a later version. Licensor may
+   specify additional Change Licenses without limitation.
+
+2. To either: (a) specify an additional grant of rights to use that
+   does not impose any additional restriction on the right granted in
+   this License, as the Additional Use Grant; or (b) insert the text
+   "None".
+
+3. To specify a Change Date.
+
+4. Not to modify this License in any other way.

diff --git a/metadata/license-mapping.conf b/metadata/license-mapping.conf
index 440dd7421a97..8d18ccf62435 100644
--- a/metadata/license-mapping.conf
+++ b/metadata/license-mapping.conf
@@ -40,6 +40,7 @@ BSD-2-Clause = BSD-2
 BSD-3-Clause = BSD
 BSD-4-Clause = BSD-4
 BSL-1.0 = Boost-1.0
+BUSL-1.1 = BUSL-1.1
 bzip2-1.0.5 = BZIP2
 bzip2-1.0.6 = BZIP2
 CC-BY-2.0 = CC-BY-2.0

[gentoo-commits] repo/gentoo:master commit in: licenses/, metadata/

[Ulrich Müller]

commit:     06385cb277f1910c00555c64c467368d909735e2
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 09:01:12 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 09:01:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06385cb2

licenses: Drop BSD-2-with-views

This is the standard FreeBSD license aka BSD-2 that has been approved by
the FSF: https://directory.fsf.org/wiki/License:BSD-2-Clause-FreeBSD

Update mapping in license-mapping.conf accordingly.

It is unclear why SPDX has an extra identifier for this (which they list
as non-free).

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 licenses/BSD-2-with-views     | 28 ----------------------------
 metadata/license-mapping.conf |  4 ++--
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/licenses/BSD-2-with-views b/licenses/BSD-2-with-views
deleted file mode 100644
index ffb303569e2b..000000000000
--- a/licenses/BSD-2-with-views
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) <year>, <copyright holder>
-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.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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.
-
-The views and conclusions contained in the software and documentation are
-those of the authors and should not be interpreted as representing official
-policies, either expressed or implied, of the copyright holders or
-contributors.

diff --git a/metadata/license-mapping.conf b/metadata/license-mapping.conf
index 4d0e36a1afe6..1aab79508e92 100644
--- a/metadata/license-mapping.conf
+++ b/metadata/license-mapping.conf
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Mapping of SPDX-2.0 licenses to Gentoo repository licenses.
@@ -37,9 +37,9 @@ Artistic-2.0 = Artistic-2
 Beerware = BEER-WARE
 BSD-1-Clause = BSD-1
 BSD-2-Clause = BSD-2
+BSD-2-Clause-Views = BSD-2
 BSD-3-Clause = BSD
 BSD-4-Clause = BSD-4
-bsd-2-clause-views = BSD-2-with-views
 BSL-1.0 = Boost-1.0
 BUSL-1.1 = BUSL-1.1
 bzip2-1.0.5 = BZIP2