From 603bbbf2cf798fe8f011d80bf6e489286ff4e94f Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Wed, 18 Oct 2023 19:00:08 +0530 Subject: [PATCH] Fix test failures Signed-off-by: Ayan Sinha Mahapatra --- .../data/licenses/flex-2.5.LICENSE | 2 -- .../external/licensecheck/fedora/MIT.yml | 2 +- .../external/slic-tests/z2ram.c.yml | 2 +- .../lic2/newlib/newlib_license.txt.yml | 4 +-- .../lic2/newlib/newlib_license_24.txt.yml | 2 +- .../lic2/newlib/newlib_license_8.txt.yml | 2 +- .../mit_variants_and_gpl-2.0-plus.txt.yml | 2 +- .../licenses/alp-3.14-main-perl-data-uuid.yml | 2 +- .../stable_copyright-detailed.expected.yml | 10 +++--- .../stable_copyright-detailed.expected.yml | 35 ++++++++++--------- ...ntel-sound.copyright-detailed.expected.yml | 20 +++++------ .../copyright-detailed.expected.yml | 30 ++++++++-------- .../copyright-detailed.expected.yml | 32 ++++++++--------- 13 files changed, 72 insertions(+), 73 deletions(-) diff --git a/src/licensedcode/data/licenses/flex-2.5.LICENSE b/src/licensedcode/data/licenses/flex-2.5.LICENSE index 6f00b174137..571bf40c2ed 100644 --- a/src/licensedcode/data/licenses/flex-2.5.LICENSE +++ b/src/licensedcode/data/licenses/flex-2.5.LICENSE @@ -11,8 +11,6 @@ other_spdx_license_keys: text_urls: - http://www.cs.cmu.edu/afs/cs/project/ai-repository-9/ai/areas/nlp/parsing/flex/copying.txt minimum_coverage: 80 -ignorable_authors: - - the University of California, Berkeley and its contributors --- The United States Government has rights in this work pursuant diff --git a/tests/licensedcode/data/datadriven/external/licensecheck/fedora/MIT.yml b/tests/licensedcode/data/datadriven/external/licensecheck/fedora/MIT.yml index f9b2b02dd99..fa0767f5a23 100644 --- a/tests/licensedcode/data/datadriven/external/licensecheck/fedora/MIT.yml +++ b/tests/licensedcode/data/datadriven/external/licensecheck/fedora/MIT.yml @@ -38,5 +38,5 @@ license_expressions: - other-permissive - unixcrypt - isc - - osf-1990 + - hp-1986 - other-permissive diff --git a/tests/licensedcode/data/datadriven/external/slic-tests/z2ram.c.yml b/tests/licensedcode/data/datadriven/external/slic-tests/z2ram.c.yml index 82e83677b21..87a7b89ccc0 100644 --- a/tests/licensedcode/data/datadriven/external/slic-tests/z2ram.c.yml +++ b/tests/licensedcode/data/datadriven/external/slic-tests/z2ram.c.yml @@ -1,3 +1,3 @@ license_expressions: - - libpbm + - hpnd-pbmplus - gpl-2.0-plus diff --git a/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license.txt.yml b/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license.txt.yml index a0cf833d22f..cbf59390d05 100644 --- a/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license.txt.yml +++ b/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license.txt.yml @@ -6,7 +6,7 @@ license_expressions: - standard-ml-nj - amd-historical - sunpro - - osf-1990 + - hp-1986 - nilsson-historical - newlib-historical - bsd-new @@ -23,7 +23,7 @@ license_expressions: - lgpl-2.0-plus - lgpl-2.0-plus - intel-osl-1993 - - osf-1990 + - hp-1986 - hs-regexp - bsd-simplified - bsd-simplified diff --git a/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license_24.txt.yml b/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license_24.txt.yml index cce0f7aab6a..b389bb37d3d 100644 --- a/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license_24.txt.yml +++ b/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license_24.txt.yml @@ -1,2 +1,2 @@ license_expressions: - - osf-1990 + - hp-1986 diff --git a/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license_8.txt.yml b/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license_8.txt.yml index cce0f7aab6a..b389bb37d3d 100644 --- a/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license_8.txt.yml +++ b/tests/licensedcode/data/datadriven/lic2/newlib/newlib_license_8.txt.yml @@ -1,2 +1,2 @@ license_expressions: - - osf-1990 + - hp-1986 diff --git a/tests/licensedcode/data/datadriven/lic3/mit_variants_and_gpl-2.0-plus.txt.yml b/tests/licensedcode/data/datadriven/lic3/mit_variants_and_gpl-2.0-plus.txt.yml index 50d025214b8..410ba208e91 100644 --- a/tests/licensedcode/data/datadriven/lic3/mit_variants_and_gpl-2.0-plus.txt.yml +++ b/tests/licensedcode/data/datadriven/lic3/mit_variants_and_gpl-2.0-plus.txt.yml @@ -1,5 +1,5 @@ license_expressions: - mit-xfig - - libpbm + - hpnd-pbmplus - mit-old-style-no-advert - gpl-2.0-plus diff --git a/tests/packagedcode/data/alpine/licenses/alp-3.14-main-perl-data-uuid.yml b/tests/packagedcode/data/alpine/licenses/alp-3.14-main-perl-data-uuid.yml index 03e03f274bc..1585be53764 100644 --- a/tests/packagedcode/data/alpine/licenses/alp-3.14-main-perl-data-uuid.yml +++ b/tests/packagedcode/data/alpine/licenses/alp-3.14-main-perl-data-uuid.yml @@ -1,2 +1,2 @@ declared_license: osf-1990(variant) -license_expression: unknown +license_expression: osf-1990 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncbi-tools6/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncbi-tools6/stable_copyright-detailed.expected.yml index cf119ff22ae..9c28d7f9e57 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncbi-tools6/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncbi-tools6/stable_copyright-detailed.expected.yml @@ -30,11 +30,11 @@ other_license_expression: (public-domain AND us-govt-public-domain) AND boost-1. AND (public-domain AND us-govt-public-domain) other_license_expression_spdx: (LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain) AND BSL-1.0 AND (HPND-export-US-modify AND LicenseRef-scancode-proprietary-license) AND LicenseRef-scancode-public-domain - AND LicenseRef-scancode-flex-2.5 AND LicenseRef-scancode-flex-2.5 AND LicenseRef-scancode-flex-2.5 - AND LicenseRef-scancode-flex-2.5 AND LicenseRef-scancode-flex-2.5 AND MIT AND (GPL-2.0-or-later - AND GPL-2.0-or-later) AND (GPL-2.0-or-later AND GPL-2.0-or-later) AND (LicenseRef-scancode-public-domain - AND LicenseRef-scancode-us-govt-public-domain) AND (LicenseRef-scancode-public-domain AND - LicenseRef-scancode-us-govt-public-domain) AND (LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain) + AND BSD-3-Clause-flex AND BSD-3-Clause-flex AND BSD-3-Clause-flex AND BSD-3-Clause-flex AND + BSD-3-Clause-flex AND MIT AND (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-2.0-or-later + AND GPL-2.0-or-later) AND (LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain) + AND (LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain) AND + (LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain) license_detections: [] other_license_detections: - license_expression: public-domain AND us-govt-public-domain diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pulseaudio/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pulseaudio/stable_copyright-detailed.expected.yml index b6dc178f1a3..271fda4b6fd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pulseaudio/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pulseaudio/stable_copyright-detailed.expected.yml @@ -1,34 +1,35 @@ declared_license: declared_license_expression: lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND sun-source - AND libpbm AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND gpl-2.0-plus - AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND adrian AND lgpl-2.1-plus + AND hpnd-pbmplus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND + gpl-2.0-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND adrian AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus - AND lgpl-2.1-plus AND mit AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus - AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.0-plus AND lgpl-2.1-plus AND lgpl-2.1-plus + AND lgpl-2.1-plus AND lgpl-2.1-plus AND mit AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus + AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.0-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus - AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND gpl-2.0-plus AND lgpl-2.1-plus AND - lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus + AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND gpl-2.0-plus AND + lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus declared_license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later - AND LicenseRef-scancode-sun-source AND xlock AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND - LGPL-2.1-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later - AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LicenseRef-scancode-adrian AND LGPL-2.1-or-later + AND LicenseRef-scancode-sun-source AND HPND-Pbmplus AND LGPL-2.1-or-later AND LGPL-2.1-or-later + AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND + LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LicenseRef-scancode-adrian AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND - LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND MIT AND LGPL-2.1-or-later + LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND MIT AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND - LGPL-2.1-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later + LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND - GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later + LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later + AND LGPL-2.1-or-later other_license_expression: other_license_expression_spdx: license_detections: @@ -119,7 +120,7 @@ license_detections: or profits or other special, indirect and consequential damages, even if Sun has been advised of the possibility of such damages. identifier: sun_source-02813787-7782-d45a-b30b-598566f2f032 - - license_expression: libpbm + - license_expression: hpnd-pbmplus matches: - score: '100.0' start_line: 68 @@ -127,10 +128,10 @@ license_detections: matched_length: 56 match_coverage: '100.0' matcher: 2-aho - license_expression: libpbm - rule_identifier: libpbm.LICENSE + license_expression: hpnd-pbmplus + rule_identifier: hpnd-pbmplus.LICENSE rule_relevance: 100 - rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/libpbm.LICENSE + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-pbmplus.LICENSE matched_text: | Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided @@ -138,7 +139,7 @@ license_detections: copyright notice and this permission notice appear in supporting documentation. This software is provided "as is" without express or implied warranty. - identifier: libpbm-285aa0f9-c4e9-26cb-7e01-29594fbc0842 + identifier: hpnd_pbmplus-791a84f8-2595-c6f9-929c-722baf14af4e - license_expression: lgpl-2.1-plus matches: - score: '100.0' diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intel-sound.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intel-sound.copyright-detailed.expected.yml index 5dd46dbe0db..3aca6dd0e42 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intel-sound.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intel-sound.copyright-detailed.expected.yml @@ -4,12 +4,12 @@ declared_license: - Binary redistribution (Intel 3) declared_license_expression: intel AND intel AND (intel AND (bsd-new AND other-permissive AND other-copyleft) AND bsd-new AND x11-lucent AND standard-ml-nj AND amd-historical AND sunpro - AND osf-1990 AND nilsson-historical AND newlib-historical AND bsd-simplified AND x11-hanson + AND hp-1986 AND nilsson-historical AND newlib-historical AND bsd-simplified AND x11-hanson AND delorie-historical AND intel-osl-1993) declared_license_expression_spdx: LicenseRef-scancode-intel AND LicenseRef-scancode-intel AND (LicenseRef-scancode-intel AND (BSD-3-Clause AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft) AND BSD-3-Clause AND dtoa AND SMLNJ AND LicenseRef-scancode-amd-historical - AND SunPro AND HP-1989 AND LicenseRef-scancode-nilsson-historical AND LicenseRef-scancode-newlib-historical + AND SunPro AND HP-1986 AND LicenseRef-scancode-nilsson-historical AND LicenseRef-scancode-newlib-historical AND BSD-2-Clause AND LicenseRef-scancode-x11-hanson AND LicenseRef-scancode-delorie-historical AND LicenseRef-scancode-intel-osl-1993) other_license_expression: @@ -115,7 +115,7 @@ license_detections: POSSIBILITY OF SUCH DAMAGE. identifier: intel-aad21753-33a8-9b6b-b0be-dbc0838c75ab - license_expression: intel AND (bsd-new AND other-permissive AND other-copyleft) AND bsd-new - AND x11-lucent AND standard-ml-nj AND amd-historical AND sunpro AND osf-1990 AND nilsson-historical + AND x11-lucent AND standard-ml-nj AND amd-historical AND sunpro AND hp-1986 AND nilsson-historical AND newlib-historical AND bsd-simplified AND x11-hanson AND delorie-historical AND intel-osl-1993 matches: - score: '95.0' @@ -327,10 +327,10 @@ license_detections: matched_length: 88 match_coverage: '100.0' matcher: 2-aho - license_expression: osf-1990 - rule_identifier: osf-1990_3.RULE + license_expression: hp-1986 + rule_identifier: hp-1986.LICENSE rule_relevance: 100 - rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/osf-1990_3.RULE + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE matched_text: | To anyone who acknowledges that this file is provided "AS IS" without any express or implied warranty: @@ -707,10 +707,10 @@ license_detections: matched_length: 88 match_coverage: '100.0' matcher: 2-aho - license_expression: osf-1990 - rule_identifier: osf-1990_3.RULE + license_expression: hp-1986 + rule_identifier: hp-1986.LICENSE rule_relevance: 100 - rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/osf-1990_3.RULE + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE matched_text: | To anyone who acknowledges that this file is provided "AS IS" without any express or implied warranty: @@ -1231,7 +1231,7 @@ license_detections: LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - identifier: intel_and__bsd_new_and_other_permissive_and_other_copyleft__and_bsd_new_and_x11_lucent_and_standard_ml_nj_and_amd_historical_and_sunpro_and_osf_1990_and_nilsson_historical_and_newlib_historical_and_bsd_simplified_and_x11_hanson_and_delorie_historical_and_intel_osl_1993-690642fb-013b-0f88-86be-98f59b0d6212 + identifier: intel_and__bsd_new_and_other_permissive_and_other_copyleft__and_bsd_new_and_x11_lucent_and_standard_ml_nj_and_amd_historical_and_sunpro_and_hp_1986_and_nilsson_historical_and_newlib_historical_and_bsd_simplified_and_x11_hanson_and_delorie_historical_and_intel_osl_1993-477aff46-5788-d7c6-01dd-0bed8adb8776 other_license_detections: [] copyright: | 2014, Intel Corporation. diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-10-base/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-10-base/copyright-detailed.expected.yml index 45166918ec9..f15e6631246 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-10-base/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-10-base/copyright-detailed.expected.yml @@ -10,10 +10,10 @@ declared_license_expression: gpl-3.0-plus WITH gcc-exception-3.1 AND gpl-3.0-plu AND lgpl-2.1-plus WITH gcc-exception-3.1 AND (lgpl-2.0-plus AND gpl-1.0-plus) AND bsla-no-advert AND bsla AND bsd-original-uc AND bsd-new AND bsd-original-uc AND flex-2.5 AND bsd-original-uc AND (gpl-3.0 AND gpl-2.0 AND lgpl-3.0-plus WITH cygwin-exception-lgpl-3.0-plus AND other-copyleft - AND other-permissive) AND x11-lucent AND amd-historical AND sunpro AND osf-1990 AND nilsson-historical + AND other-permissive) AND x11-lucent AND amd-historical AND sunpro AND hp-1986 AND nilsson-historical AND newlib-historical AND bsd-new AND amd-historical AND bsd-new AND bsd-simplified AND bsd-simplified AND bsd-simplified AND x11-hanson AND bsd-simplified AND bsd-new AND lgpl-2.0-plus AND lgpl-2.1-plus - AND lgpl-2.0-plus AND lgpl-2.0-plus AND intel-osl-1993 AND osf-1990 AND hs-regexp AND bsd-simplified + AND lgpl-2.0-plus AND lgpl-2.0-plus AND intel-osl-1993 AND hp-1986 AND hs-regexp AND bsd-simplified AND bsd-simplified AND bsd-simplified AND bsd-new AND unicode AND unicode AND lgpl-2.1-plus declared_license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 AND GPL-3.0-or-later WITH GCC-exception-3.1 AND BSD-3-Clause AND NCSA AND MIT AND MIT AND GFDL-1.2-only AND GCC-exception-3.1 @@ -26,14 +26,14 @@ declared_license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 AND GP LGPL-3.0-only) AND (LGPL-2.0-only AND GPL-3.0-only) AND GPL-3.0-or-later AND LicenseRef-scancode-gnu-emacs-gpl-1988 AND (GPL-3.0-only AND LGPL-2.1-only) AND (GPL-2.0-or-later AND GPL-3.0-or-later) AND LGPL-2.1-or-later WITH GCC-exception-3.1 AND (LGPL-2.0-or-later AND GPL-1.0-or-later) AND LicenseRef-scancode-bsla-no-advert - AND BSD-4.3TAHOE AND BSD-4-Clause-UC AND BSD-3-Clause AND BSD-4-Clause-UC AND LicenseRef-scancode-flex-2.5 + AND BSD-4.3TAHOE AND BSD-4-Clause-UC AND BSD-3-Clause AND BSD-4-Clause-UC AND BSD-3-Clause-flex AND BSD-4-Clause-UC AND (GPL-3.0-only AND GPL-2.0-only AND LGPL-3.0-or-later WITH LicenseRef-scancode-cygwin-exception-lgpl-3.0-plus AND LicenseRef-scancode-other-copyleft AND LicenseRef-scancode-other-permissive) AND dtoa - AND LicenseRef-scancode-amd-historical AND SunPro AND HP-1989 AND LicenseRef-scancode-nilsson-historical + AND LicenseRef-scancode-amd-historical AND SunPro AND HP-1986 AND LicenseRef-scancode-nilsson-historical AND LicenseRef-scancode-newlib-historical AND BSD-3-Clause AND LicenseRef-scancode-amd-historical AND BSD-3-Clause AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AND LicenseRef-scancode-x11-hanson AND BSD-2-Clause AND BSD-3-Clause AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later - AND LGPL-2.0-or-later AND LicenseRef-scancode-intel-osl-1993 AND HP-1989 AND Spencer-94 AND + AND LGPL-2.0-or-later AND LicenseRef-scancode-intel-osl-1993 AND HP-1986 AND Spencer-94 AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AND BSD-3-Clause AND LicenseRef-scancode-unicode AND LicenseRef-scancode-unicode AND LGPL-2.1-or-later other_license_expression: @@ -1196,7 +1196,7 @@ license_detections: \ use, copy, modify, and distribute this\nsoftware is freely granted, provided that\ \ this notice \nis preserved." identifier: sunpro-8cbf8f94-4a9d-af5a-dc57-033780c667f7 - - license_expression: osf-1990 + - license_expression: hp-1986 matches: - score: '100.0' start_line: 992 @@ -1204,10 +1204,10 @@ license_detections: matched_length: 88 match_coverage: '100.0' matcher: 2-aho - license_expression: osf-1990 - rule_identifier: osf-1990_3.RULE + license_expression: hp-1986 + rule_identifier: hp-1986.LICENSE rule_relevance: 100 - rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/osf-1990_3.RULE + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE matched_text: | To anyone who acknowledges that this file is provided "AS IS" without any express or implied warranty: @@ -1219,7 +1219,7 @@ license_detections: of the software without specific, written prior permission. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. - identifier: osf_1990-85b7bedc-f12a-acee-5301-5e355aaf1e96 + identifier: hp_1986-28bf595d-945f-f17e-30dc-d425078ee11d - license_expression: nilsson-historical matches: - score: '100.0' @@ -1663,7 +1663,7 @@ license_detections: OF ANY KIND. IN NO EVENT SHALL INTEL'S TOTAL LIABILITY EXCEED THE SUM PAID TO INTEL FOR THE PRODUCT LICENSED HEREUNDER. identifier: intel_osl_1993-19445c9b-464b-0dc8-0e77-c358d42a8657 - - license_expression: osf-1990 + - license_expression: hp-1986 matches: - score: '100.0' start_line: 1342 @@ -1671,10 +1671,10 @@ license_detections: matched_length: 88 match_coverage: '100.0' matcher: 2-aho - license_expression: osf-1990 - rule_identifier: osf-1990_3.RULE + license_expression: hp-1986 + rule_identifier: hp-1986.LICENSE rule_relevance: 100 - rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/osf-1990_3.RULE + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE matched_text: | To anyone who acknowledges that this file is provided "AS IS" without any express or implied warranty: @@ -1686,7 +1686,7 @@ license_detections: of the software without specific, written prior permission. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. - identifier: osf_1990-85b7bedc-f12a-acee-5301-5e355aaf1e96 + identifier: hp_1986-28bf595d-945f-f17e-30dc-d425078ee11d - license_expression: hs-regexp matches: - score: '100.0' diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-9-base/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-9-base/copyright-detailed.expected.yml index a755fb9f08c..fe8942e87b8 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-9-base/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-9-base/copyright-detailed.expected.yml @@ -13,10 +13,10 @@ declared_license_expression: gpl-3.0-plus WITH gcc-exception-3.1 AND gpl-3.0-plu gpl-3.0-plus AND gpl-3.0-plus AND gpl-3.0-plus AND (lgpl-2.0-plus AND gpl-1.0-plus) AND bsla-no-advert AND bsla AND bsd-original-uc AND bsd-new AND bsd-original-uc AND flex-2.5 AND bsd-original-uc AND (gpl-3.0 AND gpl-2.0 AND lgpl-3.0-plus WITH cygwin-exception-lgpl-3.0-plus AND other-copyleft - AND other-permissive) AND x11-lucent AND amd-historical AND sunpro AND osf-1990 AND nilsson-historical + AND other-permissive) AND x11-lucent AND amd-historical AND sunpro AND hp-1986 AND nilsson-historical AND newlib-historical AND bsd-new AND amd-historical AND bsd-new AND bsd-simplified AND bsd-simplified AND bsd-simplified AND x11-hanson AND bsd-simplified AND bsd-new AND lgpl-2.0-plus AND lgpl-2.1-plus - AND lgpl-2.0-plus AND lgpl-2.0-plus AND intel-osl-1993 AND osf-1990 AND hs-regexp AND bsd-simplified + AND lgpl-2.0-plus AND lgpl-2.0-plus AND intel-osl-1993 AND hp-1986 AND hs-regexp AND bsd-simplified AND bsd-simplified AND bsd-simplified AND bsd-new declared_license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 AND GPL-3.0-or-later WITH GCC-exception-3.1 AND BSD-3-Clause AND NCSA AND MIT AND MIT AND GFDL-1.2-only AND GCC-exception-3.1 @@ -33,14 +33,14 @@ declared_license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 AND GP AND (LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only) AND (LGPL-2.1-only AND LGPL-3.0-only) AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later AND GPL-3.0-or-later AND (LGPL-2.0-or-later AND GPL-1.0-or-later) AND LicenseRef-scancode-bsla-no-advert AND BSD-4.3TAHOE - AND BSD-4-Clause-UC AND BSD-3-Clause AND BSD-4-Clause-UC AND LicenseRef-scancode-flex-2.5 - AND BSD-4-Clause-UC AND (GPL-3.0-only AND GPL-2.0-only AND LGPL-3.0-or-later WITH LicenseRef-scancode-cygwin-exception-lgpl-3.0-plus + AND BSD-4-Clause-UC AND BSD-3-Clause AND BSD-4-Clause-UC AND BSD-3-Clause-flex AND BSD-4-Clause-UC + AND (GPL-3.0-only AND GPL-2.0-only AND LGPL-3.0-or-later WITH LicenseRef-scancode-cygwin-exception-lgpl-3.0-plus AND LicenseRef-scancode-other-copyleft AND LicenseRef-scancode-other-permissive) AND dtoa - AND LicenseRef-scancode-amd-historical AND SunPro AND HP-1989 AND LicenseRef-scancode-nilsson-historical + AND LicenseRef-scancode-amd-historical AND SunPro AND HP-1986 AND LicenseRef-scancode-nilsson-historical AND LicenseRef-scancode-newlib-historical AND BSD-3-Clause AND LicenseRef-scancode-amd-historical AND BSD-3-Clause AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AND LicenseRef-scancode-x11-hanson AND BSD-2-Clause AND BSD-3-Clause AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later - AND LGPL-2.0-or-later AND LicenseRef-scancode-intel-osl-1993 AND HP-1989 AND Spencer-94 AND + AND LGPL-2.0-or-later AND LicenseRef-scancode-intel-osl-1993 AND HP-1986 AND Spencer-94 AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AND BSD-3-Clause other_license_expression: other_license_expression_spdx: @@ -1518,7 +1518,7 @@ license_detections: \ use, copy, modify, and distribute this\nsoftware is freely granted, provided that\ \ this notice \nis preserved." identifier: sunpro-8cbf8f94-4a9d-af5a-dc57-033780c667f7 - - license_expression: osf-1990 + - license_expression: hp-1986 matches: - score: '100.0' start_line: 1200 @@ -1526,10 +1526,10 @@ license_detections: matched_length: 88 match_coverage: '100.0' matcher: 2-aho - license_expression: osf-1990 - rule_identifier: osf-1990_3.RULE + license_expression: hp-1986 + rule_identifier: hp-1986.LICENSE rule_relevance: 100 - rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/osf-1990_3.RULE + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE matched_text: | To anyone who acknowledges that this file is provided "AS IS" without any express or implied warranty: @@ -1541,7 +1541,7 @@ license_detections: of the software without specific, written prior permission. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. - identifier: osf_1990-85b7bedc-f12a-acee-5301-5e355aaf1e96 + identifier: hp_1986-28bf595d-945f-f17e-30dc-d425078ee11d - license_expression: nilsson-historical matches: - score: '100.0' @@ -1985,7 +1985,7 @@ license_detections: OF ANY KIND. IN NO EVENT SHALL INTEL'S TOTAL LIABILITY EXCEED THE SUM PAID TO INTEL FOR THE PRODUCT LICENSED HEREUNDER. identifier: intel_osl_1993-19445c9b-464b-0dc8-0e77-c358d42a8657 - - license_expression: osf-1990 + - license_expression: hp-1986 matches: - score: '100.0' start_line: 1550 @@ -1993,10 +1993,10 @@ license_detections: matched_length: 88 match_coverage: '100.0' matcher: 2-aho - license_expression: osf-1990 - rule_identifier: osf-1990_3.RULE + license_expression: hp-1986 + rule_identifier: hp-1986.LICENSE rule_relevance: 100 - rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/osf-1990_3.RULE + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE matched_text: | To anyone who acknowledges that this file is provided "AS IS" without any express or implied warranty: @@ -2008,7 +2008,7 @@ license_detections: of the software without specific, written prior permission. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. - identifier: osf_1990-85b7bedc-f12a-acee-5301-5e355aaf1e96 + identifier: hp_1986-28bf595d-945f-f17e-30dc-d425078ee11d - license_expression: hs-regexp matches: - score: '100.0'