chore(spdx-utils): Rerun the upgrade SPDX license list version 3.20

This is a fixup for 2e7e231 now that [1] has a work-around.

[1]: aboutcode-org/scancode-licensedb#32

Signed-off-by: Sebastian Schuberth <[email protected]>

utils/spdx/src/main/resources/licenses/BSD-Advertising-Acknowledgement

@@ -1,6 +1,3 @@
-Copyright (c) 2001 David Giffin.
-All rights reserved.
-
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:

utils/spdx/src/main/resources/licenses/CFITSIO

@@ -1,7 +1,21 @@
-Copyright (Unpublished-all rights reserved under the copyright laws of the United States), U.S. Government as represented by the Administrator of the National Aeronautics and Space Administration. No copyright is claimed in the United States under Title 17, U.S. Code.
+Copyright (Unpublished-all rights reserved under the copyright laws of the United States),
+U.S. Government as represented by the Administrator of the National Aeronautics and Space
+Administration. No copyright is claimed in the United States under Title 17, U.S. Code.
 
-Permission to freely use, copy, modify, and distribute this software and its documentation without fee is hereby granted, provided that this copyright notice and disclaimer of warranty appears in all copies.
+Permission to freely use, copy, modify, and distribute this software and its documentation
+without fee is hereby granted, provided that this copyright notice and disclaimer of warranty
+appears in all copies.
 
 DISCLAIMER:
 
-THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE. IN NO EVENT SHALL NASA BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM, OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY, CONTRACT, TORT , OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER."
+THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER EXPRESSED, IMPLIED,
+OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT THE SOFTWARE WILL CONFORM TO
+SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+AND FREEDOM FROM INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO
+THE SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE. IN NO EVENT SHALL NASA
+BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM, OR IN ANY WAY CONNECTED WITH THIS
+SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY, CONTRACT, TORT , OR OTHERWISE, WHETHER OR NOT
+INJURY WAS SUSTAINED BY PERSONS OR PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS
+SUSTAINED FROM, OR AROSE OUT OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES
+PROVIDED HEREUNDER.

utils/spdx/src/main/resources/licenses/Cornell-Lossless-JPEG

@@ -1,6 +1,3 @@
-Copyright (c) 1993 Cornell University, Kongji Huang
-All rights reserved.
-
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without written
 agreement is hereby granted, provided that the above copyright notice

utils/spdx/src/main/resources/licenses/HPND-export-US

@@ -1,5 +1,15 @@
-Copyright (C) 1990 by the Massachusetts Institute of Technology
+Export of this software from the United States of America may
+require a specific license from the United States Government.
+It is the responsibility of any person or organization contemplating
+export to obtain such a license before exporting.
 
-Export of this software from the United States of America may  require a specific license from the United States Government.  It is the responsibility of any person or organization contemplating  export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, 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, and that  the name of M.I.T. not be used in advertising or publicity pertaining  to distribution of the software without specific, written prior  permission. M.I.T. makes no representations about the suitability of  this software for any purpose. It is provided "as is" without express  or implied warranty.
+WITHIN THAT CONSTRAINT, 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, and that
+the name of M.I.T. not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission. M.I.T. makes no representations about the suitability of
+this software for any purpose. It is provided "as is" without express
+or implied warranty.

utils/spdx/src/main/resources/licenses/HPND-sell-variant-MIT-disclaimer

@@ -1,6 +1,3 @@
-by Jim Knoble <[email protected]>
-  Copyright (C) 1999,2000,2001 Jim Knoble
-
   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 and

utils/spdx/src/main/resources/licenses/JPL-image

@@ -1,21 +1,57 @@
 JPL Image Use Policy
 
-Unless otherwise noted, images and video on JPL public web sites (public sites ending with a jpl.nasa.gov address) may be used for any purpose without prior permission, subject to the special cases noted below. Publishers who wish to have authorization may print this page and retain it for their records; JPL does not issue image permissions on an image by image basis.
+Unless otherwise noted, images and video on JPL public web sites
+(public sites ending with a jpl.nasa.gov address) may be used
+for any purpose without prior permission, subject to the special
+cases noted below. Publishers who wish to have authorization may
+print this page and retain it for their records; JPL does not
+issue image permissions on an image by image basis.
 
 By electing to download the material from this web site the user agrees:
 
