Skip to content

Commit

Permalink
deps(spdx-utils): Update the SPDX license list version to 3.24.0
Browse files Browse the repository at this point in the history
Done by running [1].

Note: The trailing ".0" in the version string is intended, because the
Git tag format has been changed.

[1] `./gradlew --no-configuration-cache generateSpdxEnums`

Signed-off-by: Frank Viernau <[email protected]>
  • Loading branch information
fviernau committed May 28, 2024
1 parent 042ded5 commit 1113161
Show file tree
Hide file tree
Showing 32 changed files with 810 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ javaLanguageVersion = 11

# The version of the SPDX license list which is used to import license texts and generate SPDX enums. Must be a valid
# tag, see https://github.com/spdx/license-list-data/tags.
spdxLicenseListVersion = 3.23
spdxLicenseListVersion = 3.24.0
26 changes: 24 additions & 2 deletions utils/spdx/src/main/kotlin/SpdxLicense.kt
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,13 @@ enum class SpdxLicense(
AGPL_3_0_OR_LATER("AGPL-3.0-or-later", "GNU Affero General Public License v3.0 or later"),
ALADDIN("Aladdin", "Aladdin Free Public License"),
AMDPLPA("AMDPLPA", "AMD's plpa_map.c License"),
AMD_NEWLIB("AMD-newlib", "AMD newlib License"),
AML("AML", "Apple MIT License"),
AML_GLSLANG("AML-glslang", "AML glslang variant License"),
AMPAS("AMPAS", "Academy of Motion Picture Arts and Sciences BSD"),
ANTLR_PD("ANTLR-PD", "ANTLR Software Rights Notice"),
ANTLR_PD_FALLBACK("ANTLR-PD-fallback", "ANTLR Software Rights Notice with license fallback"),
ANY_OSI("any-OSI", "Any OSI License"),
APACHE_1_0("Apache-1.0", "Apache License 1.0"),
APACHE_1_1("Apache-1.1", "Apache License 1.1"),
APACHE_2_0("Apache-2.0", "Apache License 2.0"),
Expand Down Expand Up @@ -106,6 +108,7 @@ enum class SpdxLicense(
BSD_1_CLAUSE("BSD-1-Clause", "BSD 1-Clause License"),
BSD_2_CLAUSE("BSD-2-Clause", "BSD 2-Clause \"Simplified\" License"),
BSD_2_CLAUSE_DARWIN("BSD-2-Clause-Darwin", "BSD 2-Clause - Ian Darwin variant"),
BSD_2_CLAUSE_FIRST_LINES("BSD-2-Clause-first-lines", "BSD 2-Clause - first lines requirement"),
BSD_2_CLAUSE_FREEBSD("BSD-2-Clause-FreeBSD", "BSD 2-Clause FreeBSD License", true),
BSD_2_CLAUSE_NETBSD("BSD-2-Clause-NetBSD", "BSD 2-Clause NetBSD License", true),
BSD_2_CLAUSE_PATENT("BSD-2-Clause-Patent", "BSD-2-Clause Plus Patent License"),
Expand Down Expand Up @@ -145,6 +148,7 @@ enum class SpdxLicense(
CALDERA_NO_PREAMBLE("Caldera-no-preamble", "Caldera License (without preamble)"),
CAL_1_0("CAL-1.0", "Cryptographic Autonomy License 1.0"),
CAL_1_0_COMBINED_WORK_EXCEPTION("CAL-1.0-Combined-Work-Exception", "Cryptographic Autonomy License 1.0 (Combined Work Exception)"),
CATHARON("Catharon", "Catharon License"),
CATOSL_1_1("CATOSL-1.1", "Computer Associates Trusted Open Source License 1.1"),
CC0_1_0("CC0-1.0", "Creative Commons Zero v1.0 Universal"),
CC_BY_1_0("CC-BY-1.0", "Creative Commons Attribution 1.0 Generic"),
Expand Down Expand Up @@ -241,6 +245,7 @@ enum class SpdxLicense(
CUA_OPL_1_0("CUA-OPL-1.0", "CUA Office Public License v1.0"),
CUBE("Cube", "Cube License"),
CURL("curl", "curl License"),
CVE_TOU("cve-tou", "Common Vulnerability Enumeration ToU License"),
C_UDA_1_0("C-UDA-1.0", "Computational Use of Data Agreement v1.0"),
DEC_3_CLAUSE("DEC-3-Clause", "DEC 3-Clause License"),
DIFFMARK("diffmark", "diffmark license"),
Expand Down Expand Up @@ -338,26 +343,33 @@ enum class SpdxLicense(
GRAPHICS_GEMS("Graphics-Gems", "Graphics Gems License"),
GSOAP_1_3B("gSOAP-1.3b", "gSOAP Public License v1.3b"),
GTKBOOK("gtkbook", "gtkbook License"),
GUTMANN("Gutmann", "Gutmann License"),
HASKELLREPORT("HaskellReport", "Haskell Language Report License"),
HDPARM("hdparm", "hdparm License"),
HIPPOCRATIC_2_1("Hippocratic-2.1", "Hippocratic License 2.1"),
HPND("HPND", "Historical Permission Notice and Disclaimer"),
HPND_DEC("HPND-DEC", "Historical Permission Notice and Disclaimer - DEC variant"),
HPND_DOC("HPND-doc", "Historical Permission Notice and Disclaimer - documentation variant"),
HPND_DOC_SELL("HPND-doc-sell", "Historical Permission Notice and Disclaimer - documentation sell variant"),
HPND_EXPORT2_US("HPND-export2-US", "HPND with US Government export control and 2 disclaimers"),
HPND_EXPORT_US("HPND-export-US", "HPND with US Government export control warning"),
HPND_EXPORT_US_ACKNOWLEDGEMENT("HPND-export-US-acknowledgement", "HPND with US Government export control warning and acknowledgment"),
HPND_EXPORT_US_MODIFY("HPND-export-US-modify", "HPND with US Government export control warning and modification rqmt"),
HPND_FENNEBERG_LIVINGSTON("HPND-Fenneberg-Livingston", "Historical Permission Notice and Disclaimer - Fenneberg-Livingston variant"),
HPND_INRIA_IMAG("HPND-INRIA-IMAG", "Historical Permission Notice and Disclaimer - INRIA-IMAG variant"),
HPND_INTEL("HPND-Intel", "Historical Permission Notice and Disclaimer - Intel variant"),
HPND_KEVLIN_HENNEY("HPND-Kevlin-Henney", "Historical Permission Notice and Disclaimer - Kevlin Henney variant"),
HPND_MARKUS_KUHN("HPND-Markus-Kuhn", "Historical Permission Notice and Disclaimer - Markus Kuhn variant"),
HPND_MERCHANTABILITY_VARIANT("HPND-merchantability-variant", "Historical Permission Notice and Disclaimer - merchantability variant"),
HPND_MIT_DISCLAIMER("HPND-MIT-disclaimer", "Historical Permission Notice and Disclaimer with MIT disclaimer"),
HPND_PBMPLUS("HPND-Pbmplus", "Historical Permission Notice and Disclaimer - Pbmplus variant"),
HPND_SELL_MIT_DISCLAIMER_XSERVER("HPND-sell-MIT-disclaimer-xserver", "Historical Permission Notice and Disclaimer - sell xserver variant with MIT disclaimer"),
HPND_SELL_REGEXPR("HPND-sell-regexpr", "Historical Permission Notice and Disclaimer - sell regexpr variant"),
HPND_SELL_VARIANT("HPND-sell-variant", "Historical Permission Notice and Disclaimer - sell variant"),
HPND_SELL_VARIANT_MIT_DISCLAIMER("HPND-sell-variant-MIT-disclaimer", "HPND sell variant with MIT disclaimer"),
HPND_SELL_VARIANT_MIT_DISCLAIMER_REV("HPND-sell-variant-MIT-disclaimer-rev", "HPND sell variant with MIT disclaimer - reverse"),
HPND_UC("HPND-UC", "Historical Permission Notice and Disclaimer - University of California variant"),
HPND_UC_EXPORT_US("HPND-UC-export-US", "Historical Permission Notice and Disclaimer - University of California, US export warning"),
HP_1986("HP-1986", "Hewlett-Packard 1986 License"),
HP_1989("HP-1989", "Hewlett-Packard 1989 License"),
HTMLTIDY("HTMLTIDY", "HTML Tidy License"),
Expand Down Expand Up @@ -448,6 +460,7 @@ enum class SpdxLicense(
MIT_ENNA("MIT-enna", "enna License"),
MIT_FEH("MIT-feh", "feh License"),
MIT_FESTIVAL("MIT-Festival", "MIT Festival Variant"),
MIT_KHRONOS_OLD("MIT-Khronos-old", "MIT Khronos - old variant"),
MIT_MODERN_VARIANT("MIT-Modern-Variant", "MIT License Modern Variant"),
MIT_OPEN_GROUP("MIT-open-group", "MIT Open Group variant"),
MIT_TESTREGEX("MIT-testregex", "MIT testregex Variant"),
Expand All @@ -474,7 +487,9 @@ enum class SpdxLicense(
NASA_1_3("NASA-1.3", "NASA Open Source Agreement 1.3"),
NAUMEN("Naumen", "Naumen Public License"),
NBPL_1_0("NBPL-1.0", "Net Boolean Public License v1"),
NCBI_PD("NCBI-PD", "NCBI Public Domain Notice"),
NCGL_UK_2_0("NCGL-UK-2.0", "Non-Commercial Government Licence"),
NCL("NCL", "NCL Source Code License"),
NCSA("NCSA", "University of Illinois/NCSA Open Source License"),
NETCDF("NetCDF", "NetCDF license"),
NET_SNMP("Net-SNMP", "Net-SNMP License"),
Expand All @@ -497,6 +512,7 @@ enum class SpdxLicense(
NTP("NTP", "NTP License"),
NTP_0("NTP-0", "NTP No Attribution"),
NUNIT("Nunit", "Nunit License", true),
OAR("OAR", "OAR License"),
OCCT_PL("OCCT-PL", "Open CASCADE Technology Public License"),
OCLC_2_0("OCLC-2.0", "OCLC Research Public License 2.0"),
ODBL_1_0("ODbL-1.0", "Open Data Commons Open Database License v1.0"),
Expand Down Expand Up @@ -554,11 +570,13 @@ enum class SpdxLicense(
PHP_3_0("PHP-3.0", "PHP License v3.0"),
PHP_3_01("PHP-3.01", "PHP License v3.01"),
PIXAR("Pixar", "Pixar License"),
PKGCONF("pkgconf", "pkgconf License"),
PLEXUS("Plexus", "Plexus Classworlds License"),
PNMSTITCH("pnmstitch", "pnmstitch License"),
POLYFORM_NONCOMMERCIAL_1_0_0("PolyForm-Noncommercial-1.0.0", "PolyForm Noncommercial License 1.0.0"),
POLYFORM_SMALL_BUSINESS_1_0_0("PolyForm-Small-Business-1.0.0", "PolyForm Small Business License 1.0.0"),
POSTGRESQL("PostgreSQL", "PostgreSQL License"),
PPL("PPL", "Peer Production License"),
PSFRAG("psfrag", "psfrag License"),
PSF_2_0("PSF-2.0", "Python Software Foundation License 2.0"),
PSUTILS("psutils", "psutils License"),
Expand Down Expand Up @@ -615,6 +633,7 @@ enum class SpdxLicense(
SUGARCRM_1_1_3("SugarCRM-1.1.3", "SugarCRM Public License v1.1.3"),
SUNPRO("SunPro", "SunPro License"),
SUN_PPP("Sun-PPP", "Sun PPP License"),
SUN_PPP_2000("Sun-PPP-2000", "Sun PPP License (2000)"),
SWL("SWL", "Scheme Widget Library (SWL) Software License Agreement"),
SWRULE("swrule", "swrule License"),
SYMLINKS("Symlinks", "Symlinks License"),
Expand All @@ -623,6 +642,7 @@ enum class SpdxLicense(
TCP_WRAPPERS("TCP-wrappers", "TCP Wrappers License"),
TERMREADKEY("TermReadKey", "TermReadKey License"),
TGPPL_1_0("TGPPL-1.0", "Transitive Grace Period Public Licence 1.0"),
THREEPARTTABLE("threeparttable", "threeparttable License"),
TMATE("TMate", "TMate Open Source License"),
TORQUE_1_1("TORQUE-1.1", "TORQUE v2.5+ Software License v1.1"),
TOSL("TOSL", "Trusster Open Source License"),
Expand Down Expand Up @@ -668,6 +688,7 @@ enum class SpdxLicense(
XNET("Xnet", "X.Net License"),
XPP("xpp", "XPP License"),
XSKAT("XSkat", "XSkat License"),
XZOOM("xzoom", "xzoom License"),
YPL_1_0("YPL-1.0", "Yahoo! Public License v1.0"),
YPL_1_1("YPL-1.1", "Yahoo! Public License v1.1"),
ZED("Zed", "Zed License"),
Expand All @@ -680,13 +701,14 @@ enum class SpdxLicense(
ZPL_1_1("ZPL-1.1", "Zope Public License 1.1"),
ZPL_2_0("ZPL-2.0", "Zope Public License 2.0"),
ZPL_2_1("ZPL-2.1", "Zope Public License 2.1"),
_0BSD("0BSD", "BSD Zero Clause License");
_0BSD("0BSD", "BSD Zero Clause License"),
_3D_SLICER_1_0("3D-Slicer-1.0", "3D Slicer License v1.0");

companion object {
/**
* The version of the license list.
*/
const val LICENSE_LIST_VERSION = "3.23"
const val LICENSE_LIST_VERSION = "3.24.0"

/**
* Return the enum value for the given [id], or null if it is no SPDX license id.
Expand Down
3 changes: 3 additions & 0 deletions utils/spdx/src/main/kotlin/SpdxLicenseException.kt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ enum class SpdxLicenseException(
val deprecated: Boolean = false
) {
ASTERISK_EXCEPTION("Asterisk-exception", "Asterisk exception"),
ASTERISK_LINKING_PROTOCOLS_EXCEPTION("Asterisk-linking-protocols-exception", "Asterisk linking protocols exception"),
AUTOCONF_EXCEPTION_2_0("Autoconf-exception-2.0", "Autoconf exception 2.0"),
AUTOCONF_EXCEPTION_3_0("Autoconf-exception-3.0", "Autoconf exception 3.0"),
AUTOCONF_EXCEPTION_GENERIC("Autoconf-exception-generic", "Autoconf generic exception"),
Expand Down Expand Up @@ -93,11 +94,13 @@ enum class SpdxLicenseException(
OCCT_EXCEPTION_1_0("OCCT-exception-1.0", "Open CASCADE Exception 1.0"),
OPENJDK_ASSEMBLY_EXCEPTION_1_0("OpenJDK-assembly-exception-1.0", "OpenJDK Assembly exception 1.0"),
OPENVPN_OPENSSL_EXCEPTION("openvpn-openssl-exception", "OpenVPN OpenSSL Exception"),
PCRE2_EXCEPTION("PCRE2-exception", "PCRE2 exception"),
PS_OR_PDF_FONT_EXCEPTION_20170817("PS-or-PDF-font-exception-20170817", "PS/PDF font exception (2017-08-17)"),
QPL_1_0_INRIA_2004_EXCEPTION("QPL-1.0-INRIA-2004-exception", "INRIA QPL 1.0 2004 variant exception"),
QT_GPL_EXCEPTION_1_0("Qt-GPL-exception-1.0", "Qt GPL exception 1.0"),
QT_LGPL_EXCEPTION_1_1("Qt-LGPL-exception-1.1", "Qt LGPL exception 1.1"),
QWT_EXCEPTION_1_0("Qwt-exception-1.0", "Qwt exception 1.0"),
RRDTOOL_FLOSS_EXCEPTION_2_0("RRDtool-FLOSS-exception-2.0", "RRDtool FLOSS exception 2.0"),
SANE_EXCEPTION("SANE-exception", "SANE Exception"),
SHL_2_0("SHL-2.0", "Solderpad Hardware License v2.0"),
SHL_2_1("SHL-2.1", "Solderpad Hardware License v2.1"),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Specific permission is also granted to link Asterisk with OpenSSL, OpenH323
UniMRCP, and/or the UW IMAP Toolkit and distribute the resulting binary files.

In addition, Asterisk implements several management/control protocols.
This includes the Asterisk Manager Interface (AMI), the Asterisk Gateway
Interface (AGI), and the Asterisk REST Interface (ARI). It is our belief
that applications using these protocols to manage or control an Asterisk
instance do not have to be licensed under the GPL or a compatible license,
as we believe these protocols do not create a 'derivative work' as referred
to in the GPL. However, should any court or other judiciary body find that
these protocols do fall under the terms of the GPL, then we hereby grant you a
license to use these protocols in combination with Asterisk in external
applications licensed under any license you wish.
8 changes: 8 additions & 0 deletions utils/spdx/src/main/resources/exceptions/PCRE2-exception
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
EXEMPTION FOR BINARY LIBRARY-LIKE PACKAGES
------------------------------------------

The second condition in the BSD licence (covering binary redistributions) does
not apply all the way down a chain of software. If binary package A includes
PCRE2, it must respect the condition, but if package B is software that
includes package A, the condition is not imposed on package B unless it uses
PCRE2 independently.
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
FLOSS License Exception
=======================
(Adapted from http://www.mysql.com/company/legal/licensing/foss-exception.html)

I want specified Free/Libre and Open Source Software ("FLOSS")
applications to be able to use specified GPL-licensed RRDtool
libraries (the "Program") despite the fact that not all FLOSS licenses are
compatible with version 2 of the GNU General Public License (the "GPL").

As a special exception to the terms and conditions of version 2.0 of the GPL:

You are free to distribute a Derivative Work that is formed entirely from
the Program and one or more works (each, a "FLOSS Work") licensed under one
or more of the licenses listed below, as long as:

1. You obey the GPL in all respects for the Program and the Derivative
Work, except for identifiable sections of the Derivative Work which are
not derived from the Program, and which can reasonably be considered
independent and separate works in themselves,

2. all identifiable sections of the Derivative Work which are not derived
from the Program, and which can reasonably be considered independent and
separate works in themselves,

1. are distributed subject to one of the FLOSS licenses listed
below, and

2. the object code or executable form of those sections are
accompanied by the complete corresponding machine-readable source
code for those sections on the same medium and under the same FLOSS
license as the corresponding object code or executable forms of
those sections, and

3. any works which are aggregated with the Program or with a Derivative
Work on a volume of a storage or distribution medium in accordance with
the GPL, can reasonably be considered independent and separate works in
themselves which are not derivatives of either the Program, a Derivative
Work or a FLOSS Work.

If the above conditions are not met, then the Program may only be copied,
modified, distributed or used under the terms and conditions of the GPL.

FLOSS License List
==================
License name Version(s)/Copyright Date
Academic Free License 2.0
Apache Software License 1.0/1.1/2.0
Apple Public Source License 2.0
Artistic license From Perl 5.8.0
BSD license "July 22 1999"
Common Public License 1.0
GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1
IBM Public License, Version 1.0
Jabber Open Source License 1.0
MIT License (As listed in file MIT-License.txt) -
Mozilla Public License (MPL) 1.0/1.1
Open Software License 2.0
OpenSSL license (with original SSLeay license) "2003" ("1998")
PHP License 3.01
Python license (CNRI Python License) -
Python Software Foundation License 2.1.1
Sleepycat License "1999"
W3C License "2001"
X11 License "2001"
Zlib/libpng License -
Zope Public License 2.0/2.1
Loading

0 comments on commit 1113161

Please sign in to comment.