From 708af0c7b96083209012e3bc715f7ac1f2d0711b Mon Sep 17 00:00:00 2001 From: Lemon Shi Date: Tue, 29 Sep 2020 18:41:30 -0700 Subject: [PATCH] Improve dual AFPL/GPL license detection #2242 1. Add a rule to match the 'dual AFPL/GPL license' 2. Add a false-positive rule for a text in package 'ghostscript'. See more here: https://github.com/nexB/scancode-toolkit/issues/2242#issuecomment-698371970 Signed-off-by: Lemon Shi --- src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_1.RULE | 1 + src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_1.yml | 3 +++ src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_2.RULE | 2 ++ src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_2.yml | 5 +++++ 4 files changed, 11 insertions(+) create mode 100644 src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_1.RULE create mode 100644 src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_1.yml create mode 100644 src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_2.RULE create mode 100644 src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_2.yml diff --git a/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_1.RULE b/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_1.RULE new file mode 100644 index 00000000000..d21905fe1a0 --- /dev/null +++ b/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_1.RULE @@ -0,0 +1 @@ +available under a dual AFPL/GPL license diff --git a/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_1.yml b/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_1.yml new file mode 100644 index 00000000000..ba0e0828341 --- /dev/null +++ b/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_1.yml @@ -0,0 +1,3 @@ +license_expression: afpl-9.0 OR gpl-1.0-plus +is_license_notice: yes +relevance: 90 diff --git a/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_2.RULE b/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_2.RULE new file mode 100644 index 00000000000..751a32a5ba4 --- /dev/null +++ b/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_2.RULE @@ -0,0 +1,2 @@ +Thanks to L. Peter Deutsch for making gdevdjet.c +and gdevdljm.[ch] available under a dual AFPL/GPL license. diff --git a/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_2.yml b/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_2.yml new file mode 100644 index 00000000000..47e81da0404 --- /dev/null +++ b/src/licensedcode/data/rules/afpl-9.0_or_gpl-1.0-plus_2.yml @@ -0,0 +1,5 @@ +license_expression: afpl-9.0 OR gpl-1.0-plus +is_license_reference: yes +is_false_positive: yes +relevance: 100 +notes: just a note of credit instead of a license. See https://github.com/nexB/scancode-toolkit/issues/2242#issuecomment-698371970