Regen tests for SPDX license list 3.23

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

src/licensedcode/data/licenses/bsd-systemics-w3works.LICENSE

@@ -7,11 +7,11 @@ owner: Systemics Ltd
 spdx_license_key: BSD-Systemics-W3Works
 other_urls:
     - https://metacpan.org/release/DPARIS/Crypt-Blowfish-2.14/source/COPYRIGHT#L7
-ignorable_holders:
-    - W3Works, LLC.
 ignorable_authors:
+    - Systemics Ltd (http://www.systemics.com/)
     - W3Works, LLC (http://www.w3works.com)
 ignorable_urls:
+    - http://www.systemics.com/
     - http://www.w3works.com/
 ---
 

tests/licensedcode/data/datadriven/external/fossology-tests/BSD/HP-DEC.txt.yml

@@ -1,2 +1,2 @@
 license_expressions:
-  - broadcom-cfe
+  - dec-3-clause

tests/licensedcode/data/datadriven/external/fossology-tests/Freeware/dircolors.hin.yml

@@ -1,2 +1,2 @@
 license_expressions:
-  - fsf-ap
+  - fsfap-no-warranty-disclaimer

tests/licensedcode/data/datadriven/external/fossology-tests/Freeware/plbasename.c.yml

@@ -1,2 +1,2 @@
 license_expressions:
-  - other-permissive
+  - gtkbook

tests/licensedcode/data/datadriven/external/fossology-tests/Sun/Sun_a.txt.yml

@@ -1,2 +1,2 @@
 license_expressions:
-  - other-permissive
+  - sun-ppp

tests/licensedcode/data/datadriven/external/licensecheck/fedora/MIT.yml

@@ -33,7 +33,7 @@ license_expressions:
   - x11 AND other-permissive
   - widget-workshop
   - other-permissive
-  - other-permissive
+  - openvision
   - other-permissive
   - other-permissive
   - unixcrypt

tests/licensedcode/data/datadriven/external/slic-tests/git.mk.yml

@@ -1,2 +1,2 @@
 license_expressions:
-  - fsf-ap
+  - fsfap-no-warranty-disclaimer

tests/licensedcode/data/licenses_reference_reporting/license-reference-works-with-clues.expected.json

@@ -96,13 +96,13 @@
     {
       "identifier": "openssl-e1da0b01-fab9-e27d-4ff3-c4944b09b621",
       "license_expression": "openssl",
-      "license_expression_spdx": "LicenseRef-scancode-openssl",
+      "license_expression_spdx": "OpenSSL-standalone",
       "detection_count": 1,
       "detection_log": [],
       "reference_matches": [
         {
           "license_expression": "openssl",
-          "license_expression_spdx": "LicenseRef-scancode-openssl",
+          "license_expression_spdx": "OpenSSL-standalone",
           "from_file": "python.LICENSE",
           "start_line": 440,
           "end_line": 487,
@@ -426,13 +426,13 @@
     {
       "identifier": "ssleay_windows-d3dabc12-d861-87db-b339-f73beba8703a",
       "license_expression": "ssleay-windows",
-      "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
+      "license_expression_spdx": "SSLeay-standalone",
       "detection_count": 1,
       "detection_log": [],
       "reference_matches": [
         {
           "license_expression": "ssleay-windows",
-          "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
+          "license_expression_spdx": "SSLeay-standalone",
           "from_file": "python.LICENSE",
           "start_line": 497,
           "end_line": 548,
@@ -717,14 +717,18 @@
       "is_exception": false,
       "is_unknown": false,
       "is_generic": false,
-      "spdx_license_key": "LicenseRef-scancode-openssl",
-      "other_spdx_license_keys": [],
+      "spdx_license_key": "OpenSSL-standalone",
+      "other_spdx_license_keys": [
+        "LicenseRef-scancode-openssl"
+      ],
       "osi_license_key": null,
       "text_urls": [],
       "osi_url": null,
       "faq_url": "http://www.openssl.org/support/faq.html",
       "other_urls": [
-        "http://www.openssl.org/source/license.html"
+        "http://www.openssl.org/source/license.html",
+        "https://library.netapp.com/ecm/ecm_download_file/ECMP1196395",
+        "https://hstechdocs.helpsystems.com/manuals/globalscape/archive/cuteftp6/open_ssl_license_agreement.htm"
       ],
       "key_aliases": [],
       "minimum_coverage": 70,
@@ -743,7 +747,7 @@
       "text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in\n   the documentation and/or other materials provided with the\n   distribution.\n\n3. All advertising materials mentioning features or use of this\n   software must display the following acknowledgment:\n   \"This product includes software developed by the OpenSSL Project\n   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)\"\n\n4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n   endorse or promote products derived from this software without\n   prior written permission. For written permission, please contact\n   [email protected].\n\n5. Products derived from this software may not be called \"OpenSSL\"\n   nor may \"OpenSSL\" appear in their names without prior written\n   permission of the OpenSSL Project.\n\n6. Redistributions of any form whatsoever must retain the following\n   acknowledgment:\n   \"This product includes software developed by the OpenSSL Project\n   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)\"\n\nTHIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\nEXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\nITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\nNOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\nSTRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\nARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\nOF THE POSSIBILITY OF SUCH DAMAGE.",
       "scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/openssl.LICENSE",
       "licensedb_url": "https://scancode-licensedb.aboutcode.org/openssl",
-      "spdx_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/openssl.LICENSE"
+      "spdx_url": "https://spdx.org/licenses/OpenSSL-standalone"
     },
     {
       "key": "openssl-ssleay",
@@ -965,15 +969,18 @@
       "is_exception": false,
       "is_unknown": false,
       "is_generic": false,
-      "spdx_license_key": "LicenseRef-scancode-ssleay-windows",
-      "other_spdx_license_keys": [],
+      "spdx_license_key": "SSLeay-standalone",
+      "other_spdx_license_keys": [
+        "LicenseRef-scancode-ssleay-windows"
+      ],
       "osi_license_key": null,
       "text_urls": [
         "http://www.openssl.org/source/license.html"
       ],
       "osi_url": null,
       "faq_url": null,
       "other_urls": [
+        "https://www.tq-group.com/filedownloads/files/software-license-conditions/OriginalSSLeay/OriginalSSLeay.pdf",
         "http://h71000.www7.hp.com/doc/83final/ba554_90007/apcs02.html"
       ],
       "key_aliases": [],
@@ -997,7 +1004,7 @@
       "text": "This package is an SSL implementation written by Eric Young ([email protected]).\nThe implementation was written so as to conform with Netscapes SSL.\n\nThis library is free for commercial and non-commercial use as long as\nthe following conditions are aheared to.  The following conditions\napply to all code found in this distribution, be it the RC4, RSA,\nlhash, DES, etc., code; not just the SSL code.  The SSL documentation\nincluded with this distribution is covered by the same copyright terms\nexcept that the holder is Tim Hudson ([email protected]).\n\nCopyright remains Eric Young's, and as such any Copyright notices in\nthe code are not to be removed.\nIf this package is used in a product, Eric Young should be given attribution\nas the author of the parts of the library used.\nThis can be in the form of a textual message at program startup or\nin documentation (online or textual) provided with the package.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n1. Redistributions of source code must retain the copyright\n   notice, this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in the\n   documentation and/or other materials provided with the distribution.\n3. All advertising materials mentioning features or use of this software\n   must display the following acknowledgement:\n   \"This product includes cryptographic software written by\n    Eric Young ([email protected])\"\n   The word 'cryptographic' can be left out if the rouines from the library\n   being used are not cryptographic related :-).\n4. If you include any Windows specific code (or a derivative thereof) from\n   the apps directory (application code) you must include an acknowledgement:\n   \"This product includes software written by Tim Hudson ([email protected])\"\n\nTHIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\nOR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGE.\n\nThe licence and distribution terms for any publically available version or\nderivative of this code cannot be changed.  i.e. this code cannot simply be\ncopied and put under another distribution licence\n[including the GNU Public Licence.]",
       "scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ssleay-windows.LICENSE",
       "licensedb_url": "https://scancode-licensedb.aboutcode.org/ssleay-windows",
-      "spdx_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ssleay-windows.LICENSE"
+      "spdx_url": "https://spdx.org/licenses/SSLeay-standalone"
     },
     {
       "key": "tcl",
@@ -1638,7 +1645,7 @@
       "path": "python.LICENSE",
       "type": "file",
       "detected_license_expression": "python AND (other-copyleft AND gpl-1.0-plus) AND (python AND python-cwi) AND bzip2-libbzip-2010 AND sleepycat AND bsd-new AND openssl-ssleay AND openssl AND ssleay-windows AND tcl",
-      "detected_license_expression_spdx": "Python-2.0 AND (LicenseRef-scancode-other-copyleft AND GPL-1.0-or-later) AND (Python-2.0 AND LicenseRef-scancode-python-cwi) AND bzip2-1.0.6 AND Sleepycat AND BSD-3-Clause AND OpenSSL AND LicenseRef-scancode-openssl AND LicenseRef-scancode-ssleay-windows AND TCL",
+      "detected_license_expression_spdx": "Python-2.0 AND (LicenseRef-scancode-other-copyleft AND GPL-1.0-or-later) AND (Python-2.0 AND LicenseRef-scancode-python-cwi) AND bzip2-1.0.6 AND Sleepycat AND BSD-3-Clause AND OpenSSL AND OpenSSL-standalone AND SSLeay-standalone AND TCL",
       "license_detections": [
         {
           "license_expression": "python",
@@ -2032,11 +2039,11 @@
         },
         {
           "license_expression": "openssl",
-          "license_expression_spdx": "LicenseRef-scancode-openssl",
+          "license_expression_spdx": "OpenSSL-standalone",
           "matches": [
             {
               "license_expression": "openssl",
-              "spdx_license_expression": "LicenseRef-scancode-openssl",
+              "spdx_license_expression": "OpenSSL-standalone",
               "from_file": "python.LICENSE",
               "start_line": 440,
               "end_line": 487,
@@ -2056,11 +2063,11 @@
         },
         {
           "license_expression": "ssleay-windows",
-          "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
+          "license_expression_spdx": "SSLeay-standalone",
           "matches": [
             {
               "license_expression": "ssleay-windows",
-              "spdx_license_expression": "LicenseRef-scancode-ssleay-windows",
+              "spdx_license_expression": "SSLeay-standalone",
               "from_file": "python.LICENSE",
               "start_line": 497,
               "end_line": 548,

tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/apache2/stable_copyright-detailed.expected.yml

@@ -38,11 +38,10 @@ other_license_expression: (apache-2.0 AND apache-2.0) AND ((apache-2.0 AND apach
 other_license_expression_spdx: (Apache-2.0 AND Apache-2.0) AND ((Apache-2.0 AND Apache-2.0)
   AND BSD-3-Clause) AND BSD-3-Clause AND ((GPL-3.0-or-later AND GPL-3.0-or-later) OR Bison-exception-2.2)
   AND LicenseRef-scancode-bsd-unchanged AND ((Apache-2.0 AND Apache-2.0) AND (Apache-2.0 AND
-  Spencer-94)) AND (Apache-2.0 AND Apache-2.0) AND LicenseRef-scancode-bsd-simplified-darwin
-  AND ((Apache-2.0 AND Apache-2.0) AND LicenseRef-scancode-public-domain) AND ((Apache-2.0 AND
-  Apache-2.0) AND (HPND-sell-variant AND metamail)) AND ((Apache-2.0 AND Apache-2.0) AND LicenseRef-scancode-zeusbench)
-  AND ((Apache-2.0 AND Apache-2.0) OR (GPL-2.0-or-later AND GPL-2.0-or-later)) AND MIT AND (Apache-2.0
-  AND Apache-2.0)
+  Spencer-94)) AND (Apache-2.0 AND Apache-2.0) AND BSD-2-Clause-Darwin AND ((Apache-2.0 AND
+  Apache-2.0) AND LicenseRef-scancode-public-domain) AND ((Apache-2.0 AND Apache-2.0) AND (HPND-sell-variant
+  AND metamail)) AND ((Apache-2.0 AND Apache-2.0) AND LicenseRef-scancode-zeusbench) AND ((Apache-2.0
+  AND Apache-2.0) OR (GPL-2.0-or-later AND GPL-2.0-or-later)) AND MIT AND (Apache-2.0 AND Apache-2.0)
 license_detections: []
 other_license_detections:
   - license_expression: apache-2.0
@@ -358,10 +357,10 @@ other_license_detections:
           Mark Cox, [email protected], Allow relative URLs even when no base specified
     identifier: public_domain-a7ae1690-4f60-4902-e6d2-15dc3a028b4c
   - license_expression: bsd-simplified-darwin
-    license_expression_spdx: LicenseRef-scancode-bsd-simplified-darwin
+    license_expression_spdx: BSD-2-Clause-Darwin
     matches:
       - license_expression: bsd-simplified-darwin
-        spdx_license_expression: LicenseRef-scancode-bsd-simplified-darwin
+        spdx_license_expression: BSD-2-Clause-Darwin
         from_file:
         start_line: 279
         end_line: 302

tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/x/xymon/stable_copyright-detailed.expected.yml

@@ -24,15 +24,15 @@ other_license_expression: gpl-2.0 WITH openssl-exception-gpl-2.0 AND gpl-2.0 WIT
 other_license_expression_spdx: GPL-2.0-only WITH x11vnc-openssl-exception AND GPL-2.0-only WITH
   x11vnc-openssl-exception AND (GPL-2.0-only AND GPL-2.0-only) AND (GPL-2.0-only AND GPL-2.0-only)
   AND (GPL-2.0-or-later AND GPL-2.0-or-later) AND (Zlib AND (GPL-1.0-or-later AND GPL-1.0-or-later))
-  AND (GPL-1.0-or-later AND Zlib) AND LicenseRef-scancode-ssleay-windows AND LicenseRef-scancode-public-domain
+  AND (GPL-1.0-or-later AND Zlib) AND SSLeay-standalone AND LicenseRef-scancode-public-domain
   AND BSD-3-Clause AND NTP
 license_detections: []
 other_license_detections:
   - license_expression: ssleay-windows
-    license_expression_spdx: LicenseRef-scancode-ssleay-windows
+    license_expression_spdx: SSLeay-standalone
     matches:
       - license_expression: ssleay-windows
-        spdx_license_expression: LicenseRef-scancode-ssleay-windows
+        spdx_license_expression: SSLeay-standalone
         from_file:
         start_line: 43
         end_line: 100

tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qcom-media.copyright-detailed.expected.yml

@@ -5,10 +5,10 @@ declared_license_expression: qti-linux-firmware AND proprietary-license AND open
   AND (gpl-2.0 OR bsd-new) AND (gpl-2.0 OR bsd-new) AND bsd-new AND bsd-new AND bsd-new AND
   isc
 declared_license_expression_spdx: LicenseRef-scancode-qti-linux-firmware AND LicenseRef-scancode-proprietary-license
-  AND OpenSSL AND OpenSSL AND LicenseRef-scancode-openssl AND LicenseRef-scancode-ssleay-windows
-  AND Zlib AND Zlib AND LicenseRef-scancode-public-domain AND BSD-3-Clause AND LicenseRef-scancode-gary-s-brown
-  AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-public-domain-disclaimer
-  AND LicenseRef-scancode-public-domain-disclaimer AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only
+  AND OpenSSL AND OpenSSL AND OpenSSL-standalone AND SSLeay-standalone AND Zlib AND Zlib AND
+  LicenseRef-scancode-public-domain AND BSD-3-Clause AND LicenseRef-scancode-gary-s-brown AND
+  LicenseRef-scancode-other-permissive AND LicenseRef-scancode-public-domain-disclaimer AND
+  LicenseRef-scancode-public-domain-disclaimer AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only
   OR BSD-3-Clause) AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND ISC
 other_license_expression:
 other_license_expression_spdx:
@@ -293,10 +293,10 @@ license_detections:
         matched_text: OpenSSL License
     identifier: openssl_ssleay-cbfdb9fc-932d-b226-10aa-6aeea27f1ff9
   - license_expression: openssl
-    license_expression_spdx: LicenseRef-scancode-openssl
+    license_expression_spdx: OpenSSL-standalone
     matches:
       - license_expression: openssl
-        spdx_license_expression: LicenseRef-scancode-openssl
+        spdx_license_expression: OpenSSL-standalone
         from_file:
         start_line: 252
         end_line: 299
@@ -358,10 +358,10 @@ license_detections:
            * Hudson ([email protected]).
     identifier: openssl-e1da0b01-fab9-e27d-4ff3-c4944b09b621
   - license_expression: ssleay-windows
-    license_expression_spdx: LicenseRef-scancode-ssleay-windows
+    license_expression_spdx: SSLeay-standalone
     matches:
       - license_expression: ssleay-windows
-        spdx_license_expression: LicenseRef-scancode-ssleay-windows
+        spdx_license_expression: SSLeay-standalone
         from_file:
         start_line: 309
         end_line: 360