Bump SPDX License List to v3.27 and fix test failures

Also address review comments.

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

Author: AyanSinhaMahapatra

CHANGELOG.rst

@@ -38,6 +38,15 @@ v33.0.0 (next next, roadmap)
 - Update ABOUT files to adapt the ABOUT File Specification.
   See https://github.com/aboutcode-org/scancode-toolkit/issues/4181
 
+- Add licenses from SPDX License List 3.27
+  - Total Licenses: 21
+    - Old Licenses: 13
+      - From rules: 4
+      - From licenses: 9
+    - New licenses: 8
+  https://github.com/aboutcode-org/scancode-toolkit/pull/4468
+
+
 v32.4.0 - 2025-06-26
 --------------------
 

src/licensedcode/data/licenses/bsd-2-clause-pkgconf-disclaimer.LICENSE

@@ -4,7 +4,7 @@ short_name: BSD 2-Clause pkgconf disclaimer variant
 name: BSD 2-Clause pkgconf disclaimer variant
 spdx_license_key: BSD-2-Clause-pkgconf-disclaimer
 category: Permissive
-owner: Audacious developers
+owner: Audacious Project
 other_urls:
     - https://github.com/audacious-media-player/audacious/blob/master/src/audacious/main.cc
     - https://github.com/audacious-media-player/audacious/blob/master/COPYING

src/licensedcode/data/licenses/cryptoswift.LICENSE

@@ -11,19 +11,12 @@ other_spdx_license_keys:
 other_urls:
     - https://github.com/krzyzanowskim/CryptoSwift/blob/main/LICENSE
     - https://github.com/krzyzanowskim/CryptoSwift/blob/main/CONTRIBUTING.md
-ignorable_copyrights:
-    - Copyright (c) 2014-3099 Marcin Krzyzanowski <[email protected]>
-ignorable_holders:
-    - Marcin Krzyzanowski
 ignorable_authors:
     - the Marcin Krzyzanowski (http://krzyzanowskim.com/)
 ignorable_urls:
     - http://krzyzanowskim.com/
-ignorable_emails:
-    - [email protected]
 ---
 
-Copyright (C) 2014-3099 Marcin Krzyżanowski
 This software is provided 'as-is', without any express or implied warranty.
 
 In no event will the authors be held liable for any damages arising from the use of this software.

src/licensedcode/data/licenses/docbook-dtd.LICENSE

@@ -2,11 +2,15 @@
 key: docbook-dtd
 short_name: DocBook DTD License
 name: DocBook DTD License
-spdx_license_key: DocBook-DTD
 category: Permissive
 owner: OASIS
+spdx_license_key: DocBook-DTD
 other_urls:
     - http://www.docbook.org/xml/simple/1.1/docbook-simple-1.1.zip
+ignorable_urls:
+    - http://www.oasis-open.org/docbook
+ignorable_emails:
+    - [email protected]
 ---
 
 Permission to use, copy, modify and distribute the DocBook XML DTD

src/licensedcode/data/licenses/hdf5.LICENSE

@@ -14,6 +14,17 @@ standard_notice: "This file is part of HDF5.  The full HDF5 copyright notice, in
     terms governing use, modification, and redistribution, is contained in  \nthe COPYING file,\
     \ which can be found at the root of the source code     \ndistribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.\n\
     If you do not have access to either file, you may request a copy from   \[email protected]. "
+ignorable_copyrights:
+    - Copyright 1998-2006 by The Board of Trustees of the University of Illinois
+    - Copyright 2006 by The HDF Group
+ignorable_holders:
+    - The Board of Trustees of the University of Illinois
+    - The HDF Group
+ignorable_authors:
+    - with support from Lawrence Livermore National Laboratory and the United States Department
+        of Energy
+    - with support from the Lawrence Berkeley National Laboratory
+    - with support from the University of California, Lawrence Livermore National Laboratory
 ---
 
 Copyright Notice and License Terms for

src/licensedcode/data/licenses/libpng-1.6.35.LICENSE

@@ -10,6 +10,15 @@ notes: |
 spdx_license_key: libpng-1.6.35
 other_urls:
     - http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
+ignorable_copyrights:
+    - Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+    - Copyright (c) 1996-1997 Andreas Dilger
+    - Copyright (c) 1998-2000 Glenn Randers-Pehrson
+    - Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson
+ignorable_holders:
+    - Andreas Dilger
+    - Glenn Randers-Pehrson
+    - Guy Eric Schalnat, Group 42, Inc.
 ---
 
 PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)

