Add new and improved license rules and tests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

src/licensedcode/data/rules/other-permissive_or_gpl-1.0-plus_2.RULE

@@ -0,0 +1,14 @@
+* Permission to use, copy, and modify this software with or without fee
+ * is hereby granted, provided that this entire notice is included in
+ * all copies of any software which is or includes a copy or
+ * modification of this software.
+ * You may use this code under the GNU public license if you so wish. Please
+ * contribute changes back to the authors under this freer than GPL license
+ * so that we may further the use of strong encryption without limitations to
+ * all.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
+ * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
+ * PURPOSE.

src/licensedcode/data/rules/other-permissive_or_gpl-1.0-plus_2.yml

@@ -0,0 +1,2 @@
+license_expression: other-permissive OR gpl-1.0-plus
+is_license_notice: yes

src/licensedcode/data/rules/other-permissive_or_gpl-1.0-plus_3.RULE

@@ -0,0 +1,15 @@
+Permission to use, copy, and modify this software with or without fee
+ is hereby granted, provided that this entire notice is included in
+ all copies of any software which is or includes a copy or
+ modification of this software.
+ .
+ You may use this code under GNU General Public License if you so wish. Please
+ contribute changes back to the authors under this freer than GPL license
+ so that we may further the use of strong encryption without limitations to
+ all.
+ .
+ THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+ IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
+ REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
+ MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
+ PURPOSE.

src/licensedcode/data/rules/other-permissive_or_gpl-1.0-plus_3.yml

@@ -0,0 +1,2 @@
+license_expression: other-permissive OR gpl-1.0-plus
+is_license_notice: yes

tests/licensedcode/data/datadriven/external/fossology-tests/Dual-license/AFL-2.1_or_GPL-2.0.txt.yml

@@ -1,4 +1,4 @@
 license_expressions:
-  - (afl-2.1 OR gpl-2.0) AND gpl-2.0
+  - afl-2.1 OR gpl-2.0-plus
   - afl-2.1
   - gpl-2.0

tests/licensedcode/data/datadriven/lic2/bsd-original-uc_and_gpl_and_gpl_and_gpl_and_other.txt.yml

@@ -3,5 +3,4 @@ license_expressions:
   - gpl-1.0-plus
   - bsd-original-uc
   - gpl-1.0-plus
-  - bsd-new
   - gpl-1.0-plus

tests/licensedcode/data/datadriven/lic4/qt_config.cpp

@@ -0,0 +1,4 @@
+license_expressions:
+    - qt-commercial-1.1 OR lgpl-2.1 WITH qt-company-exception-lgpl-2.1 OR lgpl-3.0 WITH
+        qt-company-exception-lgpl-2.1
+

tests/licensedcode/data/datadriven/lic4/qt_config.cpp.yml

@@ -1,7 +1,7 @@
 [
   [
     "SPDX-License-Identifier:  BSD-2-Clause",
-    4,
-    9
+    5,
+    10
   ]
 ]