-1. that Caltech makes no representations or warranties with respect to ownership of copyrights in the images, and does not represent others who may claim to be authors or owners of copyright of any of the images, and makes no warranties as to the quality of the images. Caltech shall not be responsible for any loss or expenses resulting from the use of the images, and you release and hold Caltech harmless from all liability arising from such use.
-2. to use a credit line in connection with images. Unless otherwise noted in the caption information for an image, the credit line should be "Courtesy NASA/JPL-Caltech."
-3. that the endorsement of any product or service by Caltech, JPL or NASA must not be claimed or implied.
+1. that Caltech makes no representations or warranties with respect to
+   ownership of copyrights in the images, and does not represent others
+   who may claim to be authors or owners of copyright of any of the images,
+   and makes no warranties as to the quality of the images. Caltech shall
+   not be responsible for any loss or expenses resulting from the use of
+   the images, and you release and hold Caltech harmless from all liability
+   arising from such use.
+2. to use a credit line in connection with images. Unless otherwise noted
+   in the caption information for an image, the credit line should be
+   "Courtesy NASA/JPL-Caltech."
+3. that the endorsement of any product or service by Caltech, JPL or NASA
+   must not be claimed or implied.
 
 Special Cases:
 
-* Prior written approval must be obtained to use the NASA insignia logo (the blue "meatball" insignia), the NASA logotype (the red "worm" logo) and the NASA seal. These images may not be used by persons who are not NASA employees or on products (including Web pages) that are not NASA sponsored. In addition, no image may be used to explicitly or implicitly suggest endorsement by NASA, JPL or Caltech of commercial goods or services. Requests to use NASA logos may be directed to Bert Ulrich, Public Services Division, NASA Headquarters, Code POS, Washington, DC 20546, telephone (202) 358-1713, fax (202) 358-4331, email [email protected].
-
-* Prior written approval must be obtained to use the JPL logo (stylized JPL letters in red or other colors). Requests to use the JPL logo may be directed to the Institutional Communications Office, email [email protected].
-
-* If an image includes an identifiable person, using the image for commercial purposes may infringe that person's right of privacy or publicity, and permission should be obtained from the person. NASA and JPL generally do not permit likenesses of current employees to appear on commercial products. For more information, consult the NASA and JPL points of contact listed above.
-
-* JPL/Caltech contractors and vendors who wish to use JPL images in advertising or public relation materials should direct requests to the Institutional Communications Office, email [email protected].
-
-* Some image and video materials on JPL public web sites are owned by organizations other than JPL or NASA. These owners have agreed to make their images and video available for journalistic, educational and personal uses, but restrictions are placed on commercial uses. To obtain permission for commercial use, contact the copyright owner listed in each image caption. Ownership of images and video by parties other than JPL and NASA is noted in the caption material with each image.
+* Prior written approval must be obtained to use the NASA insignia logo
+  (the blue "meatball" insignia), the NASA logotype (the red "worm" logo)
+  and the NASA seal. These images may not be used by persons who are not
+  NASA employees or on products (including Web pages) that are not NASA
+  sponsored. In addition, no image may be used to explicitly or implicitly
+  suggest endorsement by NASA, JPL or Caltech of commercial goods or services.
+  Requests to use NASA logos may be directed to Bert Ulrich, Public Services
+  Division, NASA Headquarters, Code POS, Washington, DC 20546,
+  telephone (202) 358-1713, fax (202) 358-4331, email [email protected].
+
+* Prior written approval must be obtained to use the JPL logo
+  (stylized JPL letters in red or other colors). Requests to use the JPL logo
+  may be directed to the Institutional Communications Office,
+  email [email protected].
+
+* If an image includes an identifiable person, using the image for commercial
+  purposes may infringe that person's right of privacy or publicity,
+  and permission should be obtained from the person. NASA and JPL generally
+  do not permit likenesses of current employees to appear on commercial products.
+  For more information, consult the NASA and JPL points of contact listed above.
+
+* JPL/Caltech contractors and vendors who wish to use JPL images in advertising
+  or public relation materials should direct requests to the Institutional
+  Communications Office, email [email protected].
+
+* Some image and video materials on JPL public web sites are owned by organizations
+other than JPL or NASA. These owners have agreed to make their images and video
+available for journalistic, educational and personal uses, but restrictions are
+placed on commercial uses. To obtain permission for commercial use, contact the
+copyright owner listed in each image caption. Ownership of images and video by
+parties other than JPL and NASA is noted in the caption material with each image.

