Update synclic script and misc test expectations

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Author: AyanSinhaMahapatra

etc/scripts/licenses/synclic.py

@@ -1293,11 +1293,11 @@ def synchronize_licenses(
         else:
             # Create a new ScanCode license
             external_license.key = matching_key
-            scancode_license = external_license.dump(
+            external_license.dump(
                 licenses_data_dir=licensedcode.models.licenses_data_dir
             )
             added_to_scancode.add(matching_key)
-            scancodes_by_key[matching_key] = scancode_license
+            scancodes_by_key[matching_key] = external_license
             if TRACE:
                 print(
                     "External license key not in ScanCode:",
@@ -1327,9 +1327,9 @@ def synchronize_licenses(
         if scancode_license.is_deprecated:
             continue
 
-        external_license = scancode_license.dump(licenses_data_dir=external_source.new_dir)
+        scancode_license.dump(licenses_data_dir=external_source.new_dir)
         added_to_external.add(lkey)
-        externals_by_key[lkey] = external_license
+        externals_by_key[lkey] = scancode_license
 
         if TRACE_DEEP:
             print("ScanCode license key not in External:", lkey, "created in External.")

src/licensedcode/data/rules/openssl-exception-gpl-2.0_6.RULE

@@ -0,0 +1,6 @@
+---
+license_expression: openssl-exception-gpl-2.0
+is_license_tag: yes
+---
+
+License: GPL-2.0-only WITH OpenSSL-Exception

src/packagedcode/alpine.py

@@ -1647,7 +1647,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': 'gpl-2.0-only with licenseref-scancode-openssl-exception-gpl-2.0',
+    'gpl-2.0-only with openssl-exception': 'x11vnc-openssl-exception',
     '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/licensedcode/data/datadriven/external/glc/BSD-2-Clause.t2.yml

@@ -1,6 +1,6 @@
 license_expressions:
   - unknown-license-reference
-  - bsd-simplified
+  - libutil-david-nugent
   - bsd-simplified
 notes: |
   License test derived from a file of the BSD-licensed repository at:

tests/licensedcode/data/license_db/index.json-expected.json

@@ -4,14 +4,14 @@ notes: GPL 2 small change
 ---
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 dated June, 1991.
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.