From e271fa015a355a3610e95ba6f6699600930343ce Mon Sep 17 00:00:00 2001 From: sanana Date: Tue, 11 Mar 2025 17:20:55 +0300 Subject: [PATCH] Rename bsd-no-disclaimer-unmodified to *-axis-* This license seems to be a variant of the BSD-Axis license, not a variant of the BSD-2-Clause license. This patch fixes it by renaming the license identifier to reflect reality. Signed-off-by: sanana --- ...CENSE => bsd-axis-no-disclaimer-unmodified.LICENSE} | 10 +++++----- ...axis-no-disclaimer-unmodified_or_gpl-2.0-plus.RULE} | 4 ++-- tests/licensedcode/data/datadriven/lic2/arm_math.c.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) rename src/licensedcode/data/licenses/{bsd-no-disclaimer-unmodified.LICENSE => bsd-axis-no-disclaimer-unmodified.LICENSE} (73%) rename src/licensedcode/data/rules/{bsd-no-disclaimer-unmodified_or_gpl-2.0-plus.RULE => bsd-axis-no-disclaimer-unmodified_or_gpl-2.0-plus.RULE} (89%) diff --git a/src/licensedcode/data/licenses/bsd-no-disclaimer-unmodified.LICENSE b/src/licensedcode/data/licenses/bsd-axis-no-disclaimer-unmodified.LICENSE similarity index 73% rename from src/licensedcode/data/licenses/bsd-no-disclaimer-unmodified.LICENSE rename to src/licensedcode/data/licenses/bsd-axis-no-disclaimer-unmodified.LICENSE index 03c2654c73..b8ca05bc46 100644 --- a/src/licensedcode/data/licenses/bsd-no-disclaimer-unmodified.LICENSE +++ b/src/licensedcode/data/licenses/bsd-axis-no-disclaimer-unmodified.LICENSE @@ -1,12 +1,12 @@ --- -key: bsd-no-disclaimer-unmodified -short_name: BSD-2-Clause no disclaimer Unmod -name: BSD-2-Clause without Warranty Disclaimer with Unmodified requirement +key: bsd-axis-no-disclaimer-unmodified +short_name: BSD-Axis no disclaimer Unmod +name: BSD-Axis without Warranty Disclaimer with Unmodified requirement category: Permissive owner: Unspecified notes: A rare variant that comes with a slightly different wording and no warranty disclaimer and the words "without modifications" applying to the license conditions -spdx_license_key: LicenseRef-scancode-bsd-no-disclaimer-unmodified +spdx_license_key: LicenseRef-scancode-bsd-axis-no-disclaimer-unmodified --- * Redistribution and use in source and binary forms, with or without @@ -15,4 +15,4 @@ spdx_license_key: LicenseRef-scancode-bsd-no-disclaimer-unmodified * 1. Redistributions of source code must retain the above copyright * notice and this list of conditions, without modification. * 2. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. \ No newline at end of file + * derived from this software without specific prior written permission. diff --git a/src/licensedcode/data/rules/bsd-no-disclaimer-unmodified_or_gpl-2.0-plus.RULE b/src/licensedcode/data/rules/bsd-axis-no-disclaimer-unmodified_or_gpl-2.0-plus.RULE similarity index 89% rename from src/licensedcode/data/rules/bsd-no-disclaimer-unmodified_or_gpl-2.0-plus.RULE rename to src/licensedcode/data/rules/bsd-axis-no-disclaimer-unmodified_or_gpl-2.0-plus.RULE index 404f5049f1..4ccc623670 100644 --- a/src/licensedcode/data/rules/bsd-no-disclaimer-unmodified_or_gpl-2.0-plus.RULE +++ b/src/licensedcode/data/rules/bsd-axis-no-disclaimer-unmodified_or_gpl-2.0-plus.RULE @@ -1,5 +1,5 @@ --- -license_expression: bsd-no-disclaimer-unmodified OR gpl-2.0-plus +license_expression: bsd-axis-no-disclaimer-unmodified OR gpl-2.0-plus is_license_notice: yes minimum_coverage: 90 --- @@ -14,4 +14,4 @@ minimum_coverage: 90 * * Alternatively, this software may be distributed under the terms of the * GNU General Public License as published by the Free Software Foundation; - * either version 2 of the License, or (at your option) any later version. \ No newline at end of file + * either version 2 of the License, or (at your option) any later version. diff --git a/tests/licensedcode/data/datadriven/lic2/arm_math.c.yml b/tests/licensedcode/data/datadriven/lic2/arm_math.c.yml index 87aca5bb9a..67b83dedfb 100644 --- a/tests/licensedcode/data/datadriven/lic2/arm_math.c.yml +++ b/tests/licensedcode/data/datadriven/lic2/arm_math.c.yml @@ -1,2 +1,2 @@ license_expressions: - - bsd-no-disclaimer-unmodified OR gpl-2.0-plus + - bsd-axis-no-disclaimer-unmodified OR gpl-2.0-plus