src/licensedcode/data/licenses/ngrep.LICENSE

@@ -2,11 +2,13 @@
 key: ngrep
 short_name: ngrep License
 name: ngrep License
-owner: Jordan Ritter
 category: Permissive
+owner: Jordan Ritter
 spdx_license_key: ngrep
 other_urls:
     - https://github.com/jpr5/ngrep/blob/master/LICENSE
+ignorable_authors:
+    - Jordan Ritter
 ---
 
 Permission is granted to anyone to use this software for any purpose on

src/licensedcode/data/licenses/ntia-pd.LICENSE

@@ -2,7 +2,7 @@
 key: ntia-pd
 short_name: NTIA Public Domain Notice
 name: NTIA Public Domain Notice
-owner: National Telecommunications and Information Administration (NTIA)
+owner: NTIA
 category: Public Domain
 spdx_license_key: NTIA-PD
 other_urls:

src/licensedcode/data/licenses/sofa.LICENSE

@@ -2,14 +2,18 @@
 key: sofa
 short_name: SOFA Software License
 name: SOFA Software License
-owner: (SOFA) Standards of Fundamental Astronomy Board of the International Astronomical Union
 category: Proprietary Free
+owner: SOFA
 notes: |
-   Added in SPDX License List 3.27
-   This was previously the proprietary-license_972.RULE
+    Added in SPDX License List 3.27
+    This was previously the proprietary-license_972.RULE
 spdx_license_key: SOFA
 other_urls:
     - http://www.iausofa.org/tandc.html
+ignorable_urls:
+    - http://www.iausofa.org/
+ignorable_emails:
+    - [email protected]
 ---
 
 =====================

src/licensedcode/data/rules/libpng-1.6.35_1.RULE

@@ -0,0 +1,107 @@
+---
+license_expression: libpng-1.6.35
+is_license_text: yes
+ignorable_copyrights:
+    - Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+    - Copyright (c) 1996-1997 Andreas Dilger
+    - Copyright (c) 1998-2000 Glenn Randers-Pehrson
+    - Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson
+ignorable_holders:
+    - Andreas Dilger
+    - Glenn Randers-Pehrson
+    - Guy Eric Schalnat, Group 42, Inc.
+---
+
+libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
+
+    Simon-Pierre Cadieux
+    Eric S. Raymond
+    Mans Rullgard
+    Cosmin Truta
+    Gilles Vollant
+    James Yu
+    Mandar Sahastrabuddhe
+    Google Inc.
+    Vadim Barkov
+
+and with the following additions to the disclaimer:
+
+    There is no warranty against interference with your enjoyment of
+    the library or against infringement.  There is no warranty that our
+    efforts or the library will fulfill any of your particular purposes
+    or needs.  This library is provided with all faults, and the entire
+    risk of satisfactory quality, performance, accuracy, and effort is
+    with the user.
+
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners, and
+are released under other open source licenses.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the
+list of Contributing Authors:
+
+    Tom Lane
+    Glenn Randers-Pehrson
+    Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
+
+    John Bowler
+    Kevin Bracey
+    Sam Bushell
+    Magnus Holmgren
+    Greg Roelofs
+    Tom Tanner
+
+Some files in the "scripts" directory have other copyright owners,
+but are released under this license.
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+    Andreas Dilger
+    Dave Martindale
+    Guy Eric Schalnat
+    Paul Schmidt
+    Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing
+Authors and Group 42, Inc. disclaim all warranties, expressed or
+implied, including, without limitation, the warranties of
+merchantability and of fitness for any purpose.  The Contributing
+Authors and Group 42, Inc. assume no liability for direct, indirect,
+incidental, special, exemplary, or consequential damages, which may
+result from the use of the PNG Reference Library, even if advised of
+the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+ 1. The origin of this source code must not be misrepresented.
+
+ 2. Altered versions must be plainly marked as such and must not
+    be misrepresented as being the original source.
+
+ 3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit,
+without fee, and encourage the use of this source code as a component
+to supporting the PNG file format in commercial products.  If you use
+this source code in a product, acknowledgment is not required but would
+be appreciated.