diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5ff549a8a61..cf9daae9a42 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -42,6 +42,13 @@ v32.1.0 (next, roadmap) of these in other summary plugins. See https://github.com/nexB/scancode-toolkit/issues/1745 +- New and updated licenses, including support for newly released + SPDX license list version 3.22. This release of the SPDX license + list had 48 new licenses, and several of them we already had as + licenses/rules, and these has been modified to be consistent with + the SPDX list. And the rest have been added as new licenses. + For more details see https://github.com/nexB/scancode-toolkit/pull/3554 + - Upgraded spdx-tools dependency to v0.8. See https://github.com/nexB/scancode-toolkit/issues/3455 diff --git a/src/licensedcode/data/licenses/adobe-utopia.LICENSE b/src/licensedcode/data/licenses/adobe-utopia.LICENSE new file mode 100644 index 00000000000..1444f872a00 --- /dev/null +++ b/src/licensedcode/data/licenses/adobe-utopia.LICENSE @@ -0,0 +1,23 @@ +--- +key: adobe-utopia +short_name: Adobe Utopia Font License +name: Adobe Utopia Font License +category: Permissive +owner: Adobe Systems +spdx_license_key: Adobe-Utopia +other_urls: + - https://gitlab.freedesktop.org/xorg/font/adobe-utopia-100dpi/-/blob/master/COPYING?ref_type=heads +--- + +Permission to use, reproduce, display and distribute the listed typefaces +is hereby granted, provided that the Adobe Copyright notice appears in all +whole and partial copies of the software and that the following trademark +symbol and attribution appear in all unmodified copies of the software: + +The Adobe typefaces (Type 1 font program, bitmaps and Adobe Font Metric +files) donated are: + + Utopia Regular + Utopia Italic + Utopia Bold + Utopia Bold Italic \ No newline at end of file diff --git a/src/licensedcode/data/licenses/autoconf-simple-exception.LICENSE b/src/licensedcode/data/licenses/autoconf-simple-exception.LICENSE index 1d2ac484c1e..a223993df7b 100644 --- a/src/licensedcode/data/licenses/autoconf-simple-exception.LICENSE +++ b/src/licensedcode/data/licenses/autoconf-simple-exception.LICENSE @@ -9,7 +9,11 @@ notes: | this is a simpler version of the Autonconf exception to the GPL 3.0 used in GNU Config config.guess and config.sub is_exception: yes -spdx_license_key: LicenseRef-scancode-autoconf-simple-exception +spdx_license_key: Autoconf-exception-generic-3.0 +other_spdx_license_keys: + - LicenseRef-scancode-autoconf-simple-exception +other_urls: + - https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/rawhide/f/config.guess --- As a special exception to the GNU General Public License, if you diff --git a/src/licensedcode/data/licenses/bigelow-holmes.LICENSE b/src/licensedcode/data/licenses/bigelow-holmes.LICENSE index b1bfa0a7c5e..34665d39e59 100644 --- a/src/licensedcode/data/licenses/bigelow-holmes.LICENSE +++ b/src/licensedcode/data/licenses/bigelow-holmes.LICENSE @@ -5,9 +5,13 @@ name: Bigelow & Holmes Lucida Fonts License category: Permissive owner: Oracle Corporation homepage_url: http://www.opensolaris.org/os/project/indiana/resources/getit/OpenSolaris_Dev_Preview_Third_Party_License.txt -spdx_license_key: LicenseRef-scancode-bigelow-holmes +spdx_license_key: Lucida-Bitmap-Fonts +other_spdx_license_keys: + - LicenseRef-scancode-bigelow-holmes text_urls: - http://www.opensolaris.org/os/project/indiana/resources/getit/OpenSolaris_Dev_Preview_Third_Party_License.txt +other_urls: + - https://gitlab.freedesktop.org/xorg/font/bh-100dpi/-/blob/master/COPYING?ref_type=heads ignorable_copyrights: - (c) Copyright 1989 Sun Microsystems, Inc. - (c) Copyright Bigelow & Holmes 1986, 1985 diff --git a/src/licensedcode/data/licenses/bsd-3-clause-hp.LICENSE b/src/licensedcode/data/licenses/bsd-3-clause-hp.LICENSE new file mode 100644 index 00000000000..526f8e70dd4 --- /dev/null +++ b/src/licensedcode/data/licenses/bsd-3-clause-hp.LICENSE @@ -0,0 +1,34 @@ +--- +key: bsd-3-clause-hp +short_name: Hewlett-Packard BSD variant license +name: Hewlett-Packard BSD variant license +category: Permissive +owner: HP - Hewlett Packard +spdx_license_key: BSD-3-Clause-HP +other_urls: + - https://github.com/zdohnal/hplip/blob/master/COPYING#L939 +--- + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the {{HP}} nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PATENT INFRINGEMENT; PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT 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. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/bsd-3-clause-sun.LICENSE b/src/licensedcode/data/licenses/bsd-3-clause-sun.LICENSE index 642d35afbb2..1d12c2273d1 100644 --- a/src/licensedcode/data/licenses/bsd-3-clause-sun.LICENSE +++ b/src/licensedcode/data/licenses/bsd-3-clause-sun.LICENSE @@ -6,7 +6,9 @@ category: Permissive owner: Oracle (Sun) notes: This is the same as the bsd-3-clause-no-nuclear-warranty but without the nuclear related terms. Rare and not exactly the same as a plain bsd. -spdx_license_key: LicenseRef-scancode-bsd-3-clause-sun +spdx_license_key: BSD-3-Clause-Sun +other_spdx_license_keys: + - LicenseRef-scancode-bsd-3-clause-sun minimum_coverage: 90 --- diff --git a/src/licensedcode/data/licenses/bsd-inferno-nettverk.LICENSE b/src/licensedcode/data/licenses/bsd-inferno-nettverk.LICENSE new file mode 100644 index 00000000000..b0fe7d3d0bd --- /dev/null +++ b/src/licensedcode/data/licenses/bsd-inferno-nettverk.LICENSE @@ -0,0 +1,51 @@ +--- +key: bsd-inferno-nettverk +short_name: BSD-Inferno-Nettverk +name: BSD-Inferno-Nettverk +category: Permissive +owner: Inferno Nettverk +spdx_license_key: BSD-Inferno-Nettverk +other_urls: + - https://www.inet.no/dante/LICENSE +ignorable_authors: + - Inferno Nettverk A/S, Norway +ignorable_emails: + - sdc@inet.no +--- + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. The above copyright notice, this list of conditions and the following + disclaimer must appear in all copies of the software, derivative works + or modified versions, and any portions thereof, aswell as in all + supporting documentation. +2. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by + Inferno Nettverk A/S, Norway. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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. + +Inferno Nettverk A/S requests users of this software to return to + + Software Distribution Coordinator or sdc@inet.no + Inferno Nettverk A/S + Oslo Research Park + Gaustadalléen 21 + NO-0349 Oslo + Norway + +any improvements or extensions that they make and grant Inferno Nettverk A/S +the rights to redistribute these changes. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/bsd-systemics.LICENSE b/src/licensedcode/data/licenses/bsd-systemics.LICENSE new file mode 100644 index 00000000000..02b62f5cfc8 --- /dev/null +++ b/src/licensedcode/data/licenses/bsd-systemics.LICENSE @@ -0,0 +1,51 @@ +--- +key: bsd-systemics +short_name: Systemics BSD variant license +name: Systemics BSD variant license +category: Permissive +owner: Systemics Ltd +spdx_license_key: BSD-Systemics +other_urls: + - https://metacpan.org/release/DPARIS/Crypt-DES-2.07/source/COPYRIGHT +ignorable_authors: + - Systemics Ltd (http://www.systemics.com/) +ignorable_urls: + - http://www.systemics.com/ +--- + +This library and applications are FREE FOR COMMERCIAL AND NON-COMMERCIAL USE +as long as the following conditions are adhered to. + +Copyright remains with Systemics Ltd, and as such any Copyright notices +in the code are not to be removed. If this code is used in a product, +Systemics should be given attribution as the author of the parts used. +This can be in the form of a textual message at program startup or +in documentation (online or textual) provided with the package. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Systemics Ltd (http://www.systemics.com/) + +THIS SOFTWARE IS PROVIDED BY SYSTEMICS LTD ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +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. + +The licence and distribution terms for any publically available version or +derivative of this code cannot be changed. i.e. this code cannot simply be +copied and put under another distribution licence [including the GNU Public Licence.] \ No newline at end of file diff --git a/src/licensedcode/data/licenses/check-cvs.LICENSE b/src/licensedcode/data/licenses/check-cvs.LICENSE new file mode 100644 index 00000000000..15edae25f21 --- /dev/null +++ b/src/licensedcode/data/licenses/check-cvs.LICENSE @@ -0,0 +1,13 @@ +--- +key: check-cvs +short_name: check-cvs License +name: check-cvs License +category: Permissive +owner: GNU Savannah Project +spdx_license_key: check-cvs +other_urls: + - http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/contrib/check_cvs.in?revision=1.1.4.3&view=markup&pathrev=cvs1-11-23#l2 +--- + +Permission is granted to copy and/or distribute this file, with or +without modifications, provided this notice is preserved. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/cronyx.LICENSE b/src/licensedcode/data/licenses/cronyx.LICENSE new file mode 100644 index 00000000000..033186e12fa --- /dev/null +++ b/src/licensedcode/data/licenses/cronyx.LICENSE @@ -0,0 +1,19 @@ +--- +key: cronyx +short_name: Cronyx License +name: Cronyx License +category: Permissive +owner: Cronyx Ltd. +spdx_license_key: Cronyx +other_urls: + - https://gitlab.freedesktop.org/xorg/font/alias/-/blob/master/COPYING + - https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic/-/blob/master/COPYING + - https://gitlab.freedesktop.org/xorg/font/misc-cyrillic/-/blob/master/COPYING + - https://gitlab.freedesktop.org/xorg/font/screen-cyrillic/-/blob/master/COPYING +--- + +This software may be used, modified, copied, distributed, and sold, +in both source and binary form provided that the copyright +and these terms are retained. Under no circumstances is the author +responsible for the proper functioning of this software, nor does +the author assume any responsibility for damages incurred with its use. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/dl-de-zero-2.0.LICENSE b/src/licensedcode/data/licenses/dl-de-zero-2.0.LICENSE new file mode 100644 index 00000000000..5b8e43cc290 --- /dev/null +++ b/src/licensedcode/data/licenses/dl-de-zero-2.0.LICENSE @@ -0,0 +1,38 @@ +--- +key: dl-de-zero-2.0 +short_name: Data licence Germany – zero – version 2.0 +name: Data licence Germany – zero – version 2.0 +category: Permissive +owner: Germany GovDataProject +spdx_license_key: DL-DE-ZERO-2.0 +other_urls: + - https://www.govdata.de/dl-de/zero-2-0 +ignorable_urls: + - https://www.govdata.de/dl-de/zero-2-0 +--- + +DL-DE->Zero-2.0 +Datenlizenz Deutschland – Zero – Version 2.0 + +Jede Nutzung ist ohne Einschränkungen oder Bedingungen zulässig. + +Die bereitgestellten Daten und Metadaten dürfen für die kommerzielle und nicht kommerzielle Nutzung insbesondere + + vervielfältigt, ausgedruckt, präsentiert, verändert, bearbeitet sowie an Dritte übermittelt werden; + mit eigenen Daten und Daten Anderer zusammengeführt und zu selbständigen neuen Datensätzen verbunden werden; + in interne und externe Geschäftsprozesse, Produkte und Anwendungen in öffentlichen und nicht öffentlichen elektronischen Netzwerken eingebunden werden. + + +Data licence Germany – Zero – version 2.0 + +Any use is permitted without restrictions or conditions. + +The data and meta-data provided may, for commercial and non-commercial use, in particular + + be copied, printed, presented, altered, processed and transmitted to third parties; + be merged with own data and with the data of others and be combined to form new and independent datasets; + be integrated in internal and external business processes, products and applications in public and non-public electronic networks. + + + +URL: https://www.govdata.de/dl-de/zero-2-0 \ No newline at end of file diff --git a/src/licensedcode/data/licenses/fbm.LICENSE b/src/licensedcode/data/licenses/fbm.LICENSE new file mode 100644 index 00000000000..e0700cde699 --- /dev/null +++ b/src/licensedcode/data/licenses/fbm.LICENSE @@ -0,0 +1,16 @@ +--- +key: fbm +short_name: Fuzzy Bitmap License +name: Fuzzy Bitmap License +category: Permissive +owner: Michael Mauldin +spdx_license_key: FBM +other_urls: + - https://github.com/SWI-Prolog/packages-xpce/blob/161a40cd82004f731ba48024f9d30af388a7edf5/src/img/gifwrite.c#L21-L26 +--- + +Permission is granted to use this file in whole or in +part for any purpose, educational, recreational or commercial, +provided that this copyright notice is retained unchanged. +This software is available to all free of charge by anonymous +FTP and in the UUNET archives. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/ferguson-twofish.LICENSE b/src/licensedcode/data/licenses/ferguson-twofish.LICENSE new file mode 100644 index 00000000000..9db0be2429a --- /dev/null +++ b/src/licensedcode/data/licenses/ferguson-twofish.LICENSE @@ -0,0 +1,27 @@ +--- +key: ferguson-twofish +short_name: Ferguson Twofish License +name: Ferguson Twofish License +category: Permissive +owner: Niels Ferguson +spdx_license_key: Ferguson-Twofish +other_urls: + - https://github.com/wernerd/ZRTPCPP/blob/6b3cd8e6783642292bad0c21e3e5e5ce45ff3e03/cryptcommon/twofish.c#L113C3-L127 +notes: This is essentially niels-ferguson.LICENSE without the disclaimer at the end. +--- + +The author hereby grants a perpetual license to everybody to + use this code for any purpose as long as the copyright message is included + in the source code of this or any derived work. + + Yes, this means that you, your company, your club, and anyone else + can use this code anywhere you want. You can change it and distribute it + under the GPL, include it in your commercial product without releasing + the source code, put it on the web, etc. + The only thing you cannot do is remove my copyright message, + or distribute any source code based on this implementation that does not + include my copyright message. + + I appreciate a mention in the documentation or credits, + but I understand if that is difficult to do. + I also appreciate it if you tell me where and why you used my code. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/flex-2.5.LICENSE b/src/licensedcode/data/licenses/flex-2.5.LICENSE index 093c09b3535..571bf40c2ed 100644 --- a/src/licensedcode/data/licenses/flex-2.5.LICENSE +++ b/src/licensedcode/data/licenses/flex-2.5.LICENSE @@ -5,28 +5,41 @@ name: Flex License v2.5 category: Permissive owner: Regents of the University of California homepage_url: http://www.cs.princeton.edu/~appel/modern/c/software/flex/flex.html -spdx_license_key: LicenseRef-scancode-flex-2.5 +spdx_license_key: BSD-3-Clause-flex +other_spdx_license_keys: + - LicenseRef-scancode-flex-2.5 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 to contract no. DE- -AC03-76SF00098 between the United States Department of Energy and the University of -California. +The United States Government has rights in this work pursuant +to contract no. DE-AC03-76SF00098 between the United States +Department of Energy and the University of California. -Redistribution and use in source and binary forms are permitted provided that: (1) -source distributions retain this entire copyright notice and comment, and (2) -distributions including binaries display the following acknowledgement: "This product -includes software developed by the University of California, Berkeley and its -contributors" in the documentation or other materials provided with the distribution -and in all advertising materials mentioning features or use of this software. Neither -the name of the University nor the names of its contributors may be used to endorse -or promote products derived from this software without specific prior written -permission. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: -THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE. \ No newline at end of file +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +Neither the name of the University nor the names of its contributors +may be used to endorse or promote products derived from this software +without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. + +This basically says "do whatever you please with this software except +remove this notice or take advantage of the University's (or the flex +authors') name". + +Note that the "flex.skl" scanner skeleton carries no copyright notice. +You are free to do whatever you please with scanners generated using flex; +for them, you are not even bound by the above copyright. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/furuseth.LICENSE b/src/licensedcode/data/licenses/furuseth.LICENSE new file mode 100644 index 00000000000..0ffb660bb03 --- /dev/null +++ b/src/licensedcode/data/licenses/furuseth.LICENSE @@ -0,0 +1,17 @@ +--- +key: furuseth +short_name: Furuseth License +name: Furuseth License +category: Permissive +owner: Unspecified +spdx_license_key: Furuseth +other_urls: + - https://git.openldap.org/openldap/openldap/-/blob/master/COPYRIGHT?ref_type=heads#L39-51 +--- + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that this notice is preserved. +The names of the copyright holders may not be used to endorse or +promote products derived from this software without their specific +prior written permission. This software is provided ``as is'' +without express or implied warranty. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/fwlw.LICENSE b/src/licensedcode/data/licenses/fwlw.LICENSE new file mode 100644 index 00000000000..ee54414cedf --- /dev/null +++ b/src/licensedcode/data/licenses/fwlw.LICENSE @@ -0,0 +1,13 @@ +--- +key: fwlw +short_name: fwlw License +name: fwlw License +category: Permissive +owner: Unspecified +spdx_license_key: fwlw +other_urls: + - https://mirrors.nic.cz/tex-archive/macros/latex/contrib/fwlw/README +--- + +This software package may be freely used, transmitted, reproduced, or modified provided that +this notice is left intact. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/gcc-exception-2.0-note.LICENSE b/src/licensedcode/data/licenses/gcc-exception-2.0-note.LICENSE new file mode 100644 index 00000000000..c7e8cccae06 --- /dev/null +++ b/src/licensedcode/data/licenses/gcc-exception-2.0-note.LICENSE @@ -0,0 +1,29 @@ +--- +key: gcc-exception-2.0-note +short_name: GCC Runtime Library exception 2.0 - note variant +name: GCC Runtime Library exception 2.0 - note variant +category: Copyleft Limited +owner: Free Software Foundation (FSF) +notes: This is unlimited-linking-exception-lgpl.LICENSE with a note. +is_exception: yes +spdx_license_key: GCC-exception-2.0-note +other_urls: + - https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/x86_64/start.S +--- + +In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/hp-1986.LICENSE b/src/licensedcode/data/licenses/hp-1986.LICENSE new file mode 100644 index 00000000000..fcb13ffbd65 --- /dev/null +++ b/src/licensedcode/data/licenses/hp-1986.LICENSE @@ -0,0 +1,19 @@ +--- +key: hp-1986 +short_name: HP 1986 License +name: Hewlett-Packard 1986 License +category: Permissive +owner: Open Software Foundation +spdx_license_key: HP-1986 +other_urls: + - https://sourceware.org/git/?p=newlib-cygwin.git;a=blob;f=newlib/libc/machine/hppa/memchr.S;h=1cca3e5e8867aa4bffef1f75a5c1bba25c0c441e;hb=HEAD#l2 +--- + +To anyone who acknowledges that this file is provided "AS IS" +without any express or implied warranty permission to use, copy, +modify, and distribute this file for any purpose is hereby granted +without fee, provided that the above copyright notice and this notice +appears in all copies, and that the name of Hewlett-Packard Company +not be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. Hewlett-Packard +Company makes no representations about the suitability of this software for any purpose. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/hpnd-doc-sell.LICENSE b/src/licensedcode/data/licenses/hpnd-doc-sell.LICENSE new file mode 100644 index 00000000000..6487ed28cc0 --- /dev/null +++ b/src/licensedcode/data/licenses/hpnd-doc-sell.LICENSE @@ -0,0 +1,20 @@ +--- +key: hpnd-doc-sell +short_name: Historical documentation sell variant +name: Historical Permission Notice and Disclaimer - documentation sell variant +category: Permissive +owner: Unspecified +notes: This is essentially x11-doc License with very minor changes. +spdx_license_key: HPND-doc-sell +other_urls: + - https://gitlab.freedesktop.org/xorg/lib/libxtst/-/blob/master/COPYING?ref_type=heads#L108-117 + - https://gitlab.freedesktop.org/xorg/lib/libxext/-/blob/master/COPYING?ref_type=heads#L153-162 +--- + +Permission to use, copy, modify, distribute, and sell this +documentation for any purpose is hereby granted without fee, +provided that the above copyright notice and this permission +notice appear in all copies. +makes no representations about the suitability for any purpose +of the information in this document. This documentation +is provided "as is" without express or implied warranty. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/hpnd-doc.LICENSE b/src/licensedcode/data/licenses/hpnd-doc.LICENSE new file mode 100644 index 00000000000..ff20fba4071 --- /dev/null +++ b/src/licensedcode/data/licenses/hpnd-doc.LICENSE @@ -0,0 +1,19 @@ +--- +key: hpnd-doc +short_name: Historical documentation variant +name: Historical Permission Notice and Disclaimer - documentation variant +category: Permissive +owner: Unspecified +notes: This is essentially hpnd-doc-sell License without the 'without fee' +spdx_license_key: HPND-doc +other_urls: + - https://gitlab.freedesktop.org/xorg/lib/libxext/-/blob/master/COPYING?ref_type=heads#L185-197 + - https://gitlab.freedesktop.org/xorg/lib/libxtst/-/blob/master/COPYING?ref_type=heads#L70-77 +--- + +Permission to use, copy, modify, and distribute this documentation for +any purpose and without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + makes no representations about the suitability for +any purpose of the information in this document. This documentation is +provided ``as is'' without express or implied warranty. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/hpnd-pbmplus.LICENSE b/src/licensedcode/data/licenses/hpnd-pbmplus.LICENSE new file mode 100644 index 00000000000..7afc8a1aa89 --- /dev/null +++ b/src/licensedcode/data/licenses/hpnd-pbmplus.LICENSE @@ -0,0 +1,21 @@ +--- +key: hpnd-pbmplus +short_name: Historical Pbmplus variant +name: Historical Permission Notice and Disclaimer Pbmplus variant +category: Permissive +owner: ACME Labs +homepage_url: http://web.mit.edu/tex/fontutil/fontutils-0.6/pbm/libpbm1.c +spdx_license_key: HPND-Pbmplus +other_urls: + - https://sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/netpbm.c#l8 +notes: | + This was previously the text of libpbm LICENSE and wrongly assigned + spdx_license_key as xlock +--- + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. This software is provided "as is" without express or +implied warranty. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/hpnd-sell-regexpr.LICENSE b/src/licensedcode/data/licenses/hpnd-sell-regexpr.LICENSE new file mode 100644 index 00000000000..a4436d8c25f --- /dev/null +++ b/src/licensedcode/data/licenses/hpnd-sell-regexpr.LICENSE @@ -0,0 +1,16 @@ +--- +key: hpnd-sell-regexpr +short_name: Historical sell regexpr variant +name: Historical Permission Notice and Disclaimer sell regexpr variant +category: Permissive +owner: Unspecified +spdx_license_key: HPND-sell-regexpr +other_urls: + - https://gitlab.com/bacula-org/bacula/-/blob/Branch-11.0/bacula/LICENSE-FOSS?ref_type=heads#L245 +--- + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without +fee, provided that the above copyright notice appear in all copies. +This software is provided "as is" without express or implied +warranty. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/hpnd-uc.LICENSE b/src/licensedcode/data/licenses/hpnd-uc.LICENSE new file mode 100644 index 00000000000..c128e98e94b --- /dev/null +++ b/src/licensedcode/data/licenses/hpnd-uc.LICENSE @@ -0,0 +1,17 @@ +--- +key: hpnd-uc +short_name: Historical UC variant +name: Historical Permission Notice and Disclaimer University of California variant +category: Permissive +owner: Unspecified +spdx_license_key: HPND-UC +other_urls: + - https://core.tcl-lang.org/tk/file?name=compat/unistd.h +--- + +Permission to use, +copy, modify, and distribute this software and its documentation for any +purpose and without fee is hereby granted, provided that the above +copyright notice appear in all copies. The University of California makes +no representations about the suitability of this software for any purpose. +It is provided "as is" without express or implied warranty. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/iolib-exception-2.0.LICENSE b/src/licensedcode/data/licenses/iolib-exception-2.0.LICENSE index 273ae478f01..7384ff05738 100644 --- a/src/licensedcode/data/licenses/iolib-exception-2.0.LICENSE +++ b/src/licensedcode/data/licenses/iolib-exception-2.0.LICENSE @@ -5,9 +5,12 @@ name: GNU IO Library exception to GPL 2.0 category: Copyleft Limited owner: Free Software Foundation (FSF) is_exception: yes -spdx_license_key: LicenseRef-scancode-iolib-exception-2.0 +spdx_license_key: GNU-compiler-exception +other_spdx_license_keys: + - LicenseRef-scancode-iolib-exception-2.0 other_urls: - http://www.gnu.org/licenses/gpl-2.0.txt + - https://sourceware.org/git?p=binutils-gdb.git;a=blob;f=libiberty/unlink-if-ordinary.c;h=e49f2f2f67bfdb10d6b2bd579b0e01cad0fd708e;hb=HEAD#l19 standard_notice: | This is part of libio/iostream, providing -*- C++ -*- input/output. Copyright (C) 2000 Free Software Foundation diff --git a/src/licensedcode/data/licenses/kastrup.LICENSE b/src/licensedcode/data/licenses/kastrup.LICENSE new file mode 100644 index 00000000000..349350077fe --- /dev/null +++ b/src/licensedcode/data/licenses/kastrup.LICENSE @@ -0,0 +1,13 @@ +--- +key: kastrup +short_name: Kastrup License +name: Kastrup License +category: Permissive +owner: David Kastrup +spdx_license_key: Kastrup +other_urls: + - https://ctan.math.utah.edu/ctan/tex-archive/macros/generic/kastrup/binhex.dtx +--- + +Any use of the code is permitted as long as this copyright +notice is preserved in the code. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/libpbm.LICENSE b/src/licensedcode/data/licenses/libpbm.LICENSE index 459775873a7..4cada3ab4d7 100644 --- a/src/licensedcode/data/licenses/libpbm.LICENSE +++ b/src/licensedcode/data/licenses/libpbm.LICENSE @@ -15,8 +15,14 @@ other_urls: - https://fossies.org/linux/tiff/contrib/ras/ras2tif.c --- -Permission to use, copy, modify, and distribute this software and its documentation -for any purpose and without fee is hereby granted, provided that the above copyright -notice appear in all copies and that both that copyright notice and this permission -notice appear in supporting documentation. This software is provided "as is" without -express or implied warranty. \ No newline at end of file +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear in +supporting documentation. + +This file is provided AS IS with no warranties of any kind. The author +shall have no liability with respect to the infringement of copyrights, +trade secrets or any patents by this file or any part thereof. In no event +will the author be liable for any lost revenue or profits or other special, +indirect and consequential damages. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/magaz.LICENSE b/src/licensedcode/data/licenses/magaz.LICENSE new file mode 100644 index 00000000000..622f492f882 --- /dev/null +++ b/src/licensedcode/data/licenses/magaz.LICENSE @@ -0,0 +1,13 @@ +--- +key: magaz +short_name: magaz License +name: magaz License +category: Permissive +owner: Unspecified +spdx_license_key: magaz +other_urls: + - https://mirrors.nic.cz/tex-archive/macros/latex/contrib/magaz/magaz.tex +--- + +This software may be freely used, transmitted, reproduced, or modified provided that +the copyright notice and this permission is retained. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/mcphee-slideshow.LICENSE b/src/licensedcode/data/licenses/mcphee-slideshow.LICENSE new file mode 100644 index 00000000000..1e2de60cac8 --- /dev/null +++ b/src/licensedcode/data/licenses/mcphee-slideshow.LICENSE @@ -0,0 +1,16 @@ +--- +key: mcphee-slideshow +short_name: McPhee Slideshow License +name: McPhee Slideshow License +category: Permissive +owner: Unspecified +spdx_license_key: McPhee-slideshow +other_urls: + - https://mirror.las.iastate.edu/tex-archive/graphics/metapost/contrib/macros/slideshow/slideshow.mp +--- + +everyone is welcome to use this code for any purpose, to modify it, and +to copy it in whole or in part for use in other macro sets, with the +conditions that this copyright notice be preserved with any significant +portion of the code, and that modifications to this file be clearly +marked. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/mit-testregex.LICENSE b/src/licensedcode/data/licenses/mit-testregex.LICENSE new file mode 100644 index 00000000000..1ebb646d4b0 --- /dev/null +++ b/src/licensedcode/data/licenses/mit-testregex.LICENSE @@ -0,0 +1,28 @@ +--- +key: mit-testregex +short_name: MIT testregex Variant +name: MIT testregex Variant +category: Permissive +owner: AT&T +spdx_license_key: MIT-testregex +other_urls: + - https://github.com/dotnet/runtime/blob/55e1ac7c07df62c4108d4acedf78f77574470ce5/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/AttRegexTests.cs#L12-L28 +--- + +* Permission is hereby granted, free of charge, to any person obtaining a + * copy of THIS SOFTWARE FILE (the "Software"), to deal in the Software + * without restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, and/or sell copies of the + * Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following disclaimer: + * + * THIS SOFTWARE IS PROVIDED BY AT&T ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL AT&T BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/mit-with-modification-obligations.LICENSE b/src/licensedcode/data/licenses/mit-with-modification-obligations.LICENSE index b8ef6284b92..d041f3f8af7 100644 --- a/src/licensedcode/data/licenses/mit-with-modification-obligations.LICENSE +++ b/src/licensedcode/data/licenses/mit-with-modification-obligations.LICENSE @@ -4,9 +4,13 @@ short_name: MIT With Modification Obligations name: MIT With Modification Obligations category: Permissive owner: MIT -spdx_license_key: LicenseRef-scancode-mit-modification-obligations +spdx_license_key: HPND-export-US-modify other_spdx_license_keys: - LicenseRef-scancode-mit-with-modification-obligations + - LicenseRef-scancode-mit-modification-obligations +other_urls: + - https://github.com/krb5/krb5/blob/krb5-1.21.2-final/NOTICE#L1157-L1182 + - https://github.com/pythongssapi/k5test/blob/v0.10.3/K5TEST-LICENSE.txt minimum_coverage: 80 --- diff --git a/src/licensedcode/data/licenses/mmixware.LICENSE b/src/licensedcode/data/licenses/mmixware.LICENSE new file mode 100644 index 00000000000..4d1339870a5 --- /dev/null +++ b/src/licensedcode/data/licenses/mmixware.LICENSE @@ -0,0 +1,26 @@ +--- +key: mmixware +short_name: MMIXware License +name: MMIXware License +category: Permissive +owner: Donald E. Knuth +spdx_license_key: MMIXware +other_urls: + - https://gitlab.lrz.de/mmix/mmixware/-/blob/master/boilerplate.w +--- + +This file may be freely copied and distributed, provided that +no changes whatsoever are made. All users are asked to help keep +the MMIXware files consistent and ``uncorrupted,'' +identical everywhere in the world. Changes are permissible only +if the modified file is given a new name, different from the names of +existing files in the MMIXware package, +and only if the modified file is clearly identified +as not being part of that package. +(The CWEB system has a ``change file'' facility by +which users can easily make minor alterations without modifying +the master source files in any way. Everybody is supposed to use +change files instead of changing the files.) +The author has tried his best to produce correct and useful programs, +in order to help promote computer science research, +but no warranty of any kind should be assumed. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/mpeg-ssg.LICENSE b/src/licensedcode/data/licenses/mpeg-ssg.LICENSE index 5ef9c14b048..b9fbb3bd3df 100644 --- a/src/licensedcode/data/licenses/mpeg-ssg.LICENSE +++ b/src/licensedcode/data/licenses/mpeg-ssg.LICENSE @@ -5,7 +5,11 @@ name: MPEG SSG License category: Permissive owner: MSSG - MPEG Software Simulation Group homepage_url: http://www.mpeg.org/MPEG/video/mssg-free-mpeg-software.html -spdx_license_key: LicenseRef-scancode-mpeg-ssg +spdx_license_key: MPEG-SSG +other_spdx_license_keys: + - LicenseRef-scancode-mpeg-ssg +other_urls: + - https://sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/converter/ppm/ppmtompeg/jrevdct.c#l1189 --- Disclaimer of Warranty diff --git a/src/licensedcode/data/licenses/niels-ferguson.LICENSE b/src/licensedcode/data/licenses/niels-ferguson.LICENSE index a0069c19aa1..8b68dbbf020 100644 --- a/src/licensedcode/data/licenses/niels-ferguson.LICENSE +++ b/src/licensedcode/data/licenses/niels-ferguson.LICENSE @@ -3,16 +3,10 @@ key: niels-ferguson short_name: Niels Ferguson License name: Niels Ferguson License category: Permissive -owner: Unspecified +owner: Niels Ferguson spdx_license_key: LicenseRef-scancode-niels-ferguson -ignorable_copyrights: - - Copyright (c) 2002 by Niels Ferguson -ignorable_holders: - - Niels Ferguson --- -Copyright (c) 2002 by Niels Ferguson. - The author hereby grants a perpetual license to everybody to use this code for any purpose as long as the copyright message is included in the source code of this or any derived work. diff --git a/src/licensedcode/data/licenses/osf-1990.LICENSE b/src/licensedcode/data/licenses/osf-1990.LICENSE index bd541842faf..70d5065ddc5 100644 --- a/src/licensedcode/data/licenses/osf-1990.LICENSE +++ b/src/licensedcode/data/licenses/osf-1990.LICENSE @@ -3,15 +3,15 @@ key: osf-1990 short_name: OSF 1990 License name: OSF 1990 License category: Permissive -owner: Open Group +owner: Open Software Foundation homepage_url: https://fedoraproject.org/wiki/Licensing:MIT?rd=Licensing/MIT#HP_Variant -spdx_license_key: HP-1986 +spdx_license_key: HP-1989 other_spdx_license_keys: - LicenseRef-scancode-osf-1990 text_urls: - https://fedoraproject.org/wiki/Licensing:MIT?rd=Licensing/MIT#HP_Variant other_urls: - - https://sourceware.org/git/?p=newlib-cygwin.git;a=blob;f=newlib/libc/machine/hppa/memchr.S;h=1cca3e5e8867aa4bffef1f75a5c1bba25c0c441e;hb=HEAD#l2 + - https://github.com/bleargh45/Data-UUID/blob/master/LICENSE --- To anyone who acknowledges that this file is provided "AS IS" diff --git a/src/licensedcode/data/licenses/padl.LICENSE b/src/licensedcode/data/licenses/padl.LICENSE new file mode 100644 index 00000000000..51c9b15cb14 --- /dev/null +++ b/src/licensedcode/data/licenses/padl.LICENSE @@ -0,0 +1,15 @@ +--- +key: padl +short_name: PADL License +name: PADL License +category: Permissive +owner: PADL Software Pty Ltd. +spdx_license_key: PADL +other_urls: + - https://git.openldap.org/openldap/openldap/-/blob/master/libraries/libldap/os-local.c?ref_type=heads#L19-23 +--- + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that this notice is preserved +and that due credit is given to PADL Software Pty Ltd. This software +is provided ``as is'' without express or implied warranty. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/pnmstitch.LICENSE b/src/licensedcode/data/licenses/pnmstitch.LICENSE new file mode 100644 index 00000000000..b5f3b1d44c1 --- /dev/null +++ b/src/licensedcode/data/licenses/pnmstitch.LICENSE @@ -0,0 +1,32 @@ +--- +key: pnmstitch +short_name: pnmstitch License +name: pnmstitch License +category: Permissive +owner: Unspecified +notes: This is the same as bsd-dpt.RULE with ` Mark Salyzyn` added. +spdx_license_key: pnmstitc +other_urls: + - https://sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/editor/pnmstitch.c#l2 +--- + +TERMS AND CONDITIONS OF USE + +Redistribution and use in source form, with or without modification, are +permitted provided that redistributions of source code must retain the +above copyright notice, this list of conditions and the following +disclaimer. + +This software is provided `as is' by Mark Salyzyn and any express or implied +warranties, including, but not limited to, the implied warranties of +merchantability and fitness for a particular purpose, are disclaimed. In no +event shall Mark Salyzyn be liable for any direct, indirect, incidental, +special, exemplary or consequential damages (including, but not limited to, +procurement of substitute goods or services; loss of use, data, or profits; +or business interruptions) however caused and on any theory of liability, +whether in contract, strict 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. + +Any restrictions or encumberances added to this source code or derivitives, +is prohibited. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/purdue-bsd.LICENSE b/src/licensedcode/data/licenses/purdue-bsd.LICENSE index 3fbd8119665..7d1e3d21498 100644 --- a/src/licensedcode/data/licenses/purdue-bsd.LICENSE +++ b/src/licensedcode/data/licenses/purdue-bsd.LICENSE @@ -5,7 +5,11 @@ name: Purdue BSD-Style License category: Permissive owner: Purdue Research Foundation notes: this is very similar to the hs-regexp license -spdx_license_key: LicenseRef-scancode-purdue-bsd +spdx_license_key: lsof +other_spdx_license_keys: + - LicenseRef-scancode-purdue-bsd +other_urls: + - https://github.com/lsof-org/lsof/blob/master/COPYING minimum_coverage: 70 --- diff --git a/src/licensedcode/data/licenses/python-ldap.LICENSE b/src/licensedcode/data/licenses/python-ldap.LICENSE new file mode 100644 index 00000000000..c6e7539ee44 --- /dev/null +++ b/src/licensedcode/data/licenses/python-ldap.LICENSE @@ -0,0 +1,23 @@ +--- +key: python-ldap +short_name: Python ldap License +name: Python ldap License +category: Permissive +owner: Python Software Foundation (PSF) +spdx_license_key: python-ldap +other_urls: + - https://github.com/zdohnal/hplip/blob/master/base/ldif.py + - https://sourceforge.net/projects/hplip/files/hplip/3.23.5/hplip-3.23.5.tar.gz/download +notes: This was python_19.RULE before +--- + +The python-ldap package is distributed under Python-style license. + +Standard disclaimer + This software is made available by the author(s) to the public for free + and "as is". All users of this free software are solely and entirely + responsible for their own choice and use of this software for their + own purposes. By using this software, each user agrees that the + author(s) shall not be liable for damages of any kind in relation to + its use or performance. The author(s) do not warrant that this software + is fit for any purpose. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/sane-exception-2.0-plus.LICENSE b/src/licensedcode/data/licenses/sane-exception-2.0-plus.LICENSE index fbbccbb8f46..d535810c2d4 100644 --- a/src/licensedcode/data/licenses/sane-exception-2.0-plus.LICENSE +++ b/src/licensedcode/data/licenses/sane-exception-2.0-plus.LICENSE @@ -6,11 +6,16 @@ category: Copyleft Limited owner: SANE Project homepage_url: https://alioth.debian.org/ is_exception: yes -spdx_license_key: LicenseRef-scancode-sane-exception-2.0-plus +spdx_license_key: SANE-exception +other_spdx_license_keys: + - LicenseRef-scancode-sane-exception-2.0-plus text_urls: - https://alioth.debian.org/frs/download.php/file/4224/sane-backends-1.0.27.tar.gz other_urls: - http://www.gnu.org/licenses/gpl-2.0.txt + - https://gitlab.com/sane-project/frontends/-/blob/master/sanei/sanei_codec_ascii.c?ref_type=heads + - https://github.com/alexpevzner/sane-airscan/blob/master/LICENSE + - https://gitlab.com/sane-project/backends/-/blob/master/sanei/sanei_pp.c?ref_type=heads standard_notice: | This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/src/licensedcode/data/licenses/sl.LICENSE b/src/licensedcode/data/licenses/sl.LICENSE new file mode 100644 index 00000000000..d3d896c72e7 --- /dev/null +++ b/src/licensedcode/data/licenses/sl.LICENSE @@ -0,0 +1,15 @@ +--- +key: sl +short_name: SL License +name: SL License +category: Permissive +owner: Unspecified +spdx_license_key: SL +other_urls: + - https://github.com/mtoyoda/sl/blob/master/LICENSE +--- + +Everyone is permitted to do anything on this program including copying, +modifying, and improving, unless you try to pretend that you wrote it. +i.e., the above copyright notice has to appear in all copies. +THE AUTHOR DISCLAIMS ANY RESPONSIBILITY WITH REGARD TO THIS SOFTWARE. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/soundex.LICENSE b/src/licensedcode/data/licenses/soundex.LICENSE index c611baadf6b..2b8f618f060 100644 --- a/src/licensedcode/data/licenses/soundex.LICENSE +++ b/src/licensedcode/data/licenses/soundex.LICENSE @@ -5,7 +5,11 @@ name: Soundex License category: Permissive owner: Mark Mielke homepage_url: https://metacpan.org/release/RJBS/Text-Soundex-3.05/source/Soundex.pm#L3-11 -spdx_license_key: LicenseRef-scancode-soundex +spdx_license_key: Soundex +other_spdx_license_keys: + - LicenseRef-scancode-soundex +other_urls: + - https://metacpan.org/release/RJBS/Text-Soundex-3.05/source/Soundex.pm#L3-11 --- Freedom to use these sources for whatever you want, as long as credit diff --git a/src/licensedcode/data/licenses/ssh-keyscan.LICENSE b/src/licensedcode/data/licenses/ssh-keyscan.LICENSE new file mode 100644 index 00000000000..aefa2fd81f1 --- /dev/null +++ b/src/licensedcode/data/licenses/ssh-keyscan.LICENSE @@ -0,0 +1,14 @@ +--- +key: ssh-keyscan +short_name: ssh-keyscan License +name: ssh-keyscan License +category: Permissive +owner: Unspecified +spdx_license_key: ssh-keyscan +other_urls: + - https://github.com/openssh/openssh-portable/blob/master/LICENCE#L82 +--- + +Modification and redistribution in source and binary forms is +permitted provided that due credit is given to the author and the +OpenBSD project by leaving this copyright notice intact. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/stunnel-exception.LICENSE b/src/licensedcode/data/licenses/stunnel-exception.LICENSE new file mode 100644 index 00000000000..b1a12731a99 --- /dev/null +++ b/src/licensedcode/data/licenses/stunnel-exception.LICENSE @@ -0,0 +1,18 @@ +--- +key: stunnel-exception +short_name: stunnel Exception +name: stunnel Exception +category: Permissive +owner: Unspecified +notes: similar to the strongswan-exception LICENSE +is_exception: yes +spdx_license_key: stunnel-exception +other_urls: + - https://github.com/mtrojnar/stunnel/blob/master/COPYING.md +--- + +Linking stunnel statically or dynamically with other modules is making a combined work based on stunnel. Thus, the terms and conditions of the GNU General Public License cover the whole combination. + +In addition, as a special exception, the copyright holder of stunnel gives you permission to combine stunnel with free software programs or libraries that are released under the GNU LGPL and with code included in the standard release of OpenSSL under the OpenSSL License (or modified versions of such code, with unchanged license). You may copy and distribute such a system following the terms of the GNU GPL for stunnel and the licenses of the other code concerned. + +Note that people who make modified versions of stunnel are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU General Public License gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/swrule.LICENSE b/src/licensedcode/data/licenses/swrule.LICENSE new file mode 100644 index 00000000000..0b6fba94aac --- /dev/null +++ b/src/licensedcode/data/licenses/swrule.LICENSE @@ -0,0 +1,15 @@ +--- +key: swrule +short_name: swrule License +name: swrule License +category: Permissive +owner: Unspecified +spdx_license_key: swrule +other_urls: + - https://ctan.math.utah.edu/ctan/tex-archive/macros/generic/misc/swrule.sty +--- + +The style package is copyrighted but may be used and extended in any way, +as long as a pointer to the original author is maintained. +The author is not liable for any problem that may or may not result +from using this package. Use at your own risk. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/tex-exception.LICENSE b/src/licensedcode/data/licenses/tex-exception.LICENSE index fa22e4e1feb..592708dafa7 100644 --- a/src/licensedcode/data/licenses/tex-exception.LICENSE +++ b/src/licensedcode/data/licenses/tex-exception.LICENSE @@ -5,7 +5,11 @@ name: TeX exception to GPL 3.0 category: Copyleft Limited owner: Unspecified is_exception: yes -spdx_license_key: LicenseRef-scancode-tex-exception +spdx_license_key: Texinfo-exception +other_spdx_license_keys: + - LicenseRef-scancode-tex-exception +other_urls: + - https://git.savannah.gnu.org/cgit/automake.git/tree/lib/texinfo.tex?h=v1.16.5#n23 --- As a special exception, when this file is read by TeX when processing diff --git a/src/licensedcode/data/licenses/ttyp0.LICENSE b/src/licensedcode/data/licenses/ttyp0.LICENSE index cccc9863632..462c98ccdc6 100644 --- a/src/licensedcode/data/licenses/ttyp0.LICENSE +++ b/src/licensedcode/data/licenses/ttyp0.LICENSE @@ -5,9 +5,12 @@ name: TTYP0 License category: Permissive owner: Uwe Waldmann homepage_url: https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/ -spdx_license_key: LicenseRef-scancode-ttyp0 +spdx_license_key: TTYP0 +other_spdx_license_keys: + - LicenseRef-scancode-ttyp0 other_urls: - https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/uw-ttyp0-1.3.tar.gz + - https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/ minimum_coverage: 70 --- diff --git a/src/licensedcode/data/licenses/ubdl.LICENSE b/src/licensedcode/data/licenses/ubdl.LICENSE index 6c3ba52ae29..d193166be9d 100644 --- a/src/licensedcode/data/licenses/ubdl.LICENSE +++ b/src/licensedcode/data/licenses/ubdl.LICENSE @@ -7,9 +7,13 @@ owner: Unspecified homepage_url: http://ipxe.org notes: this is a rare license that extends extra persmission on top of the GPL is_exception: yes -spdx_license_key: LicenseRef-scancode-ubdl +spdx_license_key: UBDL-exception +other_spdx_license_keys: + - LicenseRef-scancode-ubdl text_urls: - https://git.ipxe.org/ipxe.git/blob_plain/HEAD:/COPYING.UBDL +other_urls: + - https://github.com/ipxe/ipxe/blob/master/COPYING.UBDL --- UNMODIFIED BINARY DISTRIBUTION LICENCE diff --git a/src/licensedcode/data/licenses/ulem.LICENSE b/src/licensedcode/data/licenses/ulem.LICENSE new file mode 100644 index 00000000000..ee819493059 --- /dev/null +++ b/src/licensedcode/data/licenses/ulem.LICENSE @@ -0,0 +1,13 @@ +--- +key: ulem +short_name: ulem License +name: ulem License +category: Permissive +owner: Unspecified +spdx_license_key: ulem +other_urls: + - https://mirrors.ctan.org/macros/latex/contrib/ulem/README +--- + +This software may be freely transmitted, reproduced, or modified +for any purpose provided that this copyright notice is left intact. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/urt-rle.LICENSE b/src/licensedcode/data/licenses/urt-rle.LICENSE new file mode 100644 index 00000000000..01a816f49e1 --- /dev/null +++ b/src/licensedcode/data/licenses/urt-rle.LICENSE @@ -0,0 +1,27 @@ +--- +key: urt-rle +short_name: Utah Raster Toolkit Run Length Encoded License +name: Utah Raster Toolkit Run Length Encoded License +category: Permissive +owner: Unspecified +spdx_license_key: URT-RLE +other_urls: + - https://sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/converter/other/pnmtorle.c + - https://sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/converter/other/rletopnm.c +--- + +* This software is copyrighted as noted below. It may be freely copied, + * modified, and redistributed, provided that the copyright notice is + * preserved on all copies. + * + * There is no warranty or other guarantee of fitness for this software, + * it is provided solely "as is". Bug reports or fixes may be sent + * to the author, who may or may not act on them as he desires. + * + * You may not include this software in a program or other software product + * without supplying the source, or without informing the end-user that the + * source is available for no extra charge. + * + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. \ No newline at end of file diff --git a/src/licensedcode/data/licenses/x11-dec2.LICENSE b/src/licensedcode/data/licenses/x11-dec2.LICENSE index b0a67c39720..2a87361ec0f 100644 --- a/src/licensedcode/data/licenses/x11-dec2.LICENSE +++ b/src/licensedcode/data/licenses/x11-dec2.LICENSE @@ -5,9 +5,13 @@ name: X11-Style (DEC 2) category: Permissive owner: DEC - Digital Equipment Corporation homepage_url: http://www.xfree86.org/current/LICENSE5.html -spdx_license_key: LicenseRef-scancode-x11-dec2 +spdx_license_key: HPND-DEC +other_spdx_license_keys: + - LicenseRef-scancode-x11-dec2 text_urls: - http://www.xfree86.org/current/LICENSE5.html +other_urls: + - https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/blob/master/COPYING?ref_type=heads#L69 minimum_coverage: 80 --- diff --git a/src/licensedcode/data/licenses/x11-opengl.LICENSE b/src/licensedcode/data/licenses/x11-opengl.LICENSE index 4b00c76021a..32d26df7817 100644 --- a/src/licensedcode/data/licenses/x11-opengl.LICENSE +++ b/src/licensedcode/data/licenses/x11-opengl.LICENSE @@ -4,7 +4,11 @@ short_name: X11-Style (OpenGL) name: X11-Style (OpenGL) category: Permissive owner: SGI - Silicon Graphics -spdx_license_key: LicenseRef-scancode-x11-opengl +spdx_license_key: SGI-OpenGL +other_spdx_license_keys: + - LicenseRef-scancode-x11-opengl +other_urls: + - https://gitlab.freedesktop.org/mesa/glw/-/blob/master/README?ref_type=heads minimum_coverage: 80 --- diff --git a/src/licensedcode/data/licenses/zeeff.LICENSE b/src/licensedcode/data/licenses/zeeff.LICENSE new file mode 100644 index 00000000000..0e45866211f --- /dev/null +++ b/src/licensedcode/data/licenses/zeeff.LICENSE @@ -0,0 +1,13 @@ +--- +key: zeeff +short_name: Zeeff License +name: Zeeff License +category: Permissive +owner: Unspecified +spdx_license_key: Zeeff +other_urls: + - ftp://ftp.tin.org/pub/news/utils/newsx/newsx-1.6.tar.gz +--- + +You can use this code in any manner, as long as you leave my +name on it and don't hold me responsible for any problems with it. \ No newline at end of file diff --git a/src/licensedcode/data/rules/adobe-utopia_1.RULE b/src/licensedcode/data/rules/adobe-utopia_1.RULE new file mode 100644 index 00000000000..8c0e80db328 --- /dev/null +++ b/src/licensedcode/data/rules/adobe-utopia_1.RULE @@ -0,0 +1,30 @@ +--- +license_expression: adobe-utopia +is_license_notice: yes +ignorable_copyrights: + - Copyright (c) 1989 Adobe Systems Incorporated Utopia (R) Utopia +ignorable_holders: + - Adobe Systems Incorporated Utopia (R) Utopia +--- + +And here is the licence of utopia + +% The following notice accompanied the Utopia font: +% +% Permission to use, reproduce, display and distribute the listed +% typefaces is hereby granted, provided that the Adobe Copyright notice +% appears in all whole and partial copies of the software and that the +% following trademark symbol and attribution appear in all unmodified +% copies of the software: +% +% Copyright (c) 1989 Adobe Systems Incorporated +% Utopia (R) +% Utopia is a registered trademark of Adobe Systems Incorporated +% +% The Adobe typefaces (Type 1 font program, bitmaps and Adobe Font +% Metric files) donated are: +% +% Utopia Regular +% Utopia Italic +% Utopia Bold +% Utopia Bold Italic \ No newline at end of file diff --git a/src/licensedcode/data/rules/bsd-3-clause-sun_4.RULE b/src/licensedcode/data/rules/bsd-3-clause-sun_4.RULE new file mode 100644 index 00000000000..7414f37d0a8 --- /dev/null +++ b/src/licensedcode/data/rules/bsd-3-clause-sun_4.RULE @@ -0,0 +1,34 @@ +--- +license_expression: bsd-3-clause-sun +is_license_text: yes +relevance: 99 +notes: Formerly this was bsd-new_1002.RULE +--- + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +- Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +- Redistribution in binary form must reproduct the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +Neither the name of Sun Microsystems, Inc. or the names of +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +This software is provided "AS IS," without a warranty of any kind. ALL +EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND +ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR LIABILITIES +SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE, MODIFICATION +OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL +SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, +OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR +PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF +LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, +EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. \ No newline at end of file diff --git a/src/licensedcode/data/rules/bsd-new_1002.RULE b/src/licensedcode/data/rules/bsd-new_1002.RULE index 3b83a81416d..554ed32c6aa 100644 --- a/src/licensedcode/data/rules/bsd-new_1002.RULE +++ b/src/licensedcode/data/rules/bsd-new_1002.RULE @@ -2,8 +2,10 @@ license_expression: bsd-new is_license_text: yes relevance: 99 +is_deprecated: yes notes: This is a sun-bsd-no-nuclear stripped from the nuclear clause which is essentially a bsd-3-clause + This is actually bsd-3-clause-sun LICENSE --- Redistribution and use in source and binary forms, with or without diff --git a/src/licensedcode/data/rules/flex-2.5_11.RULE b/src/licensedcode/data/rules/flex-2.5_11.RULE index b9135cbc759..6723554c5e0 100644 --- a/src/licensedcode/data/rules/flex-2.5_11.RULE +++ b/src/licensedcode/data/rules/flex-2.5_11.RULE @@ -2,6 +2,8 @@ license_expression: flex-2.5 is_license_text: yes minimum_coverage: 95 +is_deprecated: yes +notes: This text is now the flex-2.5 LICENSE --- The United States Government has rights in this work pursuant diff --git a/src/licensedcode/data/rules/flex-2.5_12.RULE b/src/licensedcode/data/rules/flex-2.5_12.RULE index da8798a3139..db96c438c08 100644 --- a/src/licensedcode/data/rules/flex-2.5_12.RULE +++ b/src/licensedcode/data/rules/flex-2.5_12.RULE @@ -1,23 +1,28 @@ --- license_expression: flex-2.5 is_license_text: yes -notes: an odd historical license seen in 4.3 BSD Reno The 4.4BSD was released in 1992 and again - in 1994 See https://en.wikipedia.org/wiki/History_of_the_Berkeley_Software_Distribution#4.4BSD_and_descendants +notes: | + This was the license text for flex-2.5 LICENSE previously, but was demoted to a rule in + favour of the SPDX license BSD-3-Clause-flex introduced in version 3.22 of spdx license + list. ignorable_authors: - the University of California, Berkeley and its contributors --- -* Redistribution is only permitted until one year after the first shipment - * of 4.4BSD by the Regents. Otherwise, redistribution and use in source and - * binary forms are permitted provided that: (1) source distributions retain - * this entire copyright notice and comment, and (2) distributions including - * binaries display the following acknowledgement: This product includes - * software developed by the University of California, Berkeley and its - * contributors'' in the documentation or other materials provided with the - * distribution and in all advertising materials mentioning features or use - * of this software. Neither the name of the University nor the names of - * its contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. \ No newline at end of file +The United States Government has rights in this work pursuant to contract no. DE- +AC03-76SF00098 between the United States Department of Energy and the University of +California. + +Redistribution and use in source and binary forms are permitted provided that: (1) +source distributions retain this entire copyright notice and comment, and (2) +distributions including binaries display the following acknowledgement: "This product +includes software developed by the University of California, Berkeley and its +contributors" in the documentation or other materials provided with the distribution +and in all advertising materials mentioning features or use of this software. Neither +the name of the University nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. diff --git a/src/licensedcode/data/rules/flex-2.5_13.RULE b/src/licensedcode/data/rules/flex-2.5_13.RULE new file mode 100644 index 00000000000..da8798a3139 --- /dev/null +++ b/src/licensedcode/data/rules/flex-2.5_13.RULE @@ -0,0 +1,23 @@ +--- +license_expression: flex-2.5 +is_license_text: yes +notes: an odd historical license seen in 4.3 BSD Reno The 4.4BSD was released in 1992 and again + in 1994 See https://en.wikipedia.org/wiki/History_of_the_Berkeley_Software_Distribution#4.4BSD_and_descendants +ignorable_authors: + - the University of California, Berkeley and its contributors +--- + +* Redistribution is only permitted until one year after the first shipment + * of 4.4BSD by the Regents. Otherwise, redistribution and use in source and + * binary forms are permitted provided that: (1) source distributions retain + * this entire copyright notice and comment, and (2) distributions including + * binaries display the following acknowledgement: This product includes + * software developed by the University of California, Berkeley and its + * contributors'' in the documentation or other materials provided with the + * distribution and in all advertising materials mentioning features or use + * of this software. Neither the name of the University nor the names of + * its contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. \ No newline at end of file diff --git a/src/licensedcode/data/rules/libpbm_1.RULE b/src/licensedcode/data/rules/libpbm_1.RULE index ffd7005adf7..7b7d730e15e 100644 --- a/src/licensedcode/data/rules/libpbm_1.RULE +++ b/src/licensedcode/data/rules/libpbm_1.RULE @@ -3,6 +3,7 @@ license_expression: libpbm is_license_notice: yes relevance: 90 minimum_coverage: 10 +is_deprecated: yes notes: The warranty disclaimer is different and possibly predates libpbm. See https://github.com/oracle/solaris-xorg/blob/master/open-src/app/xlock/sun-src/image.c --- diff --git a/src/licensedcode/data/rules/osf-1990_3.RULE b/src/licensedcode/data/rules/osf-1990_3.RULE index a475adffce1..acfdf8f88a8 100644 --- a/src/licensedcode/data/rules/osf-1990_3.RULE +++ b/src/licensedcode/data/rules/osf-1990_3.RULE @@ -1,6 +1,8 @@ --- license_expression: osf-1990 is_license_text: yes +is_deprecated: yes +notes: This is now the HP-1986 LICENSE --- To anyone who acknowledges that this file is provided "AS IS" diff --git a/src/licensedcode/data/rules/osf-1990_6.RULE b/src/licensedcode/data/rules/osf-1990_6.RULE index 4dc1f8a88b6..e933c41f2bd 100644 --- a/src/licensedcode/data/rules/osf-1990_6.RULE +++ b/src/licensedcode/data/rules/osf-1990_6.RULE @@ -2,7 +2,10 @@ license_expression: osf-1990 is_license_text: yes relevance: 100 -notes: seen in https://metacpan.org/release/RJBS/Data-UUID-1.226/source/LICENSE +is_deprecated: yes +notes: | + seen in https://metacpan.org/release/RJBS/Data-UUID-1.226/source/LICENSE + This is now the HP-1989 LICENSE --- To anyone who acknowledges that this file is provided "AS IS" diff --git a/src/licensedcode/data/rules/osf-1990_8.RULE b/src/licensedcode/data/rules/osf-1990_8.RULE new file mode 100644 index 00000000000..3e6691dd446 --- /dev/null +++ b/src/licensedcode/data/rules/osf-1990_8.RULE @@ -0,0 +1,17 @@ +--- +license_expression: osf-1990 +is_license_text: yes +--- + +To anyone who acknowledges that this file is provided "AS IS" +without any express or implied warranty: permission to use, copy, +modify, and distribute this file for any purpose is hereby +granted without fee, provided that the above copyright notices and +this notice appears in all source code copies, and that none of +the names of Open Software Foundation, Inc., Hewlett-Packard +Company, Microsoft, or Digital Equipment Corporation be used in +advertising or publicity pertaining to distribution of the software +without specific, written prior permission. Neither Open Software +Foundation, Inc., Hewlett-Packard Company, Microsoft, nor Digital +Equipment Corporation makes any representations about the +suitability of this software for any purpose. \ No newline at end of file diff --git a/src/licensedcode/data/rules/other-permissive_141.RULE b/src/licensedcode/data/rules/other-permissive_141.RULE index 22b401408c2..3de7ee75a05 100644 --- a/src/licensedcode/data/rules/other-permissive_141.RULE +++ b/src/licensedcode/data/rules/other-permissive_141.RULE @@ -1,7 +1,8 @@ --- license_expression: other-permissive is_license_text: yes -relevance: 100 +is_deprecated: yes +notes: 'Replaced by license: mit-testregex' --- Permission is hereby granted, free of charge, to any person obtaining a diff --git a/src/licensedcode/data/rules/other-permissive_150.RULE b/src/licensedcode/data/rules/other-permissive_150.RULE index fe1550fc974..9505c6c79b0 100644 --- a/src/licensedcode/data/rules/other-permissive_150.RULE +++ b/src/licensedcode/data/rules/other-permissive_150.RULE @@ -1,7 +1,8 @@ --- license_expression: other-permissive is_license_text: yes -relevance: 100 +is_deprecated: yes +notes: 'Replaced by license: cronyx' --- This software may be used, modified, copied, distributed, and sold, diff --git a/src/licensedcode/data/rules/other-permissive_361.RULE b/src/licensedcode/data/rules/other-permissive_361.RULE index fbe9ab67efa..1aba0701284 100644 --- a/src/licensedcode/data/rules/other-permissive_361.RULE +++ b/src/licensedcode/data/rules/other-permissive_361.RULE @@ -1,10 +1,12 @@ --- license_expression: other-permissive is_license_notice: yes +is_deprecated: yes ignorable_copyrights: - Copyright (c) 1989 Adobe Systems Incorporated Utopia (R) Utopia ignorable_holders: - Adobe Systems Incorporated Utopia (R) Utopia +notes: This was moved to adobe-utopia_1.RULE --- And here is the licence of utopia diff --git a/src/licensedcode/data/rules/other-permissive_424.RULE b/src/licensedcode/data/rules/other-permissive_424.RULE index 68edd693786..bfe92e2557e 100644 --- a/src/licensedcode/data/rules/other-permissive_424.RULE +++ b/src/licensedcode/data/rules/other-permissive_424.RULE @@ -1,6 +1,8 @@ --- license_expression: other-permissive is_license_text: yes +is_deprecated: yes +notes: This is actually the hpnd-uc LICENSE --- Permission to use, copy, modify, and distribute this diff --git a/src/licensedcode/data/rules/other-permissive_77.RULE b/src/licensedcode/data/rules/other-permissive_77.RULE index f92299790db..6a533c59245 100644 --- a/src/licensedcode/data/rules/other-permissive_77.RULE +++ b/src/licensedcode/data/rules/other-permissive_77.RULE @@ -1,8 +1,8 @@ --- license_expression: other-permissive is_license_text: yes -relevance: 100 -notes: seen in hdf5 +is_deprecated: yes +notes: 'Replaced by license: fbm' --- * Permission is granted to use this file in whole or in diff --git a/src/licensedcode/data/rules/other-permissive_mazieres.RULE b/src/licensedcode/data/rules/other-permissive_mazieres.RULE index c940633bd2e..3af5112f71d 100644 --- a/src/licensedcode/data/rules/other-permissive_mazieres.RULE +++ b/src/licensedcode/data/rules/other-permissive_mazieres.RULE @@ -1,6 +1,8 @@ --- license_expression: other-permissive is_license_notice: yes +is_deprecated: yes +notes: 'Replaced by license: ssh-keyscan' --- Modification and redistribution in source and binary forms is diff --git a/src/licensedcode/data/rules/python_19.RULE b/src/licensedcode/data/rules/python_19.RULE index 98f1f1f0e42..2b3da5a5196 100644 --- a/src/licensedcode/data/rules/python_19.RULE +++ b/src/licensedcode/data/rules/python_19.RULE @@ -2,6 +2,8 @@ license_expression: python is_license_notice: yes relevance: 100 +is_deprecated: yes +notes: replaced by the python-ldap LICENSE --- The python-ldap package is distributed under Python-style license. @@ -13,4 +15,4 @@ Standard disclaimer: own purposes. By using this software, each user agrees that the author(s) shall not be liable for damages of any kind in relation to its use or performance. The author(s) do not warrant that this software -is fit for any purpose. \ No newline at end of file + is fit for any purpose. \ No newline at end of file diff --git a/src/licensedcode/data/rules/warranty-disclaimer_64.RULE b/src/licensedcode/data/rules/warranty-disclaimer_64.RULE index 431a9da8701..c888010b71c 100644 --- a/src/licensedcode/data/rules/warranty-disclaimer_64.RULE +++ b/src/licensedcode/data/rules/warranty-disclaimer_64.RULE @@ -1,7 +1,9 @@ --- license_expression: warranty-disclaimer is_license_text: yes +is_deprecated: yes relevance: 100 +notes: 'Replaced by license: swrule' --- Use at your own risk \ No newline at end of file diff --git a/src/scancode_config.py b/src/scancode_config.py index 4cbe541c62e..a804125b62e 100644 --- a/src/scancode_config.py +++ b/src/scancode_config.py @@ -144,7 +144,7 @@ def _create_dir(location): __output_format_version__ = '3.0.0' # -spdx_license_list_version = '3.21' +spdx_license_list_version = '3.22' ################################################################################ # USAGE MODE-, INSTALLATION- and IMPORT- and RUN-SPECIFIC DIRECTORIES diff --git a/tests/formattedcode/data/spdx/license_known/expected.rdf b/tests/formattedcode/data/spdx/license_known/expected.rdf index 9bb9ac120d6..5046816c64c 100644 --- a/tests/formattedcode/data/spdx/license_known/expected.rdf +++ b/tests/formattedcode/data/spdx/license_known/expected.rdf @@ -94,7 +94,7 @@ "@rdf:resource": "http://spdx.org/licenses/CC0-1.0" }, "@rdf:about": "#SPDXRef-DOCUMENT", - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.21", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.22", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/license_known/expected.tv b/tests/formattedcode/data/spdx/license_known/expected.tv index 794e54b535f..3cc8f407024 100644 --- a/tests/formattedcode/data/spdx/license_known/expected.tv +++ b/tests/formattedcode/data/spdx/license_known/expected.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.21 +SPDX License List: 3.22 ## Creation Information ## Package Information PackageName: scan diff --git a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf index 9bb9ac120d6..5046816c64c 100644 --- a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf +++ b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf @@ -94,7 +94,7 @@ "@rdf:resource": "http://spdx.org/licenses/CC0-1.0" }, "@rdf:about": "#SPDXRef-DOCUMENT", - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.21", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.22", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/license_known/expected_with_text.tv b/tests/formattedcode/data/spdx/license_known/expected_with_text.tv index 794e54b535f..3cc8f407024 100644 --- a/tests/formattedcode/data/spdx/license_known/expected_with_text.tv +++ b/tests/formattedcode/data/spdx/license_known/expected_with_text.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.21 +SPDX License List: 3.22 ## Creation Information ## Package Information PackageName: scan diff --git a/tests/formattedcode/data/spdx/license_ref/expected.rdf b/tests/formattedcode/data/spdx/license_ref/expected.rdf index 349076a8a7a..8535f364e1c 100644 --- a/tests/formattedcode/data/spdx/license_ref/expected.rdf +++ b/tests/formattedcode/data/spdx/license_ref/expected.rdf @@ -116,7 +116,7 @@ } } ], - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.21", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.22", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/license_ref/expected.tv b/tests/formattedcode/data/spdx/license_ref/expected.tv index 491c4103955..f86ca708a91 100644 --- a/tests/formattedcode/data/spdx/license_ref/expected.tv +++ b/tests/formattedcode/data/spdx/license_ref/expected.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.21 +SPDX License List: 3.22 ## Creation Information ## Package Information PackageName: scan diff --git a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf index a03483b114b..ec6deba697b 100644 --- a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf +++ b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf @@ -116,7 +116,7 @@ } } ], - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.21", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.22", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/license_ref/expected_with_text.tv b/tests/formattedcode/data/spdx/license_ref/expected_with_text.tv index 997ee4bc7f4..a55267e73d1 100644 --- a/tests/formattedcode/data/spdx/license_ref/expected_with_text.tv +++ b/tests/formattedcode/data/spdx/license_ref/expected_with_text.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.21 +SPDX License List: 3.22 ## Creation Information ## Package Information PackageName: scan diff --git a/tests/formattedcode/data/spdx/or_later/expected.rdf b/tests/formattedcode/data/spdx/or_later/expected.rdf index d1baeaa9859..cf105c9a8be 100644 --- a/tests/formattedcode/data/spdx/or_later/expected.rdf +++ b/tests/formattedcode/data/spdx/or_later/expected.rdf @@ -59,7 +59,7 @@ "@rdf:resource": "http://spdx.org/licenses/CC0-1.0" }, "@rdf:about": "#SPDXRef-DOCUMENT", - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.21", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.22", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/simple/expected.rdf b/tests/formattedcode/data/spdx/simple/expected.rdf index 357c8a169a1..eff06adaddf 100644 --- a/tests/formattedcode/data/spdx/simple/expected.rdf +++ b/tests/formattedcode/data/spdx/simple/expected.rdf @@ -59,7 +59,7 @@ "@rdf:resource": "http://spdx.org/licenses/CC0-1.0" }, "@rdf:about": "#SPDXRef-DOCUMENT", - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.21", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.22", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/simple/expected.tv b/tests/formattedcode/data/spdx/simple/expected.tv index 964482c3e02..1b6a13f4667 100644 --- a/tests/formattedcode/data/spdx/simple/expected.tv +++ b/tests/formattedcode/data/spdx/simple/expected.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.21 +SPDX License List: 3.22 ## Creation Information ## Package Information PackageName: simple diff --git a/tests/formattedcode/data/spdx/tree/expected.rdf b/tests/formattedcode/data/spdx/tree/expected.rdf index 8404243c01c..7cbfcadf341 100644 --- a/tests/formattedcode/data/spdx/tree/expected.rdf +++ b/tests/formattedcode/data/spdx/tree/expected.rdf @@ -229,7 +229,7 @@ "@rdf:resource": "http://spdx.org/licenses/CC0-1.0" }, "@rdf:about": "#SPDXRef-DOCUMENT", - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.21", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.22", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/tree/expected.tv b/tests/formattedcode/data/spdx/tree/expected.tv index 1ff190884ce..b3c4605ac11 100644 --- a/tests/formattedcode/data/spdx/tree/expected.tv +++ b/tests/formattedcode/data/spdx/tree/expected.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.21 +SPDX License List: 3.22 ## Creation Information ## Package Information PackageName: scan diff --git a/tests/formattedcode/data/spdx/unicode/expected.rdf b/tests/formattedcode/data/spdx/unicode/expected.rdf index c9f21d9cab9..226db859b3f 100644 --- a/tests/formattedcode/data/spdx/unicode/expected.rdf +++ b/tests/formattedcode/data/spdx/unicode/expected.rdf @@ -68,7 +68,7 @@ "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.LICENSE" } }, - "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.21", + "rdfs:comment": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.\nSPDX License List: 3.22", "spdx:name": "SPDX Document created by ScanCode Toolkit", "spdx:specVersion": "SPDX-2.2" }, diff --git a/tests/formattedcode/data/spdx/unicode/expected.tv b/tests/formattedcode/data/spdx/unicode/expected.tv index 1482ce670c0..00a095d2d91 100644 --- a/tests/formattedcode/data/spdx/unicode/expected.tv +++ b/tests/formattedcode/data/spdx/unicode/expected.tv @@ -10,7 +10,7 @@ ScanCode should be considered or used as legal advice. Consult an Attorney for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. -SPDX License List: 3.21 +SPDX License List: 3.22 ## Creation Information ## Package Information PackageName: unicode diff --git a/tests/licensedcode/data/datadriven/external/licensecheck/devscripts/false-positives.yml b/tests/licensedcode/data/datadriven/external/licensecheck/devscripts/false-positives.yml index d086f147d0f..64a58aad02d 100644 --- a/tests/licensedcode/data/datadriven/external/licensecheck/devscripts/false-positives.yml +++ b/tests/licensedcode/data/datadriven/external/licensecheck/devscripts/false-positives.yml @@ -1,5 +1,4 @@ license_expressions: - - mit-old-style-no-advert - other-permissive - generic-cla - unknown-license-reference 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/lic1/free-unknown_adobe_1.txt.yml b/tests/licensedcode/data/datadriven/lic1/free-unknown_adobe_1.txt.yml index cf269c609e3..1994b9a46f8 100644 --- a/tests/licensedcode/data/datadriven/lic1/free-unknown_adobe_1.txt.yml +++ b/tests/licensedcode/data/datadriven/lic1/free-unknown_adobe_1.txt.yml @@ -1,2 +1,2 @@ license_expressions: - - other-permissive + - adobe-utopia 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/licensedcode/data/datadriven/lic4/openssh.LICENSE.yml b/tests/licensedcode/data/datadriven/lic4/openssh.LICENSE.yml index ff16d26165d..e7a2f3c5069 100644 --- a/tests/licensedcode/data/datadriven/lic4/openssh.LICENSE.yml +++ b/tests/licensedcode/data/datadriven/lic4/openssh.LICENSE.yml @@ -3,8 +3,8 @@ license_expressions: - openssh - gary-s-brown - other-permissive - - bsd-new - other-permissive + - ssh-keyscan - public-domain - public-domain-disclaimer - bsd-original-uc diff --git a/tests/licensedcode/data/datadriven/lic4/openssh_1.RULE.yml b/tests/licensedcode/data/datadriven/lic4/openssh_1.RULE.yml index 2109f67a9fa..ab5f1368bf5 100644 --- a/tests/licensedcode/data/datadriven/lic4/openssh_1.RULE.yml +++ b/tests/licensedcode/data/datadriven/lic4/openssh_1.RULE.yml @@ -2,8 +2,8 @@ license_expressions: - openssh - gary-s-brown - other-permissive - - bsd-new - other-permissive + - ssh-keyscan - public-domain - public-domain-disclaimer - bsd-original-uc diff --git a/tests/licensedcode/data/datadriven/unknown/ucware-eula.txt.yml b/tests/licensedcode/data/datadriven/unknown/ucware-eula.txt.yml index 650f8d38a53..6940c2386ce 100644 --- a/tests/licensedcode/data/datadriven/unknown/ucware-eula.txt.yml +++ b/tests/licensedcode/data/datadriven/unknown/ucware-eula.txt.yml @@ -3,6 +3,7 @@ license_expressions: - unknown-license-reference - unknown - warranty-disclaimer - - warranty-disclaimer + - unknown + - swrule notes: this is a license from fossology license reference UCWare-EULA (UCWare Software License Agreement) http://www.ucware.com/jexec/documentation/license.html diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamav/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamav/stable_copyright-detailed.expected.yml index ed0f8321b05..938e0b0d134 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamav/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamav/stable_copyright-detailed.expected.yml @@ -57,18 +57,18 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND GPL-2.0-only AND cryptsetup-OpenSSL-exception AND GPL-2.0-only) AND GPL-2.0-only AND (GPL-2.0-or-later AND GPL-2.0-or-later) AND GPL-2.0-only AND (GPL-2.0-or-later AND GPL-2.0-or-later) AND GPL-2.0-only AND (GPL-2.0-or-later AND Autoconf-exception-generic AND GPL-2.0-only) AND GPL-2.0-only AND - (GPL-3.0-or-later WITH LicenseRef-scancode-autoconf-simple-exception AND GPL-3.0-only) AND - GPL-3.0-only AND (GPL-2.0-or-later WITH Libtool-exception AND GPL-2.0-only) AND GPL-2.0-only - AND (LGPL-2.0-or-later WITH Libtool-exception AND LGPL-2.0-or-later) AND LGPL-2.0-or-later - AND (LGPL-2.1-only AND LGPL-2.1-only) AND ((LGPL-2.1-only AND LGPL-2.1-only) AND BSD-3-Clause) - AND MIT AND (X11 AND LicenseRef-scancode-public-domain) AND MIT AND BSD-2-Clause AND BSD-2-Clause - AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND Zlib AND Zlib AND ISC AND FSFULLR AND - FSFUL AND FSFULLRWD AND FSFAP AND FSFAP AND bzip2-1.0.6 AND LicenseRef-scancode-public-domain - AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-public-domain AND libtiff AND - (LicenseRef-scancode-public-domain AND LicenseRef-scancode-public-domain) AND (Apache-2.0 - AND (LicenseRef-scancode-free-unknown AND Apache-2.0 WITH LicenseRef-scancode-generic-exception)) - AND (LicenseRef-scancode-free-unknown AND Apache-2.0 WITH LicenseRef-scancode-generic-exception) - AND (GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-3.0-only) AND GPL-3.0-only + (GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-only) AND GPL-3.0-only AND + (GPL-2.0-or-later WITH Libtool-exception AND GPL-2.0-only) AND GPL-2.0-only AND (LGPL-2.0-or-later + WITH Libtool-exception AND LGPL-2.0-or-later) AND LGPL-2.0-or-later AND (LGPL-2.1-only AND + LGPL-2.1-only) AND ((LGPL-2.1-only AND LGPL-2.1-only) AND BSD-3-Clause) AND MIT AND (X11 AND + LicenseRef-scancode-public-domain) AND MIT AND BSD-2-Clause AND BSD-2-Clause AND BSD-3-Clause + AND BSD-3-Clause AND BSD-3-Clause AND Zlib AND Zlib AND ISC AND FSFULLR AND FSFUL AND FSFULLRWD + AND FSFAP AND FSFAP AND bzip2-1.0.6 AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-public-domain + AND LicenseRef-scancode-public-domain AND libtiff AND (LicenseRef-scancode-public-domain AND + LicenseRef-scancode-public-domain) AND (Apache-2.0 AND (LicenseRef-scancode-free-unknown AND + Apache-2.0 WITH LicenseRef-scancode-generic-exception)) AND (LicenseRef-scancode-free-unknown + AND Apache-2.0 WITH LicenseRef-scancode-generic-exception) AND (GPL-3.0-or-later WITH Bison-exception-2.2 + AND GPL-3.0-only) AND GPL-3.0-only license_detections: [] other_license_detections: - license_expression: gpl-2.0 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/golang-1.11/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/golang-1.11/stable_copyright-detailed.expected.yml index a1dbd62a1cd..386433b0f72 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/golang-1.11/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/golang-1.11/stable_copyright-detailed.expected.yml @@ -34,7 +34,7 @@ other_license_expression_spdx: (BSD-3-Clause AND LicenseRef-scancode-google-pate AND MIT AND (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) AND (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) AND (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) AND BSD-2-Clause AND (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) AND - (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) AND SunPro AND LicenseRef-scancode-mpeg-ssg + (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) AND SunPro AND MPEG-SSG AND LicenseRef-scancode-other-permissive AND (Apache-2.0 AND Apache-2.0) AND BSD-2-Clause-Views AND CC-BY-3.0 AND CC-BY-3.0 AND BSD-3-Clause AND (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) license_detections: [] 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 64e02604f0c..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 @@ -29,13 +29,12 @@ other_license_expression: (public-domain AND us-govt-public-domain) AND boost-1. AND (public-domain AND us-govt-public-domain) AND (public-domain AND us-govt-public-domain) 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 (LicenseRef-scancode-mit-modification-obligations 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 BSL-1.0 AND (HPND-export-US-modify AND LicenseRef-scancode-proprietary-license) AND LicenseRef-scancode-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) AND (LicenseRef-scancode-public-domain - AND LicenseRef-scancode-us-govt-public-domain) + (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 8b24da47a8a..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,7 +4,7 @@ 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 @@ -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 b9e5383220e..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,7 +26,7 @@ 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-1986 AND LicenseRef-scancode-nilsson-historical @@ -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 5713b32191d..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,8 +33,8 @@ 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-1986 AND LicenseRef-scancode-nilsson-historical AND LicenseRef-scancode-newlib-historical AND BSD-3-Clause AND LicenseRef-scancode-amd-historical @@ -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' diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgssapi-krb5-2/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgssapi-krb5-2/copyright-detailed.expected.yml index de140569adc..c8a31e5b269 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgssapi-krb5-2/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgssapi-krb5-2/copyright-detailed.expected.yml @@ -18,8 +18,8 @@ declared_license_expression_spdx: BSD-2-Clause AND LicenseRef-scancode-generic-e AND (LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license) AND BSD-4-Clause-UC AND LicenseRef-scancode-mit-no-advert-export-control AND BSD-4-Clause AND MIT AND ISC AND ISC AND LicenseRef-scancode-other-permissive AND BSD-3-Clause AND LicenseRef-scancode-rsa-md4 - AND RSA-MD AND LicenseRef-scancode-rsa-1990 AND LicenseRef-scancode-mit-modification-obligations - AND BSD-3-Clause AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-3-Clause AND BSD-2-Clause + AND RSA-MD AND LicenseRef-scancode-rsa-1990 AND HPND-export-US-modify AND BSD-3-Clause AND + (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-3-Clause AND BSD-2-Clause other_license_expression: other_license_expression_spdx: license_detections: diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libhogweed6/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libhogweed6/copyright-detailed.expected.yml index ceb8842ddee..fc8302cb0c4 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libhogweed6/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libhogweed6/copyright-detailed.expected.yml @@ -186,7 +186,7 @@ other_license_expression_spdx: ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GP AND GPL-2.0-or-later)) AND ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GPL-2.0-or-later AND GPL-2.0-or-later)) AND ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GPL-2.0-or-later AND GPL-2.0-or-later)) AND ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GPL-2.0-or-later - AND GPL-2.0-or-later)) AND (GPL-3.0-or-later AND GPL-3.0-or-later WITH LicenseRef-scancode-tex-exception) + AND GPL-2.0-or-later)) AND (GPL-3.0-or-later AND GPL-3.0-or-later WITH Texinfo-exception) AND ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GPL-2.0-or-later AND GPL-2.0-or-later)) AND ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GPL-2.0-or-later AND GPL-2.0-or-later)) AND (GPL-2.0-or-later AND GPL-2.0-or-later) AND Autoconf-exception-generic AND LicenseRef-scancode-public-domain diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libk5crypto3/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libk5crypto3/copyright-detailed.expected.yml index de140569adc..c8a31e5b269 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libk5crypto3/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libk5crypto3/copyright-detailed.expected.yml @@ -18,8 +18,8 @@ declared_license_expression_spdx: BSD-2-Clause AND LicenseRef-scancode-generic-e AND (LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license) AND BSD-4-Clause-UC AND LicenseRef-scancode-mit-no-advert-export-control AND BSD-4-Clause AND MIT AND ISC AND ISC AND LicenseRef-scancode-other-permissive AND BSD-3-Clause AND LicenseRef-scancode-rsa-md4 - AND RSA-MD AND LicenseRef-scancode-rsa-1990 AND LicenseRef-scancode-mit-modification-obligations - AND BSD-3-Clause AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-3-Clause AND BSD-2-Clause + AND RSA-MD AND LicenseRef-scancode-rsa-1990 AND HPND-export-US-modify AND BSD-3-Clause AND + (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-3-Clause AND BSD-2-Clause other_license_expression: other_license_expression_spdx: license_detections: diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkrb5-3/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkrb5-3/copyright-detailed.expected.yml index de140569adc..c8a31e5b269 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkrb5-3/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkrb5-3/copyright-detailed.expected.yml @@ -18,8 +18,8 @@ declared_license_expression_spdx: BSD-2-Clause AND LicenseRef-scancode-generic-e AND (LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license) AND BSD-4-Clause-UC AND LicenseRef-scancode-mit-no-advert-export-control AND BSD-4-Clause AND MIT AND ISC AND ISC AND LicenseRef-scancode-other-permissive AND BSD-3-Clause AND LicenseRef-scancode-rsa-md4 - AND RSA-MD AND LicenseRef-scancode-rsa-1990 AND LicenseRef-scancode-mit-modification-obligations - AND BSD-3-Clause AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-3-Clause AND BSD-2-Clause + AND RSA-MD AND LicenseRef-scancode-rsa-1990 AND HPND-export-US-modify AND BSD-3-Clause AND + (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-3-Clause AND BSD-2-Clause other_license_expression: other_license_expression_spdx: license_detections: diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnettle8/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnettle8/copyright-detailed.expected.yml index ceb8842ddee..fc8302cb0c4 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnettle8/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnettle8/copyright-detailed.expected.yml @@ -186,7 +186,7 @@ other_license_expression_spdx: ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GP AND GPL-2.0-or-later)) AND ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GPL-2.0-or-later AND GPL-2.0-or-later)) AND ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GPL-2.0-or-later AND GPL-2.0-or-later)) AND ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GPL-2.0-or-later - AND GPL-2.0-or-later)) AND (GPL-3.0-or-later AND GPL-3.0-or-later WITH LicenseRef-scancode-tex-exception) + AND GPL-2.0-or-later)) AND (GPL-3.0-or-later AND GPL-3.0-or-later WITH Texinfo-exception) AND ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GPL-2.0-or-later AND GPL-2.0-or-later)) AND ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GPL-2.0-or-later AND GPL-2.0-or-later)) AND (GPL-2.0-or-later AND GPL-2.0-or-later) AND Autoconf-exception-generic AND LicenseRef-scancode-public-domain diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnsl2/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnsl2/copyright-detailed.expected.yml index aefba04ddf5..b6536c78f6d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnsl2/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnsl2/copyright-detailed.expected.yml @@ -32,9 +32,9 @@ declared_license_expression: (lgpl-2.1-plus AND lgpl-2.1-plus) AND (lgpl-2.1 AND libtool-exception-2.0 AND fsf-unlimited AND fsf-ap declared_license_expression_spdx: (LGPL-2.1-or-later AND LGPL-2.1-or-later) AND (LGPL-2.1-only AND LGPL-2.1-only) AND (LGPL-2.1-or-later AND LGPL-2.1-or-later) AND BSD-3-Clause AND FSFAP - AND FSFULLRWD AND FSFULLRWD AND GPL-3.0-or-later WITH LicenseRef-scancode-autoconf-simple-exception - AND FSFUL AND GPL-2.0-or-later WITH Autoconf-exception-generic AND X11 AND GPL-2.0-or-later - WITH Libtool-exception AND FSFULLR AND FSFAP + AND FSFULLRWD AND FSFULLRWD AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND FSFUL + AND GPL-2.0-or-later WITH Autoconf-exception-generic AND X11 AND GPL-2.0-or-later WITH Libtool-exception + AND FSFULLR AND FSFAP other_license_expression: other_license_expression_spdx: license_detections: