Correct license mappings for Alpine

We were missing out certain openssl exception

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

Author: pombredanne

src/packagedcode/alpine.py

@@ -1442,6 +1442,7 @@ def normalize_and_cleanup_declared_license(declared):
         '(gpl-2.0-only with licenseref-scancode-generic-exception '
         'and lgpl-2.1-or-later with licenseref-scancode-generic-exception)',
 
+    # seen in https://github.com/alpinelinux/aports/blob/6052f331b316cf5366bd3db02af8400e9a34ab59/main/haproxy/APKBUILD
     '(gpl-2.0-or-later and gpl-2.1-or-later) with openssl-exception':
         '(gpl-2.0-or-later with licenseref-scancode-generic-exception '
         'and lgpl-2.1-or-later with licenseref-scancode-generic-exception)',
@@ -1647,7 +1648,7 @@ def apply_syntax_fixes(s):
 
     # "with" mishaps
     'gpl-2.0 with classpath': 'gpl-2.0 with classpath-exception-2.0',
-    'gpl-2.0-only with openssl-exception': 'pl-2.0-only with licenseref-scancode-openssl-exception-gpl-2.0',
+    'gpl-2.0-only with openssl-exception': 'gpl-2.0-only with licenseref-scancode-openssl-exception-gpl-2.0-plus',
     'gpl-2.0-or-later with openssl-exception': 'gpl-2.0-or-later with licenseref-scancode-openssl-exception-gpl-2.0-plus',
 
     'gpl-3.0-only with openssl-exception': 'gpl-3.0-only with licenseref-scancode-openssl-exception-gpl-3.0-plus',

tests/packagedcode/data/alpine/licenses/alp-3.14-community-clamav.yml

@@ -1,2 +1,2 @@
 declared_license: GPL-2.0-only WITH OpenSSL-Exception
-license_expression: gpl-2.0
+license_expression: gpl-2.0 WITH openssl-exception-gpl-2.0-plus

tests/packagedcode/data/alpine/licenses/alp-3.14-testing-ossec-hids-local.yml

@@ -1,2 +1,2 @@
 declared_license: GPL-2.0-only WITH openssl-exception
-license_expression: gpl-2.0
+license_expression: gpl-2.0 WITH openssl-exception-gpl-2.0-plus

tests/packagedcode/data/alpine/licenses/clamav.yml

@@ -0,0 +1,2 @@
+declared_license: GPL-2.0-only WITH OpenSSL-Exception
+license_expression: gpl-2.0 with openssl-exception-gpl-2.0-plus

tests/packagedcode/data/alpine/licenses/cryptsetup.yml

@@ -0,0 +1,2 @@
+declared_license: GPL-2.0-or-later WITH OpenSSL-Exception
+license_expression: gpl-2.0-plus with openssl-exception-gpl-2.0-plus

tests/packagedcode/data/alpine/licenses/haproxy.yml

@@ -0,0 +1,2 @@
+declared_license: (GPL-2.0-or-later AND GPL-2.1-or-later) WITH OpenSSL-Exception
+license_expression: gpl-2.0-plus with generic-exception and lgpl-2.1-plus with generic-exception

tests/packagedcode/test_alpine_license.py

@@ -117,11 +117,7 @@ def closure_test_function(*args, **kwargs):
             license_test.dump()
             return
 
-        if detected != license_test.license_expression:
-            # On failure, we compare against more result data to get additional
-            # failure details, including the test_file
-            expected = [license_test.to_dict(), f'file://{license_test.data_file}']
-            raise Exception(expected, saneyaml.dump(_license_detections))
+        assert detected  == license_test.license_expression
 
     return closure_test_function