diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml index 5a784b4..0168185 100644 --- a/.github/workflows/docs-ci.yml +++ b/.github/workflows/docs-ci.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: max-parallel: 4 diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index f150ff8..30f2668 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -21,10 +21,10 @@ on: jobs: build-pypi-distribs: name: Build and publish library to PyPI - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -50,7 +50,7 @@ jobs: name: Create GH release needs: - build-pypi-distribs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Download built archives @@ -70,7 +70,7 @@ jobs: name: Create PyPI release needs: - create-gh-release - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Download built archives diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 64d4173..c135ee9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,15 @@ Changelog ========= +v30.3.0 - 2024-03-18 +-------------------- + +This is a minor release without API changes: + +- Use latest skeleton +- Update license list to latest ScanCode and SPDX 3.23 +- Drop support for Python 3.7 + v30.2.0 - 2023-11-29 -------------------- @@ -29,7 +38,7 @@ This is a minor release without API changes - Update license list to latest ScanCode and SPDX 3.19 - Use correct syntax for python_require - Drop using Travis and Appveyor -- Drop support for Python 3.7 and add Python 3.11 +- Drop support for Python 3.7 and add Python 3.11 in CI v30.0.0 - 2022-05-10 diff --git a/README.rst b/README.rst index f7255e0..0d672ce 100644 --- a/README.rst +++ b/README.rst @@ -7,7 +7,7 @@ simplify and normalize license expressions (such as SPDX license expressions) using boolean logic. - License: Apache-2.0 -- Python: 3.7+ +- Python: 3.8+ - Homepage: https://github.com/nexB/license-expression/ - Install: `pip install license-expression` also available in most Linux distro. @@ -25,8 +25,8 @@ SPDX and SBOM in general) as a way to express licensing precisely. simplify and normalize these license expressions (such as SPDX license expressions) using boolean logic like in: `GPL-2.0-or-later WITH Classpath-exception-2.0 AND MIT`. -It includes the license keys from SPDX https://spdx.org/licenses/ (version 3.22) -and ScanCode license DB (version 32.0.8, last published on 2023-11-16). +It includes the license keys from SPDX https://spdx.org/licenses/ (version 3.23) +and ScanCode license DB (version 32.0.8, last published on 2023-02-27). See https://scancode-licensedb.aboutcode.org/ to get started quickly. ``license-expression`` is both powerful and simple to use and is a used as the diff --git a/docs/source/_static/theme_overrides.css b/docs/source/_static/theme_overrides.css index 9662d63..5863ccf 100644 --- a/docs/source/_static/theme_overrides.css +++ b/docs/source/_static/theme_overrides.css @@ -1,353 +1,26 @@ -body { - color: #000000; -} - -p { - margin-bottom: 10px; -} - -.wy-plain-list-disc, .rst-content .section ul, .rst-content .toctree-wrapper ul, article ul { - margin-bottom: 10px; -} - -.custom_header_01 { - color: #cc0000; - font-size: 22px; - font-weight: bold; - line-height: 50px; -} - -h1, h2, h3, h4, h5, h6 { - margin-bottom: 20px; - margin-top: 20px; -} - -h5 { - font-size: 18px; - color: #000000; - font-style: italic; - margin-bottom: 10px; -} - -h6 { - font-size: 15px; - color: #000000; - font-style: italic; - margin-bottom: 10px; -} - -/* custom admonitions */ -/* success */ -.custom-admonition-success .admonition-title { - color: #000000; - background: #ccffcc; - border-radius: 5px 5px 0px 0px; -} -div.custom-admonition-success.admonition { - color: #000000; - background: #ffffff; - border: solid 1px #cccccc; - border-radius: 5px; - box-shadow: 1px 1px 5px 3px #d8d8d8; - margin: 20px 0px 30px 0px; -} - -/* important */ -.custom-admonition-important .admonition-title { - color: #000000; - background: #ccffcc; - border-radius: 5px 5px 0px 0px; - border-bottom: solid 1px #000000; -} -div.custom-admonition-important.admonition { - color: #000000; - background: #ffffff; - border: solid 1px #cccccc; - border-radius: 5px; - box-shadow: 1px 1px 5px 3px #d8d8d8; - margin: 20px 0px 30px 0px; -} - -/* caution */ -.custom-admonition-caution .admonition-title { - color: #000000; - background: #ffff99; - border-radius: 5px 5px 0px 0px; - border-bottom: solid 1px #e8e8e8; -} -div.custom-admonition-caution.admonition { - color: #000000; - background: #ffffff; - border: solid 1px #cccccc; - border-radius: 5px; - box-shadow: 1px 1px 5px 3px #d8d8d8; - margin: 20px 0px 30px 0px; -} - -/* note */ -.custom-admonition-note .admonition-title { - color: #ffffff; - background: #006bb3; - border-radius: 5px 5px 0px 0px; -} -div.custom-admonition-note.admonition { - color: #000000; - background: #ffffff; - border: solid 1px #cccccc; - border-radius: 5px; - box-shadow: 1px 1px 5px 3px #d8d8d8; - margin: 20px 0px 30px 0px; -} - -/* todo */ -.custom-admonition-todo .admonition-title { - color: #000000; - background: #cce6ff; - border-radius: 5px 5px 0px 0px; - border-bottom: solid 1px #99ccff; -} -div.custom-admonition-todo.admonition { - color: #000000; - background: #ffffff; - border: solid 1px #99ccff; - border-radius: 5px; - box-shadow: 1px 1px 5px 3px #d8d8d8; - margin: 20px 0px 30px 0px; -} - -/* examples */ -.custom-admonition-examples .admonition-title { - color: #000000; - background: #ffe6cc; - border-radius: 5px 5px 0px 0px; - border-bottom: solid 1px #d8d8d8; -} -div.custom-admonition-examples.admonition { - color: #000000; - background: #ffffff; - border: solid 1px #cccccc; - border-radius: 5px; - box-shadow: 1px 1px 5px 3px #d8d8d8; - margin: 20px 0px 30px 0px; -} - +/* this is the container for the pages */ .wy-nav-content { max-width: 100%; - padding-right: 100px; - padding-left: 100px; - background-color: #f2f2f2; -} - -div.rst-content { - background-color: #ffffff; - border: solid 1px #e5e5e5; - padding: 20px 40px 20px 40px; -} - -.rst-content .guilabel { - border: 1px solid #ffff99; - background: #ffff99; - font-size: 100%; - font-weight: normal; - border-radius: 4px; - padding: 2px 0px; - margin: auto 2px; - vertical-align: middle; -} - -.rst-content kbd { - font-family: SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",Courier,monospace; - border: solid 1px #d8d8d8; - background-color: #f5f5f5; - padding: 0px 3px; - border-radius: 3px; -} - -.wy-nav-content-wrap a { - color: #0066cc; - text-decoration: none; -} -.wy-nav-content-wrap a:hover { - color: #0099cc; - text-decoration: underline; -} - -.wy-nav-top a { - color: #ffffff; -} - -/* Based on numerous similar approaches e.g., https://github.com/readthedocs/sphinx_rtd_theme/issues/117 and https://rackerlabs.github.io/docs-rackspace/tools/rtd-tables.html -- but remove form-factor limits to enable table wrap on full-size and smallest-size form factors */ -.wy-table-responsive table td { - white-space: normal !important; -} - -.rst-content table.docutils td, -.rst-content table.docutils th { - padding: 5px 10px 5px 10px; -} -.rst-content table.docutils td p, -.rst-content table.docutils th p { - font-size: 14px; - margin-bottom: 0px; -} -.rst-content table.docutils td p cite, -.rst-content table.docutils th p cite { - font-size: 14px; - background-color: transparent; -} - -.colwidths-given th { - border: solid 1px #d8d8d8 !important; -} -.colwidths-given td { - border: solid 1px #d8d8d8 !important; -} - -/*handles single-tick inline code*/ -.wy-body-for-nav cite { - color: #000000; - background-color: transparent; - font-style: normal; - font-family: "Courier New"; - font-size: 13px; - padding: 3px 3px 3px 3px; -} - -.rst-content pre.literal-block, .rst-content div[class^="highlight"] pre, .rst-content .linenodiv pre { - font-family: SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",Courier,monospace; - font-size: 13px; - overflow: visible; - white-space: pre-wrap; - color: #000000; -} - -.rst-content pre.literal-block, .rst-content div[class^='highlight'] { - background-color: #f8f8f8; - border: solid 1px #e8e8e8; -} - -/* This enables inline code to wrap. */ -code, .rst-content tt, .rst-content code { - white-space: pre-wrap; - padding: 2px 3px 1px; - border-radius: 3px; - font-size: 13px; - background-color: #ffffff; -} - -/* use this added class for code blocks attached to bulleted list items */ -.highlight-top-margin { - margin-top: 20px !important; -} - -/* change color of inline code block */ -span.pre { - color: #e01e5a; -} - -.wy-body-for-nav blockquote { - margin: 1em 0; - padding-left: 1em; - border-left: 4px solid #ddd; - color: #000000; -} - -/* Fix the unwanted top and bottom padding inside a nested bulleted/numbered list */ -.rst-content .section ol p, .rst-content .section ul p { - margin-bottom: 0px; -} - -/* add spacing between bullets for legibility */ -.rst-content .section ol li, .rst-content .section ul li { - margin-bottom: 5px; -} - -.rst-content .section ol li:first-child, .rst-content .section ul li:first-child { - margin-top: 5px; -} - -/* but exclude the toctree bullets */ -.rst-content .toctree-wrapper ul li, .rst-content .toctree-wrapper ul li:first-child { + padding: 0px 40px 0px 0px; margin-top: 0px; - margin-bottom: 0px; } -/* remove extra space at bottom of multine list-table cell */ -.rst-content .line-block { - margin-left: 0px; - margin-bottom: 0px; - line-height: 24px; +.wy-nav-content-wrap { + border-right: solid 1px; } -/* fix extra vertical spacing in page toctree */ -.rst-content .toctree-wrapper ul li ul, article ul li ul { - margin-top: 0; - margin-bottom: 0; -} - -/* this is used by the genindex added via layout.html (see source/_templates/) to sidebar toc */ -.reference.internal.toc-index { - color: #d9d9d9; -} - -.reference.internal.toc-index.current { - background-color: #ffffff; - color: #000000; - font-weight: bold; -} - -.toc-index-div { - border-top: solid 1px #000000; - margin-top: 10px; - padding-top: 5px; -} - -.indextable ul li { - font-size: 14px; - margin-bottom: 5px; -} - -/* The next 2 fix the poor vertical spacing in genindex.html (the alphabetized index) */ -.indextable.genindextable { - margin-bottom: 20px; -} - -div.genindex-jumpbox { - margin-bottom: 10px; -} - -/* rst image classes */ - -.clear-both { - clear: both; - } - -.float-left { - float: left; - margin-right: 20px; -} - -img { - border: solid 1px #e8e8e8; -} - -/* These are custom and need to be defined in conf.py to access in all pages, e.g., '.. role:: red' */ -.img-title { - color: #000000; - /* neither padding nor margin works for vertical spacing bc it's a span -- line-height does, sort of */ - line-height: 3.0; - font-style: italic; - font-weight: 600; -} - -.img-title-para { - color: #000000; - margin-top: 20px; - margin-bottom: 0px; - font-style: italic; - font-weight: 500; -} - -.red { - color: red; +div.rst-content { + max-width: 1300px; + border: 0; + padding: 10px 80px 10px 80px; + margin-left: 50px; +} + +@media (max-width: 768px) { + div.rst-content { + max-width: 1300px; + border: 0; + padding: 0px 10px 10px 10px; + margin-left: 0px; + } } diff --git a/docs/source/conf.py b/docs/source/conf.py index b1f5383..6a15e0f 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -32,7 +32,7 @@ "sphinx.ext.intersphinx", "sphinxcontrib.apidoc", "sphinx_reredirects", - 'sphinx_rtd_theme', + "sphinx_rtd_theme", "sphinx_rtd_dark_mode", "sphinx.ext.extlinks", "sphinx_copybutton", @@ -54,7 +54,10 @@ intersphinx_mapping = { "aboutcode": ("https://aboutcode.readthedocs.io/en/latest/", None), - "scancode-workbench": ("https://scancode-workbench.readthedocs.io/en/develop/", None), + "scancode-workbench": ( + "https://scancode-workbench.readthedocs.io/en/develop/", + None, + ), } # Setting for sphinxcontrib.apidoc to automatically create API documentation. @@ -97,7 +100,9 @@ "conf_py_path": "/docs/source/", # path in the checkout to the docs root } -html_css_files = ["_static/theme_overrides.css"] +html_css_files = [ + "theme_overrides.css", +] # If true, "Created using Sphinx" is shown in the HTML footer. Default is True. @@ -123,6 +128,4 @@ # -- Options for LaTeX output ------------------------------------------------- -latex_elements = { - 'classoptions': ',openany,oneside' -} \ No newline at end of file +latex_elements = {"classoptions": ",openany,oneside"} diff --git a/setup.cfg b/setup.cfg index c3adc83..5daaa70 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = license-expression -version = 30.2.0 +version = 30.3.0 license = Apache-2.0 # description must be on ONE line https://github.com/pypa/setuptools/issues/1390 @@ -47,7 +47,7 @@ zip_safe = false setup_requires = setuptools_scm[toml] >= 4 -python_requires = >=3.7 +python_requires = >=3.8 install_requires = boolean.py >= 4.0 diff --git a/src/license_expression/data/license_key_index.json.ABOUT b/src/license_expression/data/license_key_index.json.ABOUT index 2c7a851..af7ff64 100644 --- a/src/license_expression/data/license_key_index.json.ABOUT +++ b/src/license_expression/data/license_key_index.json.ABOUT @@ -1,6 +1,6 @@ about_resource: scancode-licensedb-index.json -download_url: https://raw.githubusercontent.com/nexB/scancode-licensedb/63bfc0320f8b554a1a7a3ae84f8f4afd396e8601/docs/index.json -spdx_license_list_version: 3.22 +download_url: https://raw.githubusercontent.com/nexB/scancode-licensedb/a8e8168efbd65ff8ccaa7990ef70d0b81819ddbc/docs/index.json +spdx_license_list_version: 3.23 name: scancode-licensedb-index.json license_expression: cc-by-4.0 copyright: Copyright (c) nexB Inc. and others. diff --git a/src/license_expression/data/scancode-licensedb-index.json b/src/license_expression/data/scancode-licensedb-index.json index 7ee2f88..f3c0b4a 100644 --- a/src/license_expression/data/scancode-licensedb-index.json +++ b/src/license_expression/data/scancode-licensedb-index.json @@ -1436,6 +1436,18 @@ "html": "apple-mfi-license.html", "license": "apple-mfi-license.LICENSE" }, + { + "license_key": "apple-ml-ferret-2023", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-apple-ml-ferret-2023", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "apple-ml-ferret-2023.json", + "yaml": "apple-ml-ferret-2023.yml", + "html": "apple-ml-ferret-2023.html", + "license": "apple-ml-ferret-2023.LICENSE" + }, { "license_key": "apple-mpeg-4", "category": "Free Restricted", @@ -2170,6 +2182,18 @@ "html": "bash-exception-gpl.html", "license": "bash-exception-gpl.LICENSE" }, + { + "license_key": "bcrypt-solar-designer", + "category": "Permissive", + "spdx_license_key": "bcrypt-Solar-Designer", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "bcrypt-solar-designer.json", + "yaml": "bcrypt-solar-designer.yml", + "html": "bcrypt-solar-designer.html", + "license": "bcrypt-solar-designer.LICENSE" + }, { "license_key": "bea-2.1", "category": "Permissive", @@ -2331,8 +2355,10 @@ { "license_key": "bison-exception-2.0", "category": "Copyleft Limited", - "spdx_license_key": "LicenseRef-scancode-bison-exception-2.0", - "other_spdx_license_keys": [], + "spdx_license_key": "Bison-exception-1.24", + "other_spdx_license_keys": [ + "LicenseRef-scancode-bison-exception-2.0" + ], "is_exception": true, "is_deprecated": false, "json": "bison-exception-2.0.json", @@ -2657,8 +2683,10 @@ { "license_key": "brian-gladman", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-brian-gladman", - "other_spdx_license_keys": [], + "spdx_license_key": "Brian-Gladman-2-Clause", + "other_spdx_license_keys": [ + "LicenseRef-scancode-brian-gladman" + ], "is_exception": false, "is_deprecated": false, "json": "brian-gladman.json", @@ -3524,8 +3552,10 @@ { "license_key": "bsd-simplified-darwin", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-bsd-simplified-darwin", - "other_spdx_license_keys": [], + "spdx_license_key": "BSD-2-Clause-Darwin", + "other_spdx_license_keys": [ + "LicenseRef-scancode-bsd-simplified-darwin" + ], "is_exception": false, "is_deprecated": false, "json": "bsd-simplified-darwin.json", @@ -3582,12 +3612,26 @@ "license": "bsd-systemics.LICENSE" }, { - "license_key": "bsd-top", + "license_key": "bsd-systemics-w3works", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-bsd-top", + "spdx_license_key": "BSD-Systemics-W3Works", "other_spdx_license_keys": [], "is_exception": false, "is_deprecated": false, + "json": "bsd-systemics-w3works.json", + "yaml": "bsd-systemics-w3works.yml", + "html": "bsd-systemics-w3works.html", + "license": "bsd-systemics-w3works.LICENSE" + }, + { + "license_key": "bsd-top", + "category": "Permissive", + "spdx_license_key": "BSD-Source-beginning-file", + "other_spdx_license_keys": [ + "LicenseRef-scancode-bsd-top" + ], + "is_exception": false, + "is_deprecated": false, "json": "bsd-top.json", "yaml": "bsd-top.yml", "html": "bsd-top.html", @@ -3839,6 +3883,18 @@ "html": "caldera.html", "license": "caldera.LICENSE" }, + { + "license_key": "caldera-no-preamble", + "category": "Permissive", + "spdx_license_key": "Caldera-no-preamble", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "caldera-no-preamble.json", + "yaml": "caldera-no-preamble.yml", + "html": "caldera-no-preamble.html", + "license": "caldera-no-preamble.LICENSE" + }, { "license_key": "can-ogl-2.0-en", "category": "Permissive", @@ -3911,6 +3967,30 @@ "html": "can-ogl-toronto-1.0.html", "license": "can-ogl-toronto-1.0.LICENSE" }, + { + "license_key": "canonical-ha-cla-any-e-v1.2", + "category": "CLA", + "spdx_license_key": "LicenseRef-scancode-canonical-ha-cla-any-e-v1.2", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "canonical-ha-cla-any-e-v1.2.json", + "yaml": "canonical-ha-cla-any-e-v1.2.yml", + "html": "canonical-ha-cla-any-e-v1.2.html", + "license": "canonical-ha-cla-any-e-v1.2.LICENSE" + }, + { + "license_key": "canonical-ha-cla-any-i-v1.2", + "category": "CLA", + "spdx_license_key": "LicenseRef-scancode-canonical-ha-cla-any-i-v1.2", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "canonical-ha-cla-any-i-v1.2.json", + "yaml": "canonical-ha-cla-any-i-v1.2.yml", + "html": "canonical-ha-cla-any-i-v1.2.html", + "license": "canonical-ha-cla-any-i-v1.2.LICENSE" + }, { "license_key": "capec-tou", "category": "Permissive", @@ -3961,6 +4041,18 @@ "html": "carnegie-mellon-contributors.html", "license": "carnegie-mellon-contributors.LICENSE" }, + { + "license_key": "catharon-osl", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-catharon-osl", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "catharon-osl.json", + "yaml": "catharon-osl.yml", + "html": "catharon-osl.html", + "license": "catharon-osl.LICENSE" + }, { "license_key": "cavium-linux-firmware", "category": "Proprietary Free", @@ -4081,6 +4173,18 @@ "html": "cc-by-3.0-at.html", "license": "cc-by-3.0-at.LICENSE" }, + { + "license_key": "cc-by-3.0-au", + "category": "Permissive", + "spdx_license_key": "CC-BY-3.0-AU", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "cc-by-3.0-au.json", + "yaml": "cc-by-3.0-au.yml", + "html": "cc-by-3.0-au.html", + "license": "cc-by-3.0-au.LICENSE" + }, { "license_key": "cc-by-3.0-de", "category": "Permissive", @@ -4191,7 +4295,7 @@ }, { "license_key": "cc-by-nc-3.0-de", - "category": "Free Restricted", + "category": "Source-available", "spdx_license_key": "CC-BY-NC-3.0-DE", "other_spdx_license_keys": [], "is_exception": false, @@ -4239,7 +4343,7 @@ }, { "license_key": "cc-by-nc-nd-2.0-at", - "category": "Free Restricted", + "category": "Source-available", "spdx_license_key": "LicenseRef-scancode-cc-by-nc-nd-2.0-at", "other_spdx_license_keys": [], "is_exception": false, @@ -4287,7 +4391,7 @@ }, { "license_key": "cc-by-nc-nd-3.0-de", - "category": "Free Restricted", + "category": "Source-available", "spdx_license_key": "CC-BY-NC-ND-3.0-DE", "other_spdx_license_keys": [], "is_exception": false, @@ -4503,7 +4607,7 @@ }, { "license_key": "cc-by-nd-3.0-de", - "category": "Free Restricted", + "category": "Source-available", "spdx_license_key": "CC-BY-ND-3.0-DE", "other_spdx_license_keys": [], "is_exception": false, @@ -5687,7 +5791,9 @@ "license_key": "commercial-license", "category": "Commercial", "spdx_license_key": "LicenseRef-scancode-commercial-license", - "other_spdx_license_keys": [], + "other_spdx_license_keys": [ + "LicenseRef-Commercial" + ], "is_exception": false, "is_deprecated": false, "json": "commercial-license.json", @@ -6527,6 +6633,18 @@ "html": "dco-1.1.html", "license": "dco-1.1.LICENSE" }, + { + "license_key": "dec-3-clause", + "category": "Permissive", + "spdx_license_key": "DEC-3-Clause", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "dec-3-clause.json", + "yaml": "dec-3-clause.yml", + "html": "dec-3-clause.html", + "license": "dec-3-clause.LICENSE" + }, { "license_key": "defensive-patent-1.1", "category": "Copyleft", @@ -6599,6 +6717,30 @@ "html": "dgraph-cla.html", "license": "dgraph-cla.LICENSE" }, + { + "license_key": "dhb-lbnl-bsd-2007", + "category": "Copyleft Limited", + "spdx_license_key": "LicenseRef-scancode-dhb-lbnl-bsd-2007", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "dhb-lbnl-bsd-2007.json", + "yaml": "dhb-lbnl-bsd-2007.yml", + "html": "dhb-lbnl-bsd-2007.html", + "license": "dhb-lbnl-bsd-2007.LICENSE" + }, + { + "license_key": "dhb-limited-bsd-2015", + "category": "Copyleft Limited", + "spdx_license_key": "LicenseRef-scancode-dhb-limited-bsd-2015", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "dhb-limited-bsd-2015.json", + "yaml": "dhb-limited-bsd-2015.yml", + "html": "dhb-limited-bsd-2015.html", + "license": "dhb-limited-bsd-2015.LICENSE" + }, { "license_key": "dhtmlab-public", "category": "Permissive", @@ -6928,8 +7070,10 @@ { "license_key": "drl-1.1", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-drl-1.1", - "other_spdx_license_keys": [], + "spdx_license_key": "DRL-1.1", + "other_spdx_license_keys": [ + "LicenseRef-scancode-drl-1.1" + ], "is_exception": false, "is_deprecated": false, "json": "drl-1.1.json", @@ -8216,6 +8360,18 @@ "html": "foobar2000.html", "license": "foobar2000.LICENSE" }, + { + "license_key": "fpdf", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-fpdf", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "fpdf.json", + "yaml": "fpdf.yml", + "html": "fpdf.html", + "license": "fpdf.LICENSE" + }, { "license_key": "fpl", "category": "Permissive", @@ -8524,6 +8680,42 @@ "html": "fsf-unlimited-no-warranty.html", "license": "fsf-unlimited-no-warranty.LICENSE" }, + { + "license_key": "fsfap-no-warranty-disclaimer", + "category": "Permissive", + "spdx_license_key": "FSFAP-no-warranty-disclaimer", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "fsfap-no-warranty-disclaimer.json", + "yaml": "fsfap-no-warranty-disclaimer.yml", + "html": "fsfap-no-warranty-disclaimer.html", + "license": "fsfap-no-warranty-disclaimer.LICENSE" + }, + { + "license_key": "fsl-1.0-apache-2.0", + "category": "Source-available", + "spdx_license_key": "LicenseRef-scancode-fsl-1.0-apache-2.0", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "fsl-1.0-apache-2.0.json", + "yaml": "fsl-1.0-apache-2.0.yml", + "html": "fsl-1.0-apache-2.0.html", + "license": "fsl-1.0-apache-2.0.LICENSE" + }, + { + "license_key": "fsl-1.0-mit", + "category": "Source-available", + "spdx_license_key": "LicenseRef-scancode-fsl-1.0-mit", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "fsl-1.0-mit.json", + "yaml": "fsl-1.0-mit.yml", + "html": "fsl-1.0-mit.html", + "license": "fsl-1.0-mit.LICENSE" + }, { "license_key": "ftdi", "category": "Proprietary Free", @@ -8584,6 +8776,18 @@ "html": "fwlw.html", "license": "fwlw.LICENSE" }, + { + "license_key": "g10-permissive", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-g10-permissive", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "g10-permissive.json", + "yaml": "g10-permissive.yml", + "html": "g10-permissive.html", + "license": "g10-permissive.LICENSE" + }, { "license_key": "gareth-mccaughan", "category": "Permissive", @@ -8706,6 +8910,18 @@ "html": "gco-v3.0.html", "license": "gco-v3.0.LICENSE" }, + { + "license_key": "gcr-docs", + "category": "Copyleft Limited", + "spdx_license_key": "GCR-docs", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "gcr-docs.json", + "yaml": "gcr-docs.yml", + "html": "gcr-docs.html", + "license": "gcr-docs.LICENSE" + }, { "license_key": "gdcl", "category": "Permissive", @@ -9202,6 +9418,30 @@ "html": "glwtpl.html", "license": "glwtpl.LICENSE" }, + { + "license_key": "gmsh-exception", + "category": "Copyleft Limited", + "spdx_license_key": "Gmsh-exception", + "other_spdx_license_keys": [], + "is_exception": true, + "is_deprecated": false, + "json": "gmsh-exception.json", + "yaml": "gmsh-exception.yml", + "html": "gmsh-exception.html", + "license": "gmsh-exception.LICENSE" + }, + { + "license_key": "gnome-examples-exception", + "category": "Permissive", + "spdx_license_key": "GNOME-examples-exception", + "other_spdx_license_keys": [], + "is_exception": true, + "is_deprecated": false, + "json": "gnome-examples-exception.json", + "yaml": "gnome-examples-exception.yml", + "html": "gnome-examples-exception.html", + "license": "gnome-examples-exception.LICENSE" + }, { "license_key": "gnu-emacs-gpl-1988", "category": "Copyleft", @@ -10602,6 +10842,18 @@ "html": "gstreamer-exception-2008.html", "license": "gstreamer-exception-2008.LICENSE" }, + { + "license_key": "gtkbook", + "category": "Permissive", + "spdx_license_key": "gtkbook", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "gtkbook.json", + "yaml": "gtkbook.yml", + "html": "gtkbook.html", + "license": "gtkbook.LICENSE" + }, { "license_key": "gtpl-v1", "category": "Permissive", @@ -10809,8 +11061,10 @@ { "license_key": "hdparm", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-hdparm", - "other_spdx_license_keys": [], + "spdx_license_key": "hdparm", + "other_spdx_license_keys": [ + "LicenseRef-scancode-hdparm" + ], "is_exception": false, "is_deprecated": false, "json": "hdparm.json", @@ -11048,6 +11302,18 @@ "html": "hot-potato.html", "license": "hot-potato.LICENSE" }, + { + "license_key": "houdini-project", + "category": "Copyleft", + "spdx_license_key": "LicenseRef-scancode-houdini", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "houdini-project.json", + "yaml": "houdini-project.yml", + "html": "houdini-project.html", + "license": "houdini-project.LICENSE" + }, { "license_key": "hp", "category": "Proprietary Free", @@ -11192,6 +11458,42 @@ "html": "hpnd-export-us.html", "license": "hpnd-export-us.LICENSE" }, + { + "license_key": "hpnd-fenneberg-livingston", + "category": "Permissive", + "spdx_license_key": "HPND-Fenneberg-Livingston", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "hpnd-fenneberg-livingston.json", + "yaml": "hpnd-fenneberg-livingston.yml", + "html": "hpnd-fenneberg-livingston.html", + "license": "hpnd-fenneberg-livingston.LICENSE" + }, + { + "license_key": "hpnd-inria-imag", + "category": "Permissive", + "spdx_license_key": "HPND-INRIA-IMAG", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "hpnd-inria-imag.json", + "yaml": "hpnd-inria-imag.yml", + "html": "hpnd-inria-imag.html", + "license": "hpnd-inria-imag.LICENSE" + }, + { + "license_key": "hpnd-mit-disclaimer", + "category": "Permissive", + "spdx_license_key": "HPND-MIT-disclaimer", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "hpnd-mit-disclaimer.json", + "yaml": "hpnd-mit-disclaimer.yml", + "html": "hpnd-mit-disclaimer.html", + "license": "hpnd-mit-disclaimer.LICENSE" + }, { "license_key": "hpnd-pbmplus", "category": "Permissive", @@ -11204,6 +11506,18 @@ "html": "hpnd-pbmplus.html", "license": "hpnd-pbmplus.LICENSE" }, + { + "license_key": "hpnd-sell-mit-disclaimer-xserver", + "category": "Permissive", + "spdx_license_key": "HPND-sell-MIT-disclaimer-xserver", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "hpnd-sell-mit-disclaimer-xserver.json", + "yaml": "hpnd-sell-mit-disclaimer-xserver.yml", + "html": "hpnd-sell-mit-disclaimer-xserver.html", + "license": "hpnd-sell-mit-disclaimer-xserver.LICENSE" + }, { "license_key": "hpnd-sell-regexpr", "category": "Permissive", @@ -11410,6 +11724,30 @@ "html": "ibm-dhcp.html", "license": "ibm-dhcp.LICENSE" }, + { + "license_key": "ibm-employee-written", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-ibm-employee-written", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "ibm-employee-written.json", + "yaml": "ibm-employee-written.yml", + "html": "ibm-employee-written.html", + "license": "ibm-employee-written.LICENSE" + }, + { + "license_key": "ibm-glextrusion", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-ibm-glextrusion", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "ibm-glextrusion.json", + "yaml": "ibm-glextrusion.yml", + "html": "ibm-glextrusion.html", + "license": "ibm-glextrusion.LICENSE" + }, { "license_key": "ibm-icu", "category": "Permissive", @@ -11959,8 +12297,10 @@ { "license_key": "intel-bsd", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-intel-bsd", - "other_spdx_license_keys": [], + "spdx_license_key": "BSD-3-Clause-acpica", + "other_spdx_license_keys": [ + "LicenseRef-scancode-intel-bsd" + ], "is_exception": false, "is_deprecated": false, "json": "intel-bsd.json", @@ -12186,6 +12526,18 @@ "html": "ipa-font.html", "license": "ipa-font.LICENSE" }, + { + "license_key": "ipca", + "category": "CLA", + "spdx_license_key": "LicenseRef-scancode-ipca", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "ipca.json", + "yaml": "ipca.yml", + "html": "ipca.html", + "license": "ipca.LICENSE" + }, { "license_key": "iptc-2006", "category": "Proprietary Free", @@ -13013,8 +13365,10 @@ { "license_key": "kevlin-henney", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-kevlin-henney", - "other_spdx_license_keys": [], + "spdx_license_key": "HPND-Kevlin-Henney", + "other_spdx_license_keys": [ + "LicenseRef-scancode-kevlin-henney" + ], "is_exception": false, "is_deprecated": false, "json": "kevlin-henney.json", @@ -13022,6 +13376,18 @@ "html": "kevlin-henney.html", "license": "kevlin-henney.LICENSE" }, + { + "license_key": "keypirinha", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-keypirinha", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "keypirinha.json", + "yaml": "keypirinha.yml", + "html": "keypirinha.html", + "license": "keypirinha.LICENSE" + }, { "license_key": "kfgqpc-uthmanic-script-hafs", "category": "Proprietary Free", @@ -14234,7 +14600,7 @@ "other_spdx_license_keys": [ "LicenseRef-scancode-llgpl" ], - "is_exception": false, + "is_exception": true, "is_deprecated": false, "json": "llgpl.json", "yaml": "llgpl.yml", @@ -14627,6 +14993,18 @@ "html": "magpie-exception-1.0.html", "license": "magpie-exception-1.0.LICENSE" }, + { + "license_key": "mailprio", + "category": "Permissive", + "spdx_license_key": "mailprio", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "mailprio.json", + "yaml": "mailprio.yml", + "html": "mailprio.html", + "license": "mailprio.LICENSE" + }, { "license_key": "make-human-exception", "category": "Permissive", @@ -15417,8 +15795,10 @@ { "license_key": "mit-veillard-variant", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-mit-veillard-variant", - "other_spdx_license_keys": [], + "spdx_license_key": "ISC-Veillard", + "other_spdx_license_keys": [ + "LicenseRef-scancode-mit-veillard-variant" + ], "is_exception": false, "is_deprecated": false, "json": "mit-veillard-variant.json", @@ -17960,8 +18340,10 @@ { "license_key": "nrl-permission", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-nrl-permission", - "other_spdx_license_keys": [], + "spdx_license_key": "CMU-Mach-nodoc", + "other_spdx_license_keys": [ + "LicenseRef-scancode-nrl-permission" + ], "is_exception": false, "is_deprecated": false, "json": "nrl-permission.json", @@ -18068,8 +18450,10 @@ { "license_key": "nvidia-2002", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-nvidia-2002", - "other_spdx_license_keys": [], + "spdx_license_key": "AML-glslang", + "other_spdx_license_keys": [ + "LicenseRef-scancode-nvidia-2002" + ], "is_exception": false, "is_deprecated": false, "json": "nvidia-2002.json", @@ -18322,8 +18706,10 @@ { "license_key": "object-form-exception-to-mit", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-object-form-exception-to-mit", - "other_spdx_license_keys": [], + "spdx_license_key": "fmt-exception", + "other_spdx_license_keys": [ + "LicenseRef-scancode-object-form-exception-to-mit" + ], "is_exception": true, "is_deprecated": false, "json": "object-form-exception-to-mit.json", @@ -19366,8 +19752,10 @@ { "license_key": "openssl", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-openssl", - "other_spdx_license_keys": [], + "spdx_license_key": "OpenSSL-standalone", + "other_spdx_license_keys": [ + "LicenseRef-scancode-openssl" + ], "is_exception": false, "is_deprecated": false, "json": "openssl.json", @@ -19531,6 +19919,18 @@ "html": "openssl-ssleay.html", "license": "openssl-ssleay.LICENSE" }, + { + "license_key": "openvision", + "category": "Permissive", + "spdx_license_key": "OpenVision", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "openvision.json", + "yaml": "openvision.yml", + "html": "openvision.html", + "license": "openvision.LICENSE" + }, { "license_key": "openvpn-as-eula", "category": "Proprietary Free", @@ -20241,6 +20641,18 @@ "html": "owfa-1.0.html", "license": "owfa-1.0.LICENSE" }, + { + "license_key": "owl-0.9.4", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-owl-0.9.4", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "owl-0.9.4.json", + "yaml": "owl-0.9.4.yml", + "html": "owl-0.9.4.html", + "license": "owl-0.9.4.LICENSE" + }, { "license_key": "owtchart", "category": "Permissive", @@ -20412,8 +20824,10 @@ { "license_key": "paul-mackerras", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-paul-mackerras", - "other_spdx_license_keys": [], + "spdx_license_key": "Mackerras-3-Clause-acknowledgment", + "other_spdx_license_keys": [ + "LicenseRef-scancode-paul-mackerras" + ], "is_exception": false, "is_deprecated": false, "json": "paul-mackerras.json", @@ -20436,8 +20850,10 @@ { "license_key": "paul-mackerras-new", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-paul-mackerras-new", - "other_spdx_license_keys": [], + "spdx_license_key": "Mackerras-3-Clause", + "other_spdx_license_keys": [ + "LicenseRef-scancode-paul-mackerras-new" + ], "is_exception": false, "is_deprecated": false, "json": "paul-mackerras-new.json", @@ -20580,8 +20996,10 @@ { "license_key": "peter-deutsch-document", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-peter-deutsch-document", - "other_spdx_license_keys": [], + "spdx_license_key": "LPD-document", + "other_spdx_license_keys": [ + "LicenseRef-scancode-peter-deutsch-document" + ], "is_exception": false, "is_deprecated": false, "json": "peter-deutsch-document.json", @@ -20783,6 +21201,18 @@ "html": "pixabay-content.html", "license": "pixabay-content.LICENSE" }, + { + "license_key": "pixar", + "category": "Permissive", + "spdx_license_key": "Pixar", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "pixar.json", + "yaml": "pixar.yml", + "html": "pixar.html", + "license": "pixar.LICENSE" + }, { "license_key": "planet-source-code", "category": "Free Restricted", @@ -20834,7 +21264,7 @@ { "license_key": "pnmstitch", "category": "Permissive", - "spdx_license_key": "pnmstitc", + "spdx_license_key": "pnmstitch", "other_spdx_license_keys": [], "is_exception": false, "is_deprecated": false, @@ -21650,8 +22080,10 @@ { "license_key": "radvd", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-radvd", - "other_spdx_license_keys": [], + "spdx_license_key": "radvd", + "other_spdx_license_keys": [ + "LicenseRef-scancode-radvd" + ], "is_exception": false, "is_deprecated": false, "json": "radvd.json", @@ -21855,6 +22287,42 @@ "html": "repoze.html", "license": "repoze.LICENSE" }, + { + "license_key": "research-disclaimer", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-research-disclaimer", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "research-disclaimer.json", + "yaml": "research-disclaimer.yml", + "html": "research-disclaimer.html", + "license": "research-disclaimer.LICENSE" + }, + { + "license_key": "responsible-ai-source-1.0", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-responsible-ai-source-1.0", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "responsible-ai-source-1.0.json", + "yaml": "responsible-ai-source-1.0.yml", + "html": "responsible-ai-source-1.0.html", + "license": "responsible-ai-source-1.0.LICENSE" + }, + { + "license_key": "responsible-ai-source-1.1", + "category": "Proprietary Free", + "spdx_license_key": "LicenseRef-scancode-responsible-ai-source-1.1", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "responsible-ai-source-1.1.json", + "yaml": "responsible-ai-source-1.1.yml", + "html": "responsible-ai-source-1.1.html", + "license": "responsible-ai-source-1.1.LICENSE" + }, { "license_key": "rh-eula", "category": "Copyleft", @@ -22301,6 +22769,30 @@ "html": "sax-pd.html", "license": "sax-pd.LICENSE" }, + { + "license_key": "sax-pd-2.0", + "category": "Public Domain", + "spdx_license_key": "SAX-PD-2.0", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "sax-pd-2.0.json", + "yaml": "sax-pd-2.0.yml", + "html": "sax-pd-2.0.html", + "license": "sax-pd-2.0.LICENSE" + }, + { + "license_key": "saxix-mit", + "category": "Permissive", + "spdx_license_key": "LicenseRef-scancode-saxix-mit", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "saxix-mit.json", + "yaml": "saxix-mit.yml", + "html": "saxix-mit.html", + "license": "saxix-mit.LICENSE" + }, { "license_key": "saxpath", "category": "Permissive", @@ -23136,8 +23628,10 @@ { "license_key": "softsurfer", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-softsurfer", - "other_spdx_license_keys": [], + "spdx_license_key": "softSurfer", + "other_spdx_license_keys": [ + "LicenseRef-scancode-softsurfer" + ], "is_exception": false, "is_deprecated": false, "json": "softsurfer.json", @@ -23344,8 +23838,10 @@ { "license_key": "ssleay-windows", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-ssleay-windows", - "other_spdx_license_keys": [], + "spdx_license_key": "SSLeay-standalone", + "other_spdx_license_keys": [ + "LicenseRef-scancode-ssleay-windows" + ], "is_exception": false, "is_deprecated": false, "json": "ssleay-windows.json", @@ -24009,6 +24505,18 @@ "html": "sun-no-high-risk-activities.html", "license": "sun-no-high-risk-activities.LICENSE" }, + { + "license_key": "sun-ppp", + "category": "Permissive", + "spdx_license_key": "Sun-PPP", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "sun-ppp.json", + "yaml": "sun-ppp.yml", + "html": "sun-ppp.html", + "license": "sun-ppp.LICENSE" + }, { "license_key": "sun-project-x", "category": "Proprietary Free", @@ -24738,8 +25246,10 @@ { "license_key": "tgppl-1.0", "category": "Copyleft", - "spdx_license_key": "LicenseRef-scancode-tgppl-1.0", - "other_spdx_license_keys": [], + "spdx_license_key": "TGPPL-1.0", + "other_spdx_license_keys": [ + "LicenseRef-scancode-tgppl-1.0" + ], "is_exception": false, "is_deprecated": false, "json": "tgppl-1.0.json", @@ -25377,6 +25887,18 @@ "html": "ulem.html", "license": "ulem.LICENSE" }, + { + "license_key": "umich-merit", + "category": "Permissive", + "spdx_license_key": "UMich-Merit", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "umich-merit.json", + "yaml": "umich-merit.yml", + "html": "umich-merit.html", + "license": "umich-merit.LICENSE" + }, { "license_key": "unbuntu-font-1.0", "category": "Free Restricted", @@ -25473,6 +25995,20 @@ "html": "unicode-tou.html", "license": "unicode-tou.LICENSE" }, + { + "license_key": "unicode-v3", + "category": "Permissive", + "spdx_license_key": "Unicode-3.0", + "other_spdx_license_keys": [ + "LicenseRef-scancode-unicode-v3" + ], + "is_exception": false, + "is_deprecated": false, + "json": "unicode-v3.json", + "yaml": "unicode-v3.yml", + "html": "unicode-v3.html", + "license": "unicode-v3.LICENSE" + }, { "license_key": "universal-foss-exception-1.0", "category": "Copyleft Limited", @@ -25813,6 +26349,18 @@ "html": "vcalendar.html", "license": "vcalendar.LICENSE" }, + { + "license_key": "vcvrack-exception-to-gpl-3.0", + "category": "Copyleft Limited", + "spdx_license_key": "LicenseRef-scancode-vcvrack-exception-to-gpl-3.0", + "other_spdx_license_keys": [], + "is_exception": true, + "is_deprecated": false, + "json": "vcvrack-exception-to-gpl-3.0.json", + "yaml": "vcvrack-exception-to-gpl-3.0.yml", + "html": "vcvrack-exception-to-gpl-3.0.html", + "license": "vcvrack-exception-to-gpl-3.0.LICENSE" + }, { "license_key": "verbatim-manual", "category": "Copyleft", @@ -26659,8 +27207,10 @@ { "license_key": "x11-adobe", "category": "Permissive", - "spdx_license_key": "LicenseRef-scancode-x11-adobe", - "other_spdx_license_keys": [], + "spdx_license_key": "Adobe-Display-PostScript", + "other_spdx_license_keys": [ + "LicenseRef-scancode-x11-adobe" + ], "is_exception": false, "is_deprecated": false, "json": "x11-adobe.json", @@ -27102,6 +27652,18 @@ "html": "xiph-patent.html", "license": "xiph-patent.LICENSE" }, + { + "license_key": "xkeyboard-config-zinoviev", + "category": "Permissive", + "spdx_license_key": "xkeyboard-config-Zinoviev", + "other_spdx_license_keys": [], + "is_exception": false, + "is_deprecated": false, + "json": "xkeyboard-config-zinoviev.json", + "yaml": "xkeyboard-config-zinoviev.yml", + "html": "xkeyboard-config-zinoviev.html", + "license": "xkeyboard-config-zinoviev.LICENSE" + }, { "license_key": "xming", "category": "Commercial",