Add modifications from SPDX license list 3.20 #3263

AyanSinhaMahapatra · AyanSinhaMahapatra · commit c464411505eb · 2023-02-23T04:00:05.000+05:30
* Add modifications to licenses where we have a new SPDX license for an
  already existing scancode license.

Signed-off-by: Ayan Sinha Mahapatra &lt;ayansmahapatra@gmail.com&gt;
diff --git a/src/licensedcode/data/licenses/ada-linking-exception.LICENSE b/src/licensedcode/data/licenses/ada-linking-exception.LICENSE
@@ -5,10 +5,13 @@ name: Ada linking exception to GPL 2.0 or later
 category: Copyleft Limited
 owner: Dmitriy Anisimkov
 is_exception: yes
-spdx_license_key: LicenseRef-scancode-ada-linking-exception
+spdx_license_key: GNAT-exception
+other_spdx_license_keys:
+    - LicenseRef-scancode-ada-linking-exception
 other_urls:
     - http://zlib-ada.sourceforge.net/
     - http://ada-ru.org/
+    - https://github.com/AdaCore/florist/blob/master/libsrc/posix-configurable_file_limits.adb
 standard_notice: |
     ---------------------------------------------------------------------------
     ---
diff --git a/src/licensedcode/data/licenses/autoconf-simple-exception-2.0.LICENSE b/src/licensedcode/data/licenses/autoconf-simple-exception-2.0.LICENSE
@@ -7,7 +7,13 @@ owner: Free Software Foundation (FSF)
 homepage_url: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob;f=config.guess;h=a7448442748cc6f98a066d2d1051fad3b043761a;hb=HEAD
 notes: this is a simpler version of the Autonconf exception to the GPL
 is_exception: yes
-spdx_license_key: LicenseRef-scancode-autoconf-simple-exception-2.0
+spdx_license_key: Autoconf-exception-generic
+other_spdx_license_keys:
+    - LicenseRef-scancode-autoconf-simple-exception-2.0
+other_urls:
+    - https://launchpad.net/ubuntu/precise/+source/xmltooling/+copyright
+    - https://tracker.debian.org/media/packages/s/sipwitch/copyright-1.9.15-3
+    - https://opensource.apple.com/source/launchd/launchd-258.1/launchd/compile.auto.html
 ---
 
 As a special exception to the GNU General Public License, if you
diff --git a/src/licensedcode/data/licenses/brian-gladman-3-clause.LICENSE b/src/licensedcode/data/licenses/brian-gladman-3-clause.LICENSE
@@ -4,7 +4,11 @@ short_name: Brian Gladman 3-Clause License
 name: Brian Gladman 3-Clause License
 category: Permissive
 owner: Brian Gladman
-spdx_license_key: LicenseRef-scancode-brian-gladman-3-clause
+spdx_license_key: Brian-Gladman-3-Clause
+other_spdx_license_keys:
+    - LicenseRef-scancode-brian-gladman-3-clause
+other_urls:
+    - https://github.com/SWI-Prolog/packages-clib/blob/master/sha1/brg_endian.h
 ---
 
  LICENSE TERMS
diff --git a/src/licensedcode/data/licenses/bsd-original-uc-1986.LICENSE b/src/licensedcode/data/licenses/bsd-original-uc-1986.LICENSE
@@ -4,7 +4,11 @@ short_name: BSD-Original-UC-1986
 name: BSD-Original-UC-1986
 category: Permissive
 owner: Regents of the University of California
-spdx_license_key: LicenseRef-scancode-bsd-original-uc-1986
+spdx_license_key: BSD-4.3RENO
+other_spdx_license_keys:
+    - LicenseRef-scancode-bsd-original-uc-1986
+other_urls:
+    - https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=libiberty/strcasecmp.c;h=131d81c2ce7881fa48c363dc5bf5fb302c61ce0b;hb=HEAD
 ---
 
 Redistribution and use in source and binary forms are permitted provided that
diff --git a/src/licensedcode/data/licenses/bsla.LICENSE b/src/licensedcode/data/licenses/bsla.LICENSE
@@ -4,7 +4,11 @@ short_name: BSLA
 name: Berkeley Software License Agreement
 category: Permissive
 owner: Regents of the University of California
-spdx_license_key: LicenseRef-scancode-bsla
+spdx_license_key: BSD-4.3TAHOE
+other_spdx_license_keys:
+    - LicenseRef-scancode-bsla
+other_urls:
+    - https://github.com/389ds/389-ds-base/blob/main/ldap/include/sysexits-compat.h#L15
 ignorable_authors:
     - the University of California, Berkeley
 ---
diff --git a/src/licensedcode/data/licenses/carnegie-mellon-contributors.LICENSE b/src/licensedcode/data/licenses/carnegie-mellon-contributors.LICENSE
@@ -4,7 +4,11 @@ short_name: Carnegie Mellon Contributors
 name: Carnegie Mellon Contributors License
 category: Permissive
 owner: Carnegie Mellon University
-spdx_license_key: LicenseRef-scancode-carnegie-mellon-contributors
+spdx_license_key: CMU-Mach
+other_spdx_license_keys:
+    - LicenseRef-scancode-carnegie-mellon-contributors
+other_urls:
+    - https://www.cs.cmu.edu/~410/licenses.html
 ignorable_emails:
     - Software.Distribution@CS.CMU.EDU
 ---
diff --git a/src/licensedcode/data/licenses/cmu-computing-services.LICENSE b/src/licensedcode/data/licenses/cmu-computing-services.LICENSE
@@ -5,9 +5,13 @@ name: Carnegie Mellon Computing Services License
 category: Permissive
 owner: Carnegie Mellon University
 homepage_url: http://www.cmu.edu/computing/
-spdx_license_key: LicenseRef-scancode-cmu-computing-services
+spdx_license_key: BSD-Attribution-HPND-disclaimer
+other_spdx_license_keys:
+    - LicenseRef-scancode-cmu-computing-services
 text_urls:
     - http://cyrusimap.org/mediawiki/index.php/Downloads#Licensing
