Merge branch 'develop' into license-rules-update-fall-2023-1

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

src/licensedcode/data/rules/false-positive_710.RULE

@@ -1,10 +1,6 @@
 ---
 is_false_positive: yes
-notes: this is not a license. Seen in https://github.com/liferay/liferay-portal/blob/00334ca6f9fb4d92f5e98c225b104f095ee8b21e/definitions/liferay-plugin-package_7_3_0.properties#L75C1-L83
+notes: seen in opentofu
 ---
 
-licenses=
-    #licenses=AGPL
-    #licenses=CCA
-    #licenses=GPL
-    #licenses=LGPL
+The options passed to this function may not be modified

src/licensedcode/data/rules/false-positive_737.RULE

@@ -0,0 +1,10 @@
+---
+is_false_positive: yes
+notes: this is not a license. Seen in https://github.com/liferay/liferay-portal/blob/00334ca6f9fb4d92f5e98c225b104f095ee8b21e/definitions/liferay-plugin-package_7_3_0.properties#L75C1-L83
+---
+
+licenses=
+    #licenses=AGPL
+    #licenses=CCA
+    #licenses=GPL
+    #licenses=LGPL

src/licensedcode/data/rules/mpl-1.1_38.RULE

@@ -1,7 +1,7 @@
 ---
 license_expression: mpl-1.1
 is_license_tag: yes
-relevance: 90
+relevance: 80
 notes: tag as documented in the Module-Build pod
 ---
 

src/licensedcode/data/rules/mpl-2.0_133.RULE

@@ -1,13 +1,7 @@
 ---
 license_expression: mpl-2.0
-is_license_notice: yes
-ignorable_urls:
-    - https://www.mozilla.org/en-US/MPL/2.0/
-    - https://www.mozilla.org/en-US/MPL/2.0/FAQ
+is_license_reference: yes
 ---
 
-eigen NOTICE
-================================================================================
-Eigen is licensed under Mozilla Public License Version 2.0 (MPL 2.0). A MPL 2.0
-and FAQ's for MPL 2.0 can be found at: https://www.mozilla.org/en-US/MPL/2.0/
-and https://www.mozilla.org/en-US/MPL/2.0/FAQ/.
+## License
+{{[Mozilla Public License v2.0]}}

src/licensedcode/data/rules/mpl-2.0_137.RULE

@@ -0,0 +1,13 @@
+---
+license_expression: mpl-2.0
+is_license_notice: yes
+ignorable_urls:
+    - https://www.mozilla.org/en-US/MPL/2.0/
+    - https://www.mozilla.org/en-US/MPL/2.0/FAQ
+---
+
+eigen NOTICE
+================================================================================
+Eigen is licensed under Mozilla Public License Version 2.0 (MPL 2.0). A MPL 2.0
+and FAQ's for MPL 2.0 can be found at: https://www.mozilla.org/en-US/MPL/2.0/
+and https://www.mozilla.org/en-US/MPL/2.0/FAQ/.

src/licensedcode/data/rules/proprietary-license_276.RULE

@@ -1,6 +1,6 @@
 ---
 license_expression: proprietary-license
-is_license_reference: yes
+is_license_clue: yes
 relevance: 100
 is_deprecated: yes
 notes: deprecated because it is too generic and triggers noisy false positives

src/packagedcode/rpm.py

@@ -96,6 +96,9 @@ def __new__(self, version, release=None, epoch=None):
         note: the sort order of the named tuple is the sort order.
         But for creation we put the rarely used epoch last with a default to None.
         """
+
+        epoch = str(epoch) if epoch else ""
+
         if epoch and epoch.strip() and not epoch.isdigit():
             raise ValueError('Invalid epoch: must be a number or empty.')
         if not version:

tests/packagedcode/data/rpm/header/apache-commons-io-2.4-12.el7.noarch.rpm-expected.json

@@ -0,0 +1,19 @@
+{
+    "name": "apache-commons-io",
+    "epoch": "1",
+    "version": "2.4",
+    "release": "12.el7",
+    "arch": "noarch",
+    "os": "linux",
+    "summary": "Utilities to assist with developing IO functionality",
+    "description": null,
+    "distribution": null,
+    "vendor": "CentOS",
+    "license": "ASL 2.0",
+    "packager": "CentOS BuildSystem <http://bugs.centos.org>",
+    "group": "Unspecified",
+    "url": "http://commons.apache.org/io",
+    "source_rpm": "apache-commons-io-2.4-12.el7.src.rpm",
+    "dist_url": null,
+    "is_binary": true
+}

tests/packagedcode/test_rpm.py

@@ -391,3 +391,7 @@ def test_rpm_tags_xsetup_0_28_b1_src_rpm(self):
     def test_rpm_tags_zziplib_0_11_15_3sf_i586_rpm(self):
         test_file = self.get_test_loc('rpm/header/zziplib-0.11.15-3sf.i586.rpm')
         self.check_rpm_tags(test_file)
+
+    def test_rpm_tags_apache_commons_io_2_4_12_el7_noarch_rpm(self):
+        test_file = self.get_test_loc('rpm/header/apache-commons-io-2.4-12.el7.noarch.rpm')
+        self.check_rpm_tags(test_file)