Review license additions and modifications

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

src/licensedcode/data/licenses/adobe-utopia.LICENSE

@@ -2,6 +2,8 @@
 key: adobe-utopia
 short_name: Adobe Utopia Font License
 name: Adobe Utopia Font License
+category: Permissive
+owner: Adobe Systems
 notes: |
     license_expression: other-permissive
     matches:

src/licensedcode/data/licenses/bsd-3-clause-flex.LICENSE

@@ -1,9 +1,12 @@
 ---
 key: bsd-3-clause-flex
 short_name: BSD 3-Clause Flex variant
+category: Permissive
+owner: Regents of the University of California
 name: BSD 3-Clause Flex variant
 notes: |
-    Multiple licenses detected by scancode on this textlicense_expression: flex-2.5 AND llnl
+    Multiple licenses detected by scancode on this text
+    license_expression: flex-2.5 AND llnl
     matches:
       - score: '100.0'
         start_line: 1

src/licensedcode/data/licenses/bsd-3-clause-hp.LICENSE

@@ -2,6 +2,8 @@
 key: bsd-3-clause-hp
 short_name: Hewlett-Packard BSD variant license
 name: Hewlett-Packard BSD variant license
+category: Permissive
+owner: HP - Hewlett Packard
 notes: |
     license_expression: bsd-new
     matches:

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
 ---
 

src/licensedcode/data/licenses/bsd-inferno-nettverk.LICENSE

@@ -2,57 +2,8 @@
 key: bsd-inferno-nettverk
 short_name: BSD-Inferno-Nettverk
 name: BSD-Inferno-Nettverk
-notes: |
-    Multiple licenses detected by scancode on this textlicense_expression: bsd-original
-    matches:
-      - score: '82.74'
-        start_line: 6
-        end_line: 29
-        matched_length: 187
-        match_coverage: '82.74'
-        matcher: 3-seq
-        license_expression: bsd-original
-        rule_identifier: bsd-original_58.RULE
-        rule_relevance: 100
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_58.RULE
-        matched_text: "Redistribution and use in source and binary forms, with or without\n  modification,\
-          \ are permitted provided that the following conditions\n  are met:\n  1. The above copyright\
-          \ notice, this list of conditions and the following\n     disclaimer [must] [appear] [in]\
-          \ [all] [copies] [of] [the] [software], [derivative] [works]\n     [or] [modified] [versions],\
-          \ [and] [any] [portions] [thereof], [aswell] [as] [in] [all]\n     [supporting] [documentation].\n\
-          \  [2]. All advertising materials mentioning features or use of this software\n     must\
-          \ display the following acknowledgement:\n       This product includes software developed\
-          \ by\n       [Inferno] [Nettverk] A/[S], [Norway].\n  [3]. The name of the author may\
-          \ not be used to endorse or promote products\n     derived from this software without\
-          \ specific prior written permission.\n \n  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS\
-          \ IS'' AND ANY EXPRESS OR\n  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\
-          \ WARRANTIES\n  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n\
-          \  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n  INCIDENTAL, SPECIAL,\
-          \ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n  NOT LIMITED TO, PROCUREMENT OF\
-          \ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n  DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\
-          \ HOWEVER CAUSED AND ON ANY\n  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\
-          \ OR TORT\n  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n\
-          \  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-    detection_log: []
-    identifier: bsd_original-f082a9ce-fd6f-5f6d-6d67-722092ebb836
-    license_expression:
-    matches:
-      - score: '11.81'
-        start_line: 40
-        end_line: 41
-        matched_length: 15
-        match_coverage: '11.81'
-        matcher: 3-seq
-        license_expression: carnegie-mellon-contributors
-        rule_identifier: carnegie-mellon-contributors.LICENSE
-        rule_relevance: 100
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/carnegie-mellon-contributors.LICENSE
-        matched_text: |
-          any improvements or extensions that they make and grant [Inferno] [Nettverk] A/[S]
-            the rights to redistribute these changes.
-    detection_log:
-      - low-quality-matches
-    identifier:
+category: Permissive
+owner: Inferno Nettverk
 spdx_license_key: BSD-Inferno-Nettverk
 other_urls:
     - https://www.inet.no/dante/LICENSE
@@ -61,41 +12,41 @@ other_urls:
 Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
                 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
                 2017, 2018, 2019, 2020
-       Inferno Nettverk A/S, Norway.  All rights reserved.
+Inferno Nettverk A/S, Norway.  All rights reserved.
 
-  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  [email protected]
-   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.
+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  [email protected]
+  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.

src/licensedcode/data/licenses/bsd-new.LICENSE

@@ -6,18 +6,17 @@ category: Permissive
 owner: Regents of the University of California
 homepage_url: http://www.opensource.org/licenses/BSD-3-Clause
 notes: Per SPDX.org, this license is OSI certified.
-spdx_license_key: BSD-3-Clause-Sun
+spdx_license_key: BSD-3-Clause
 other_spdx_license_keys:
-    - BSD-3-Clause
+    - LicenseRef-scancode-libzip
 osi_license_key: BSD-3-Clause
 text_urls:
     - http://www.opensource.org/licenses/BSD-3-Clause
 osi_url: http://www.opensource.org/licenses/BSD-3-Clause
 other_urls:
-    - https://www.eclipse.org/org/documents/edl-v10.php
-    - https://github.com/xmlark/msv/blob/b9316e2f2270bc1606952ea4939ec87fbba157f3/xsdlib/src/main/java/com/sun/msv/datatype/regexp/InternalImpl.java
     - http://framework.zend.com/license/new-bsd
     - https://opensource.org/licenses/BSD-3-Clause
+    - https://www.eclipse.org/org/documents/edl-v10.php
 ---
 
 Redistribution and use in source and binary forms, with or without modification,

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

@@ -2,56 +2,8 @@
 key: bsd-systemics
 short_name: Systemics BSD variant license
 name: Systemics BSD variant license
-notes: |
-    license_expression: proprietary-license AND ssleay
-    matches:
-      - score: '100.0'
-        start_line: 4
-        end_line: 4
-        matched_length: 7
-        match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: proprietary-license
-        rule_identifier: proprietary-license_204.RULE
-        rule_relevance: 100
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_204.RULE
-        matched_text: FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
-      - score: '70.35'
-        start_line: 7
-        end_line: 39
-        matched_length: 280
-        match_coverage: '70.35'
-        matcher: 3-seq
-        license_expression: ssleay
-        rule_identifier: ssleay_4.RULE
-        rule_relevance: 100
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ssleay_4.RULE
-        matched_text: "Copyright remains [with] [Systemics] [Ltd], and as such any Copyright notices\n\
-          in the code are not to be removed.  If this [code] [is] [used] [in] a [product],\n[Systemics]\
-          \ should be given attribution as the author of the parts used.\nThis can be in the form\
-          \ of a textual message at program startup or\nin documentation (online or textual) provided\
-          \ with the package.\n \nRedistribution and use in source and binary forms, with or without\n\
-          modification, are permitted provided that the following conditions\nare met:\n1. Redistributions\
-          \ of source code must retain the copyright\n   notice, this list of conditions and the\
-          \ following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n\
-          \   notice, this list of conditions and the following disclaimer in the\n   documentation\
-          \ and/or other materials provided with the distribution.\n3. All advertising materials\
-          \ mentioning features or use of this software\n   must display the following acknowledgement:\n\
-          \   This product includes [software] [developed] [by] [Systemics] [Ltd] ([http]://[www].[systemics].[com]/)\
-          \   \n \n[THIS] [SOFTWARE] [IS] [PROVIDED] [BY] [SYSTEMICS] [LTD] ``AS IS'' AND\nANY EXPRESS\
-          \ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY\
-          \ AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR\
-          \ OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,\
-          \ OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\
-          \ GOODS\nOR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER\
-          \ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT\
-          \ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE,\
-          \ EVEN IF ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGE.\n \nThe licence and distribution\
-          \ terms for any publically available version or\nderivative of this code cannot be changed.\
-          \  i.e. this code cannot simply be\ncopied and put under another distribution licence\
-          \ [including the GNU Public Licence.]"
-    detection_log: []
-    identifier: proprietary_license_and_ssleay-204afd41-bb58-b593-a297-a1c0d7ce77c2
+category: Permissive
+owner: Systemics Ltd
 spdx_license_key: BSD-Systemics
 other_urls:
     - https://metacpan.org/release/DPARIS/Crypt-DES-2.07/source/COPYRIGHT

