Skip to content

Commit d2eeac0

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Bump SPDX License List to v3.27 and fix test failures
Also address review comments. Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent 61180a4 commit d2eeac0

40 files changed

+295
-122
lines changed

‎CHANGELOG.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ v33.0.0 (next next, roadmap)
3838
- Update ABOUT files to adapt the ABOUT File Specification.
3939
See https://github.com/aboutcode-org/scancode-toolkit/issues/4181
4040

41+
- Add licenses from SPDX License List 3.27
42+
- Total Licenses: 21
43+
- Old Licenses: 13
44+
- From rules: 4
45+
- From licenses: 9
46+
- New licenses: 8
47+
https://github.com/aboutcode-org/scancode-toolkit/pull/4468
48+
49+
4150
v32.4.0 - 2025-06-26
4251
--------------------
4352

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ short_name: BSD 2-Clause pkgconf disclaimer variant
44
name: BSD 2-Clause pkgconf disclaimer variant
55
spdx_license_key: BSD-2-Clause-pkgconf-disclaimer
66
category: Permissive
7-
owner: Audacious developers
7+
owner: Audacious Project
88
other_urls:
99
- https://github.com/audacious-media-player/audacious/blob/master/src/audacious/main.cc
1010
- https://github.com/audacious-media-player/audacious/blob/master/COPYING

‎src/licensedcode/data/licenses/cryptoswift.LICENSE

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,12 @@ other_spdx_license_keys:
1111
other_urls:
1212
- https://github.com/krzyzanowskim/CryptoSwift/blob/main/LICENSE
1313
- https://github.com/krzyzanowskim/CryptoSwift/blob/main/CONTRIBUTING.md
14-
ignorable_copyrights:
15-
- Copyright (c) 2014-3099 Marcin Krzyzanowski <marcin.krzyzanowski@gmail.com>
16-
ignorable_holders:
17-
- Marcin Krzyzanowski
1814
ignorable_authors:
1915
- the Marcin Krzyzanowski (http://krzyzanowskim.com/)
2016
ignorable_urls:
2117
- http://krzyzanowskim.com/
22-
ignorable_emails:
23-
- marcin.krzyzanowski@gmail.com
2418
---
2519

26-
Copyright (C) 2014-3099 Marcin Krzyżanowski
2720
This software is provided 'as-is', without any express or implied warranty.
2821

2922
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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22
key: docbook-dtd
33
short_name: DocBook DTD License
44
name: DocBook DTD License
5-
spdx_license_key: DocBook-DTD
65
category: Permissive
76
owner: OASIS
7+
spdx_license_key: DocBook-DTD
88
other_urls:
99
- http://www.docbook.org/xml/simple/1.1/docbook-simple-1.1.zip
10+
ignorable_urls:
11+
- http://www.oasis-open.org/docbook
12+
ignorable_emails:
13+
- docbook@lists.oasis-open.org
1014
---
1115

1216
Permission to use, copy, modify and distribute the DocBook XML DTD

‎src/licensedcode/data/licenses/hdf5.LICENSE

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@ standard_notice: "This file is part of HDF5. The full HDF5 copyright notice, in
1414
terms governing use, modification, and redistribution, is contained in \nthe COPYING file,\
1515
\ which can be found at the root of the source code \ndistribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.\n\
1616
If you do not have access to either file, you may request a copy from \nhelp@hdfgroup.org. "
17+
ignorable_copyrights:
18+
- Copyright 1998-2006 by The Board of Trustees of the University of Illinois
19+
- Copyright 2006 by The HDF Group
20+
ignorable_holders:
21+
- The Board of Trustees of the University of Illinois
22+
- The HDF Group
23+
ignorable_authors:
24+
- with support from Lawrence Livermore National Laboratory and the United States Department
25+
of Energy
26+
- with support from the Lawrence Berkeley National Laboratory
27+
- with support from the University of California, Lawrence Livermore National Laboratory
1728
---
1829

1930
Copyright Notice and License Terms for

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ notes: |
1010
spdx_license_key: libpng-1.6.35
1111
other_urls:
1212
- http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
13+
ignorable_copyrights:
14+
- Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
15+
- Copyright (c) 1996-1997 Andreas Dilger
16+
- Copyright (c) 1998-2000 Glenn Randers-Pehrson
17+
- Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson
18+
ignorable_holders:
19+
- Andreas Dilger
20+
- Glenn Randers-Pehrson
21+
- Guy Eric Schalnat, Group 42, Inc.
1322
---
1423

1524
PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)

‎src/licensedcode/data/licenses/ngrep.LICENSE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
key: ngrep
33
short_name: ngrep License
44
name: ngrep License
5-
owner: Jordan Ritter
65
category: Permissive
6+
owner: Jordan Ritter
77
spdx_license_key: ngrep
88
other_urls:
99
- https://github.com/jpr5/ngrep/blob/master/LICENSE
10+
ignorable_authors:
11+
- Jordan Ritter
1012
---
1113