utils/spdx/src/main/resources/licenses/Kazlib

@@ -1,4 +1,9 @@
-Copyright (C) 1999 Kaz Kylheku
-
 Free Software License:
-All rights are reserved by the author, with the following exceptions: Permission is granted to freely reproduce and distribute this software, possibly in exchange for a fee, provided that this copyright notice appears intact. Permission is also granted to adapt this software to produce derivative works, as long as the modified versions carry this copyright notice and additional notices stating that the work has been modified. This source code may be translated into executable form and incorporated into proprietary software; there is no requirement for such software to contain a copyright notice related to this source.
+All rights are reserved by the author, with the following exceptions:
+Permission is granted to freely reproduce and distribute this software,
+possibly in exchange for a fee, provided that this copyright notice appears intact.
+Permission is also granted to adapt this software to produce derivative works,
+as long as the modified versions carry this copyright notice and additional notices
+stating that the work has been modified. This source code may be translated into
+executable form and incorporated into proprietary software; there is no requirement
+for such software to contain a copyright notice related to this source.

utils/spdx/src/main/resources/licenses/QPL-1.0-INRIA-2004

@@ -1,4 +1,4 @@
-                   THE Q PUBLIC LICENSE version 1.0
+THE Q PUBLIC LICENSE version 1.0
 
               Copyright (C) 1999 Troll Tech AS, Norway.
                   Everyone is permitted to copy and
@@ -99,4 +99,4 @@ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
                             Choice of Law
 
-This license is governed by the Laws of France.
+This license is governed by the .

utils/spdx/src/main/resources/licenses/Symlinks

@@ -1,4 +1,4 @@
- My "symlinks" utility pre-dates the "open source licensing"
+My "symlinks" utility pre-dates the "open source licensing"
 fad by a number of years. Just to clarify, this is 100%
 freeware, written entirely by myself. The intent is to use
 it to detect missing/obsolete symlink targets on an installed

utils/spdx/src/main/resources/licenses/TPDL

@@ -1,2 +1,2 @@
-Copyright (C) 1996-2010 David Muir Sharnoff. Copyright (C) 2011 Google, Inc.
-License hereby granted for anyone to use, modify or redistribute this module at their own risk. Please feed useful changes back to [email protected].
+License hereby granted for anyone to use, modify or redistribute this module
+at their own risk. Please feed useful changes back to [email protected].

utils/spdx/src/main/resources/licenses/TTWL

@@ -1,7 +1,3 @@
-Copyright (C) 1996-2002,2005,2006 David Muir Sharnoff.
-Copyright (C) 2005 Aristotle Pagaltzis
-Copyright (C) 2012-2013 Google, Inc.
-
 This module may be modified, used, copied, and redistributed at your own risk.
 Although allowed by the preceding license, please do not publicly
 redistribute modified versions of this code with the name "Text::Tabs"

utils/spdx/src/main/resources/licenses/UCAR

@@ -1,6 +1,3 @@
-Copyright 2014 University Corporation for Atmospheric Research and contributors.
-All rights reserved.
-
 This software was developed by the Unidata Program Center of the
 University Corporation for Atmospheric Research (UCAR)
 <http://www.unidata.ucar.edu>.

utils/spdx/src/main/resources/licenses/w3m

@@ -1,6 +1,3 @@
-(C) Copyright 1994-2002 by Akinori Ito
-(C) Copyright 2002-2011 by Akinori Ito, Hironori Sakamoto, Fumitoshi Ukai
-
 Use, modification and redistribution of this software is hereby granted,
 provided that this entire copyright notice is included on any copies of
 this software and applications and derivations thereof.