src/licensedcode/data/licenses/check-cvs.LICENSE

@@ -2,6 +2,8 @@
 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

src/licensedcode/data/licenses/cronyx.LICENSE

@@ -2,6 +2,8 @@
 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

src/licensedcode/data/licenses/dl-de-zero-2.0.LICENSE

@@ -2,6 +2,8 @@
 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

src/licensedcode/data/licenses/fbm.LICENSE

@@ -2,6 +2,8 @@
 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

src/licensedcode/data/licenses/ferguson-twofish.LICENSE

@@ -2,34 +2,12 @@
 key: ferguson-twofish
 short_name: Ferguson Twofish License
 name: Ferguson Twofish License
-notes: |
-    license_expression: niels-ferguson
-    matches:
-      - score: '65.09'
-        start_line: 1
-        end_line: 15
-        matched_length: 138
-        match_coverage: '65.09'
-        matcher: 3-seq
-        license_expression: niels-ferguson
-        rule_identifier: niels-ferguson.LICENSE
-        rule_relevance: 100
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/niels-ferguson.LICENSE
-        matched_text: "The author hereby grants a perpetual license to everybody to \n use this\
-          \ code for any purpose as long as the copyright message is included \n in the source code\
-          \ of this or any derived work. \n  \n Yes, this means that you, your company, your club,\
-          \ and anyone else \n can use this code anywhere you want. You can change it and distribute\
-          \ it \n under the GPL, include it in your commercial product without releasing \n the\
-          \ source code, put it on the web, etc.  \n The only thing you cannot do is remove my copyright\
-          \ message,  \n or distribute any source code based on this implementation that does not\
-          \  \n include my copyright message.  \n  \n I appreciate a mention in the documentation\
-          \ or credits,  \n but I understand if that is difficult to do. \n I also appreciate it\
-          \ if you tell me where and why you used my code."
-    detection_log: []
-    identifier: niels_ferguson-52efd400-88cf-871d-7795-5834e1a85e6c
+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 

src/licensedcode/data/licenses/furuseth.LICENSE

@@ -2,28 +2,8 @@
 key: furuseth
 short_name: Furuseth License
 name: Furuseth License
-notes: |
-    license_expression: bsd-original-uc-1986
-    matches:
-      - score: '69.61'
-        start_line: 8
-        end_line: 13
-        matched_length: 45
-        match_coverage: '70.31'
-        matcher: 3-seq
-        license_expression: bsd-original-uc-1986
-        rule_identifier: bsd-original-uc-1986_3.RULE
-        rule_relevance: 99
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc-1986_3.RULE
-        matched_text: |
-          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.
-    detection_log: []
-    identifier: bsd_original_uc_1986-b1d5089a-52b4-4bc0-d2aa-3be48d03ed85
+category: Permissive
+owner: Unspecified
 spdx_license_key: Furuseth
 other_urls:
     - https://git.openldap.org/openldap/openldap/-/blob/master/COPYRIGHT?ref_type=heads#L39-51

src/licensedcode/data/licenses/fwlw.LICENSE

@@ -2,6 +2,8 @@
 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