From 84dc7ad6be8f65f2ec31d59c160e82ea613a1618 Mon Sep 17 00:00:00 2001 From: Manoj Gowda Date: Mon, 24 Aug 2026 11:15:55 +0530 Subject: [PATCH] Use agpl-generic-additional-terms for SugarCRM AGPL notice rules The two agpl-3.0_and_other-copyleft rules match the SugarCRM Tidbit license notice, which adds extra permissions and terms under sections 7(a) and 7(b) of the AGPL-3.0. These are exactly the kind of one-off AGPL section 7 terms that the agpl-generic-additional-terms license exception is meant to capture, so use agpl-3.0 WITH agpl-generic-additional-terms instead of agpl-3.0 AND other-copyleft, consistent with the existing agpl-3.0_with_agpl-generic-additional-terms rules. The rule files are renamed to match their new license expression. Reference: https://github.com/aboutcode-org/scancode-toolkit/issues/5274 Signed-off-by: Manoj Gowda --- ...RULE => agpl-3.0_with_agpl-generic-additional-terms_36.RULE} | 2 +- ...RULE => agpl-3.0_with_agpl-generic-additional-terms_37.RULE} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/licensedcode/data/rules/{agpl-3.0_and_other-copyleft_1.RULE => agpl-3.0_with_agpl-generic-additional-terms_36.RULE} (96%) rename src/licensedcode/data/rules/{agpl-3.0_and_other-copyleft_2.RULE => agpl-3.0_with_agpl-generic-additional-terms_37.RULE} (96%) diff --git a/src/licensedcode/data/rules/agpl-3.0_and_other-copyleft_1.RULE b/src/licensedcode/data/rules/agpl-3.0_with_agpl-generic-additional-terms_36.RULE similarity index 96% rename from src/licensedcode/data/rules/agpl-3.0_and_other-copyleft_1.RULE rename to src/licensedcode/data/rules/agpl-3.0_with_agpl-generic-additional-terms_36.RULE index c40696ed42d..98293aad4d3 100644 --- a/src/licensedcode/data/rules/agpl-3.0_and_other-copyleft_1.RULE +++ b/src/licensedcode/data/rules/agpl-3.0_with_agpl-generic-additional-terms_36.RULE @@ -1,5 +1,5 @@ --- -license_expression: agpl-3.0 AND other-copyleft +license_expression: agpl-3.0 WITH agpl-generic-additional-terms is_license_notice: yes notes: See https://github.com/sugarcrm/Tidbit/blob/master/LICENSE ignorable_urls: diff --git a/src/licensedcode/data/rules/agpl-3.0_and_other-copyleft_2.RULE b/src/licensedcode/data/rules/agpl-3.0_with_agpl-generic-additional-terms_37.RULE similarity index 96% rename from src/licensedcode/data/rules/agpl-3.0_and_other-copyleft_2.RULE rename to src/licensedcode/data/rules/agpl-3.0_with_agpl-generic-additional-terms_37.RULE index d23be16b5a3..860f4f04ad5 100644 --- a/src/licensedcode/data/rules/agpl-3.0_and_other-copyleft_2.RULE +++ b/src/licensedcode/data/rules/agpl-3.0_with_agpl-generic-additional-terms_37.RULE @@ -1,5 +1,5 @@ --- -license_expression: agpl-3.0 AND other-copyleft +license_expression: agpl-3.0 WITH agpl-generic-additional-terms is_license_notice: yes relevance: 100 notes: See https://github.com/sugarcrm/Tidbit/blob/master/LICENSE