1214
Permission is granted to anyone to use this software for any purpose on

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
key: ntia-pd
33
short_name: NTIA Public Domain Notice
44
name: NTIA Public Domain Notice
5-
owner: National Telecommunications and Information Administration (NTIA)
5+
owner: NTIA
66
category: Public Domain
77
spdx_license_key: NTIA-PD
88
other_urls:

‎src/licensedcode/data/licenses/sofa.LICENSE

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22
key: sofa
33
short_name: SOFA Software License
44
name: SOFA Software License
5-
owner: (SOFA) Standards of Fundamental Astronomy Board of the International Astronomical Union
65
category: Proprietary Free
6+
owner: SOFA
77
notes: |
8-
Added in SPDX License List 3.27
9-
This was previously the proprietary-license_972.RULE
8+
Added in SPDX License List 3.27
9+
This was previously the proprietary-license_972.RULE
1010
spdx_license_key: SOFA
1111
other_urls:
1212
- http://www.iausofa.org/tandc.html
13+
ignorable_urls:
14+
- http://www.iausofa.org/
15+
ignorable_emails:
16+
- sofa@ukho.gov.uk
1317
---
1418

1519
=====================

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

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
---
2+
license_expression: libpng-1.6.35
3+
is_license_text: yes
4+
ignorable_copyrights:
5+
- Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
6+
- Copyright (c) 1996-1997 Andreas Dilger
7+
- Copyright (c) 1998-2000 Glenn Randers-Pehrson
8+
- Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson
9+
ignorable_holders:
10+
- Andreas Dilger
11+
- Glenn Randers-Pehrson
12+
- Guy Eric Schalnat, Group 42, Inc.
13+
---
14+
15+
libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
16+
Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
17+
derived from libpng-1.0.6, and are distributed according to the same
18+
disclaimer and license as libpng-1.0.6 with the following individuals
19+
added to the list of Contributing Authors:
20+
21+
Simon-Pierre Cadieux
22+
Eric S. Raymond
23+
Mans Rullgard
24+
Cosmin Truta
25+
Gilles Vollant
26+
James Yu
27+
Mandar Sahastrabuddhe
28+
Google Inc.
29+
Vadim Barkov
30+
31+
and with the following additions to the disclaimer:
32+
33+
There is no warranty against interference with your enjoyment of
34+
the library or against infringement. There is no warranty that our
35+
efforts or the library will fulfill any of your particular purposes
36+
or needs. This library is provided with all faults, and the entire
37+
risk of satisfactory quality, performance, accuracy, and effort is
38+
with the user.
39+
40+
Some files in the "contrib" directory and some configure-generated
41+
files that are distributed with libpng have other copyright owners, and
42+
are released under other open source licenses.
43+
44+
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
45+
Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
46+
libpng-0.96, and are distributed according to the same disclaimer and
47+
license as libpng-0.96, with the following individuals added to the
48+
list of Contributing Authors:
49+
50+
Tom Lane
51+
Glenn Randers-Pehrson
52+
Willem van Schaik
53+
54+
libpng versions 0.89, June 1996, through 0.96, May 1997, are
55+
Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
56+
and are distributed according to the same disclaimer and license as
57+
libpng-0.88, with the following individuals added to the list of
58+
Contributing Authors:
59+
60+
John Bowler
61+
Kevin Bracey
62+
Sam Bushell
63+
Magnus Holmgren
64+
Greg Roelofs
65+
Tom Tanner
66+
67+
Some files in the "scripts" directory have other copyright owners,
68+
but are released under this license.
69+
70+
libpng versions 0.5, May 1995, through 0.88, January 1996, are
71+
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
72+
73+
For the purposes of this copyright and license, "Contributing Authors"
74+
is defined as the following set of individuals:
75+
76+
Andreas Dilger
77+
Dave Martindale
78+
Guy Eric Schalnat
79+
Paul Schmidt
80+
Tim Wegner
81+
82+
The PNG Reference Library is supplied "AS IS". The Contributing
83+
Authors and Group 42, Inc. disclaim all warranties, expressed or
84+
implied, including, without limitation, the warranties of
85+
merchantability and of fitness for any purpose. The Contributing
86+
Authors and Group 42, Inc. assume no liability for direct, indirect,
87+
incidental, special, exemplary, or consequential damages, which may
88+
result from the use of the PNG Reference Library, even if advised of
89+
the possibility of such damage.
90+
91+
Permission is hereby granted to use, copy, modify, and distribute this
92+
source code, or portions hereof, for any purpose, without fee, subject
93+
to the following restrictions:
94+
95+
1. The origin of this source code must not be misrepresented.
96+
97+
2. Altered versions must be plainly marked as such and must not
98+
be misrepresented as being the original source.
99+
100+
3. This Copyright notice may not be removed or altered from any
101+
source or altered source distribution.
102+
103+
The Contributing Authors and Group 42, Inc. specifically permit,
104+
without fee, and encourage the use of this source code as a component
105+
to supporting the PNG file format in commercial products. If you use
106+
this source code in a product, acknowledgment is not required but would
107+
be appreciated.

0 commit comments

Comments
 (0)