+other_urls:
+    - https://github.com/cyrusimap/cyrus-sasl/blob/master/COPYING
 minimum_coverage: 70
 ignorable_authors:
     - Computing Services at Carnegie Mellon University (http://www.cmu.edu/computing/)
diff --git a/src/licensedcode/data/licenses/graphics-gems.LICENSE b/src/licensedcode/data/licenses/graphics-gems.LICENSE
@@ -5,9 +5,13 @@ name: Graphics Gems License
 category: Permissive
 owner: Eric Haines
 homepage_url: https://github.com/erich666/GraphicsGems/blob/master/LICENSE.md
-spdx_license_key: LicenseRef-scancode-graphics-gems
+spdx_license_key: Graphics-Gems
+other_spdx_license_keys:
+    - LicenseRef-scancode-graphics-gems
 text_urls:
     - https://github.com/erich666/GraphicsGems/blob/master/LICENSE.md
+other_urls:
+    - https://github.com/erich666/GraphicsGems/blob/master/LICENSE.md
 ---
 
 LICENSE
diff --git a/src/licensedcode/data/licenses/inria-linking-exception.LICENSE b/src/licensedcode/data/licenses/inria-linking-exception.LICENSE
@@ -6,9 +6,13 @@ category: Copyleft Limited
 owner: INRIA
 homepage_url: http://para.inria.fr/~maranget/hevea/distri/LICENSE
 is_exception: yes
-spdx_license_key: LicenseRef-scancode-inria-linking-exception
+spdx_license_key: QPL-1.0-INRIA-2004-exception
+other_spdx_license_keys:
+    - LicenseRef-scancode-inria-linking-exception
 other_urls:
     - http://para.inria.fr/~maranget/hevea/distri/hevea-2.32.tar.gz
+    - https://git.frama-c.com/pub/frama-c/-/blob/master/licenses/Q_MODIFIED_LICENSE
+    - https://github.com/maranget/hevea/blob/master/LICENSE
 standard_notice: |
     As a special exception to the Q Public Licence, you may develop
     application programs, reusable components and other software items
diff --git a/src/licensedcode/data/licenses/libpbm.LICENSE b/src/licensedcode/data/licenses/libpbm.LICENSE
@@ -5,11 +5,14 @@ name: PBM Library License
 category: Permissive
 owner: ACME Labs
 homepage_url: http://web.mit.edu/tex/fontutil/fontutils-0.6/pbm/libpbm1.c
-spdx_license_key: LicenseRef-scancode-libpbm
+spdx_license_key: xlock
+other_spdx_license_keys:
+    - LicenseRef-scancode-libpbm
 text_urls:
     - http://web.mit.edu/tex/fontutil/fontutils-0.6/pbm/libpbm1.c
 other_urls:
     - http://sourceforge.net/p/netpbm/code/HEAD/tree/trunk/doc/COPYRIGHT.PATENT
+    - https://fossies.org/linux/tiff/contrib/ras/ras2tif.c
 ---
 
 Permission to use, copy, modify, and distribute this software and its documentation
diff --git a/src/licensedcode/data/licenses/markus-kuhn-license.LICENSE b/src/licensedcode/data/licenses/markus-kuhn-license.LICENSE
@@ -5,11 +5,15 @@ name: Markus Kuhn License
 category: Permissive
 owner: Markus Kuhn
 homepage_url: https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
-spdx_license_key: LicenseRef-scancode-markus-kuhn-license
+spdx_license_key: HPND-Markus-Kuhn
+other_spdx_license_keys:
+    - LicenseRef-scancode-markus-kuhn-license
 text_urls:
     - https://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c
 other_urls:
     - https://github.com/search?q=%22Permission+to+use%2C+copy%2C+modify%2C+and+distribute+this+software+for+any+purpose+and+without+fee+is+hereby+granted.%22+%22The+author+disclaims+all+warranties+with+regard+to+this+software.%22&type=code
+    - https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
+    - https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=readline/readline/support/wcwidth.c;h=0f5ec995796f4813abbcf4972aec0378ab74722a;hb=HEAD#l55
 ---
 
 Permission to use, copy, modify, and distribute this software
diff --git a/src/licensedcode/data/licenses/martin-birgmeier.LICENSE b/src/licensedcode/data/licenses/martin-birgmeier.LICENSE
@@ -5,9 +5,13 @@ name: Martin Bergmeier License
 category: Permissive
 owner: Martin Bergmeier
 homepage_url: https://chromium.googlesource.com/native_client/nacl-newlib/+/590b76526a1ff92504bf20234610043fd45ae034/newlib/libc/stdlib/rand48.h
-spdx_license_key: LicenseRef-scancode-martin-birgmeier
+spdx_license_key: Martin-Birgmeier
+other_spdx_license_keys:
+    - LicenseRef-scancode-martin-birgmeier
 text_urls:
     - https://chromium.googlesource.com/native_client/nacl-newlib/+/590b76526a1ff92504bf20234610043fd45ae034/newlib/libc/stdlib/rand48.h
+other_urls:
+    - https://github.com/Perl/perl5/blob/blead/util.c#L6136
 ---
 
 You may redistribute unmodified or modified versions of this source
diff --git a/src/licensedcode/data/licenses/mit-addition.LICENSE b/src/licensedcode/data/licenses/mit-addition.LICENSE
@@ -5,7 +5,9 @@ name: MIT Addition License
 category: Permissive
 owner: Tom Wu
 homepage_url: http://www-cs-students.stanford.edu/~tjw/jsbn/LICENSE
-spdx_license_key: LicenseRef-scancode-mit-addition
+spdx_license_key: MIT-Wu
+other_spdx_license_keys:
+    - LicenseRef-scancode-mit-addition
 other_urls:
     - http://www-cs-students.stanford.edu/~tjw/jsbn/
 minimum_coverage: 90
diff --git a/src/licensedcode/data/licenses/openpbs-2.3.LICENSE b/src/licensedcode/data/licenses/openpbs-2.3.LICENSE
@@ -5,11 +5,15 @@ name: OpenPBS Software License v2.3
 category: Copyleft Limited
 owner: Fedora
 homepage_url: http://fedoraproject.org/wiki/Licensing/OpenPBS
-spdx_license_key: LicenseRef-scancode-openpbs-2.3
+spdx_license_key: OpenPBS-2.3
+other_spdx_license_keys:
+    - LicenseRef-scancode-openpbs-2.3
 text_urls:
     - http://fedoraproject.org/wiki/Licensing/OpenPBS
 other_urls:
     - www.OpenPBS.org
+    - https://github.com/adaptivecomputing/torque/blob/master/PBS_License.txt
+    - https://www.mcs.anl.gov/research/projects/openpbs/PBS_License.txt
 ignorable_copyrights:
     - Copyright (c) 1999-2000 Veridian Information Solutions, Inc.
 ignorable_holders:
diff --git a/src/licensedcode/data/licenses/osf-1990.LICENSE b/src/licensedcode/data/licenses/osf-1990.LICENSE
@@ -5,9 +5,13 @@ name: OSF 1990 License
 category: Permissive
 owner: Open Group
 homepage_url: https://fedoraproject.org/wiki/Licensing:MIT?rd=Licensing/MIT#HP_Variant
-spdx_license_key: LicenseRef-scancode-osf-1990
+spdx_license_key: HP-1986
+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
 ---
 
 To anyone who acknowledges that this file is provided "AS IS"
diff --git a/src/licensedcode/data/licenses/snprintf.LICENSE b/src/licensedcode/data/licenses/snprintf.LICENSE
@@ -4,7 +4,11 @@ short_name: snprintf License
 name: snprintf License
 category: Permissive
 owner: Unspecified
-spdx_license_key: LicenseRef-scancode-snprintf
+spdx_license_key: snprintf
+other_spdx_license_keys:
+    - LicenseRef-scancode-snprintf
+other_urls:
+    - https://github.com/openssh/openssh-portable/blob/master/openbsd-compat/bsd-snprintf.c#L2
 ---
 
 It may be used for any purpose as long as this notice remains intact on all
diff --git a/src/licensedcode/data/licenses/sunpro.LICENSE b/src/licensedcode/data/licenses/sunpro.LICENSE
@@ -4,7 +4,9 @@ short_name: SunPro Attribution License
 name: SunPro Attribution License
 category: Permissive
 owner: Oracle (Sun)
-spdx_license_key: LicenseRef-scancode-sunpro
+spdx_license_key: SunPro
+other_spdx_license_keys:
+    - LicenseRef-scancode-sunpro
 ---
 
 Developed at SunPro, a Sun Microsystems, Inc. business.
diff --git a/src/licensedcode/data/licenses/thor-pl.LICENSE b/src/licensedcode/data/licenses/thor-pl.LICENSE
@@ -5,7 +5,34 @@ name: Thor Public License
 category: Copyleft Limited
 owner: Thor Project
 homepage_url: https://fedoraproject.org/wiki/Licensing:ThorPublicLicense?rd=Licensing/ThorPublicLicense
-spdx_license_key: LicenseRef-scancode-thor-pl
+spdx_license_key: TPL-1.0
+other_spdx_license_keys:
+    - LicenseRef-scancode-thor-pl
+other_urls:
+    - https://fedoraproject.org/wiki/Licensing:ThorPublicLicense
+standard_notice: |
+    The contents of this file are subject to the THOR Public License Version
+    1.0 (the "License"); you may not use this file except in compliance with
+    the License.
+    Software distributed under the License is distributed on an "AS IS" basis,
+    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+    for the specificlanguage governing rights and limitations under the
+    License.
+    The Original Code is ______________________________________.
+    The Initial Developer of the Original Code is _____________.
+    Portions created by ______________________ are Copyright (C) ______
+    _______________________.
+    All Rights Reserved.
+    Contributor(s): ______________________________________.
+    Alternatively, the contents of this file may be used under the terms of the
+    _____ license (the [___] License), in which case the provisions of [______]
+    License are applicable instead of those above. If you wish to allow use of
+    your version of this file only under the terms of the [____] License and
+    not to allow others to use your version of this file under the TPL,
+    indicate your decision by deleting the provisions above and replace them
+    with the notice and other provisions required by the [___] License. If you
+    do not delete the provisions above, a recipient may use your version of
+    this file under either the TPL or the [___] License."
 ---
 
 THOR Public Licence (TPL)
diff --git a/src/licensedcode/data/licenses/x11-bitstream.LICENSE b/src/licensedcode/data/licenses/x11-bitstream.LICENSE
@@ -5,7 +5,12 @@ name: X11-Style (Bitstream Charter)
 category: Permissive
 owner: Bitstream
 notes: this is an historical license with an extra grant
-spdx_license_key: LicenseRef-scancode-x11-bitstream
+spdx_license_key: Bitstream-Charter
+other_spdx_license_keys:
+    - LicenseRef-scancode-x11-bitstream
+other_urls:
+    - https://fedoraproject.org/wiki/Licensing/Charter#License_Text
+    - https://raw.githubusercontent.com/blackhole89/notekit/master/data/fonts/Charter%20license.txt
 ignorable_copyrights:
     - (c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
 ignorable_holders:
