Update to 3.26.0 (#74)

* Update SPDX version in README * Update to version 3.26.0 * Update CHANGELOG * Fix CHANGELOG * Oops
EmbarkStudios · Dec 31, 2024 · f246748 · f246748
1 parent 80ec0a8
commit f246748
Show file tree

Hide file tree

Showing 40 changed files with 1,183 additions and 326 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+### Changed
+- [PR#74](https://github.com/EmbarkStudios/spdx/pull/74) update SPDX license list to 3.26.0.
+
 ## [0.10.7] - 2024-11-15
 ### Changed
 - [PR#72](https://github.com/EmbarkStudios/spdx/pull/72) update SPDX license list to 3.25.0.

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 [![Crates.io](https://img.shields.io/crates/v/spdx.svg)](https://crates.io/crates/spdx)
 [![Docs](https://docs.rs/spdx/badge.svg)](https://docs.rs/spdx)
 [![Minimum Stable Rust Version](https://img.shields.io/badge/Rust-1.65.0-blue?color=fc8d62&logo=rust)](https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html)
-[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.24.0-blue.svg)](https://spdx.org/licenses/)
+[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.26.0-blue.svg)](https://spdx.org/licenses/)
 [![dependency status](https://deps.rs/repo/github/EmbarkStudios/spdx/status.svg)](https://deps.rs/repo/github/EmbarkStudios/spdx)
 [![Build Status](https://github.com/EmbarkStudios/spdx/workflows/CI/badge.svg)](https://github.com/EmbarkStudios/spdx/actions?workflow=CI)
 

diff --git a/src/identifiers.rs b/src/identifiers.rs
@@ -1,5 +1,5 @@
 /*
- * list fetched from https://github.com/spdx/license-list-data @ v3.25.0
+ * list fetched from https://github.com/spdx/license-list-data @ v3.26.0
  *
  * AUTO-GENERATED BY ./update
  * DO NOT MODIFY
@@ -13,7 +13,7 @@ pub const IS_DEPRECATED: u8 = 0x4;
 pub const IS_COPYLEFT: u8 = 0x8;
 pub const IS_GNU: u8 = 0x10;
 
-pub const VERSION: &str = "3.25.0";
+pub const VERSION: &str = "3.26.0";
 
 pub const LICENSES: &[(&str, &str, u8)] = &[
     ("0BSD", r#"BSD Zero Clause License"#, IS_OSI_APPROVED),
@@ -326,6 +326,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         IS_OSI_APPROVED,
     ),
     ("Boehm-GC", r#"Boehm-Demers-Weiser GC License"#, 0x0),
+    (
+        "Boehm-GC-without-fee",
+        r#"Boehm-Demers-Weiser GC License (without fee)"#,
+        0x0,
+    ),
     ("Borceux", r#"Borceux license"#, 0x0),
     (
         "Brian-Gladman-2-Clause",
@@ -617,6 +622,16 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Creative Commons Public Domain Dedication and Certification"#,
         0x0,
     ),
+    (
+        "CC-PDM-1.0",
+        r#"Creative    Commons Public Domain Mark 1.0 Universal"#,
+        0x0,
+    ),
+    (
+        "CC-SA-1.0",
+        r#"Creative Commons Share Alike 1.0 Generic"#,
+        0x0,
+    ),
     (
         "CC0-1.0",
         r#"Creative Commons Zero v1.0 Universal"#,
@@ -767,6 +782,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("DRL-1.1", r#"Detection Rule License 1.1"#, 0x0),
     ("DSDP", r#"DSDP License"#, 0x0),
     ("DocBook-Schema", r#"DocBook Schema License"#, 0x0),
+    ("DocBook-Stylesheet", r#"DocBook Stylesheet License"#, 0x0),
     ("DocBook-XML", r#"DocBook XML License"#, 0x0),
     ("Dotseqn", r#"Dotseqn License"#, 0x0),
     (
@@ -1244,6 +1260,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("Imlib2", r#"Imlib2 License"#, IS_FSF_LIBRE),
     ("Info-ZIP", r#"Info-ZIP License"#, 0x0),
     ("Inner-Net-2.0", r#"Inner Net License v2.0"#, 0x0),
+    ("InnoSetup", r#"Inno Setup License"#, 0x0),
     (
         "Intel",
         r#"Intel Open Source License"#,
@@ -1418,9 +1435,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         0x0,
     ),
     ("Lucida-Bitmap-Fonts", r#"Lucida Bitmap Fonts License"#, 0x0),
+    ("MIPS", r#"MIPS License"#, 0x0),
     ("MIT", r#"MIT License"#, IS_OSI_APPROVED | IS_FSF_LIBRE),
     ("MIT-0", r#"MIT No Attribution"#, IS_OSI_APPROVED),
     ("MIT-CMU", r#"CMU License"#, 0x0),
+    ("MIT-Click", r#"MIT Click License"#, 0x0),
     ("MIT-Festival", r#"MIT Festival Variant"#, 0x0),
     ("MIT-Khronos-old", r#"MIT Khronos - old variant"#, 0x0),
     (
@@ -1806,6 +1825,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         0x0,
     ),
     ("SL", r#"SL License"#, 0x0),
+    ("SMAIL-GPL", r#"SMAIL General Public License"#, 0x0),
     (
         "SMLNJ",
         r#"Standard ML of New Jersey License"#,
@@ -1831,6 +1851,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("SchemeReport", r#"Scheme Language Report License"#, 0x0),
     ("Sendmail", r#"Sendmail License"#, 0x0),
     ("Sendmail-8.23", r#"Sendmail License 8.23"#, 0x0),
+    (
+        "Sendmail-Open-Source-1.1",
+        r#"Sendmail Open Source License v1.1"#,
+        0x0,
+    ),
     ("SimPL-2.0", r#"Simple Public License 2.0"#, IS_OSI_APPROVED),
     (
         "Sleepycat",
@@ -1877,6 +1902,8 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         0x0,
     ),
     ("TermReadKey", r#"TermReadKey License"#, 0x0),
+    ("ThirdEye", r#"ThirdEye License"#, 0x0),
+    ("TrustedQSL", r#"TrustedQSL License"#, 0x0),
     ("UCAR", r#"UCAR License"#, 0x0),
     (
         "UCL-1.0",
@@ -1984,6 +2011,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("Zimbra-1.4", r#"Zimbra Public License v1.4"#, 0x0),
     ("Zlib", r#"zlib License"#, IS_OSI_APPROVED | IS_FSF_LIBRE),
     ("any-OSI", r#"Any OSI License"#, 0x0),
+    (
+        "any-OSI-perl-modules",
+        r#"Any OSI License - Perl Modules"#,
+        0x0,
+    ),
     (
         "bcrypt-Solar-Designer",
         r#"bcrypt Solar Designer License"#,
@@ -2018,6 +2050,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("etalab-2.0", r#"Etalab Open License 2.0"#, 0x0),
     ("fwlw", r#"fwlw License"#, 0x0),
     ("gSOAP-1.3b", r#"gSOAP Public License v1.3b"#, 0x0),
+    ("generic-xts", r#"Generic XTS License"#, 0x0),
     ("gnuplot", r#"gnuplot License"#, IS_FSF_LIBRE),
     ("gtkbook", r#"gtkbook License"#, 0x0),
     ("hdparm", r#"hdparm License"#, 0x0),
@@ -2054,6 +2087,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("threeparttable", r#"threeparttable License"#, 0x0),
     ("ulem", r#"ulem License"#, 0x0),
     ("w3m", r#"w3m License"#, 0x0),
+    ("wwl", r#"WWL License"#, 0x0),
     (
         "wxWindows",
         r#"wxWindows Library License"#,
@@ -2121,6 +2155,7 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("Bison-exception-1.24", 0),
     ("Bison-exception-2.2", 0),
     ("Bootloader-exception", 0),
+    ("CGAL-linking-exception", 0),
     ("CLISP-exception-2.0", 0),
     ("Classpath-exception-2.0", 0),
     ("DigiRule-FOSS-exception", 0),
@@ -2133,13 +2168,15 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("GNAT-exception", 0),
     ("GNOME-examples-exception", 0),
     ("GNU-compiler-exception", 0),
+    ("GPL-3.0-389-ds-base-exception", 0),
     ("GPL-3.0-interface-exception", 0),
     ("GPL-3.0-linking-exception", 0),
     ("GPL-3.0-linking-source-exception", 0),
     ("GPL-CC-1.0", 0),
     ("GStreamer-exception-2005", 0),
     ("GStreamer-exception-2008", 0),
     ("Gmsh-exception", 0),
+    ("Independent-modules-exception", 0),
     ("KiCad-libraries-exception", 0),
     ("LGPL-3.0-linking-exception", 0),
     ("LLGPL", 0),
@@ -2173,9 +2210,11 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("fmt-exception", 0),
     ("freertos-exception-2.0", 0),
     ("gnu-javamail-exception", 0),
+    ("harbour-exception", 0),
     ("i2p-gpl-java-exception", 0),
     ("libpri-OpenH323-exception", 0),
     ("mif-exception", 0),
+    ("mxml-exception", 0),
     ("openvpn-openssl-exception", 0),
     ("romic-exception", 0),
     ("stunnel-exception", 0),

diff --git a/src/lib.rs b/src/lib.rs
@@ -459,7 +459,7 @@ pub fn exception_id(name: &str) -> Option<ExceptionId> {
 /// the license and exception identifiers are sourced from
 ///
 /// ```
-/// assert_eq!(spdx::license_version(), "3.25.0");
+/// assert_eq!(spdx::license_version(), "3.26.0");
 /// ```
 #[inline]
 #[must_use]

diff --git a/src/text.rs b/src/text.rs
@@ -192,6 +192,10 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("Bitstream-Vera", include!("text/licenses/Bitstream-Vera")),
     ("BlueOak-1.0.0", include!("text/licenses/BlueOak-1.0.0")),
     ("Boehm-GC", include!("text/licenses/Boehm-GC")),
+    (
+        "Boehm-GC-without-fee",
+        include!("text/licenses/Boehm-GC-without-fee"),
+    ),
     ("Borceux", include!("text/licenses/Borceux")),
     (
         "Brian-Gladman-2-Clause",
@@ -284,6 +288,8 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ),
     ("CC-BY-SA-4.0", include!("text/licenses/CC-BY-SA-4.0")),
     ("CC-PDDC", include!("text/licenses/CC-PDDC")),
+    ("CC-PDM-1.0", include!("text/licenses/CC-PDM-1.0")),
+    ("CC-SA-1.0", include!("text/licenses/CC-SA-1.0")),
     ("CC0-1.0", include!("text/licenses/CC0-1.0")),
     ("CDDL-1.0", include!("text/licenses/CDDL-1.0")),
     ("CDDL-1.1", include!("text/licenses/CDDL-1.1")),
@@ -355,6 +361,10 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("DRL-1.1", include!("text/licenses/DRL-1.1")),
     ("DSDP", include!("text/licenses/DSDP")),
     ("DocBook-Schema", include!("text/licenses/DocBook-Schema")),
+    (
+        "DocBook-Stylesheet",
+        include!("text/licenses/DocBook-Stylesheet"),
+    ),
     ("DocBook-XML", include!("text/licenses/DocBook-XML")),
     ("Dotseqn", include!("text/licenses/Dotseqn")),
     ("ECL-1.0", include!("text/licenses/ECL-1.0")),
@@ -625,6 +635,7 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("Imlib2", include!("text/licenses/Imlib2")),
     ("Info-ZIP", include!("text/licenses/Info-ZIP")),
     ("Inner-Net-2.0", include!("text/licenses/Inner-Net-2.0")),
+    ("InnoSetup", include!("text/licenses/InnoSetup")),
     ("Intel", include!("text/licenses/Intel")),
     ("Intel-ACPI", include!("text/licenses/Intel-ACPI")),
     ("Interbase-1.0", include!("text/licenses/Interbase-1.0")),
@@ -705,9 +716,11 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
         "Lucida-Bitmap-Fonts",
         include!("text/licenses/Lucida-Bitmap-Fonts"),
     ),
+    ("MIPS", include!("text/licenses/MIPS")),
     ("MIT", include!("text/licenses/MIT")),
     ("MIT-0", include!("text/licenses/MIT-0")),
     ("MIT-CMU", include!("text/licenses/MIT-CMU")),
+    ("MIT-Click", include!("text/licenses/MIT-Click")),
     ("MIT-Festival", include!("text/licenses/MIT-Festival")),
     ("MIT-Khronos-old", include!("text/licenses/MIT-Khronos-old")),
     (
@@ -894,6 +907,7 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("SISSL", include!("text/licenses/SISSL")),
     ("SISSL-1.2", include!("text/licenses/SISSL-1.2")),
     ("SL", include!("text/licenses/SL")),
+    ("SMAIL-GPL", include!("text/licenses/SMAIL-GPL")),
     ("SMLNJ", include!("text/licenses/SMLNJ")),
     ("SMPPL", include!("text/licenses/SMPPL")),
     ("SNIA", include!("text/licenses/SNIA")),
@@ -910,6 +924,10 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("SchemeReport", include!("text/licenses/SchemeReport")),
     ("Sendmail", include!("text/licenses/Sendmail")),
     ("Sendmail-8.23", include!("text/licenses/Sendmail-8.23")),
+    (
+        "Sendmail-Open-Source-1.1",
+        include!("text/licenses/Sendmail-Open-Source-1.1"),
+    ),
     ("SimPL-2.0", include!("text/licenses/SimPL-2.0")),
     ("Sleepycat", include!("text/licenses/Sleepycat")),
     ("Soundex", include!("text/licenses/Soundex")),
@@ -936,6 +954,8 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("TU-Berlin-1.0", include!("text/licenses/TU-Berlin-1.0")),
     ("TU-Berlin-2.0", include!("text/licenses/TU-Berlin-2.0")),
     ("TermReadKey", include!("text/licenses/TermReadKey")),
+    ("ThirdEye", include!("text/licenses/ThirdEye")),
+    ("TrustedQSL", include!("text/licenses/TrustedQSL")),
     ("UCAR", include!("text/licenses/UCAR")),
     ("UCL-1.0", include!("text/licenses/UCL-1.0")),
     ("UMich-Merit", include!("text/licenses/UMich-Merit")),
@@ -988,6 +1008,10 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("Zimbra-1.4", include!("text/licenses/Zimbra-1.4")),
     ("Zlib", include!("text/licenses/Zlib")),
     ("any-OSI", include!("text/licenses/any-OSI")),
+    (
+        "any-OSI-perl-modules",
+        include!("text/licenses/any-OSI-perl-modules"),
+    ),
     (
         "bcrypt-Solar-Designer",
         include!("text/licenses/bcrypt-Solar-Designer"),
@@ -1015,6 +1039,7 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("etalab-2.0", include!("text/licenses/etalab-2.0")),
     ("fwlw", include!("text/licenses/fwlw")),
     ("gSOAP-1.3b", include!("text/licenses/gSOAP-1.3b")),
+    ("generic-xts", include!("text/licenses/generic-xts")),
     ("gnuplot", include!("text/licenses/gnuplot")),
     ("gtkbook", include!("text/licenses/gtkbook")),
     ("hdparm", include!("text/licenses/hdparm")),
@@ -1046,6 +1071,7 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("threeparttable", include!("text/licenses/threeparttable")),
     ("ulem", include!("text/licenses/ulem")),
     ("w3m", include!("text/licenses/w3m")),
+    ("wwl", include!("text/licenses/wwl")),
     ("wxWindows", include!("text/licenses/wxWindows")),
     ("xinetd", include!("text/licenses/xinetd")),
     (
@@ -1103,6 +1129,10 @@ pub const EXCEPTION_TEXTS: &[(&str, &str)] = &[
         "Bootloader-exception",
         include!("text/exceptions/Bootloader-exception"),
     ),
+    (
+        "CGAL-linking-exception",
+        include!("text/exceptions/CGAL-linking-exception"),
+    ),
     (
         "CLISP-exception-2.0",
         include!("text/exceptions/CLISP-exception-2.0"),
@@ -1145,6 +1175,10 @@ pub const EXCEPTION_TEXTS: &[(&str, &str)] = &[
         "GNU-compiler-exception",
         include!("text/exceptions/GNU-compiler-exception"),
     ),
+    (
+        "GPL-3.0-389-ds-base-exception",
+        include!("text/exceptions/GPL-3.0-389-ds-base-exception"),
+    ),
     (
         "GPL-3.0-interface-exception",
         include!("text/exceptions/GPL-3.0-interface-exception"),
@@ -1167,6 +1201,10 @@ pub const EXCEPTION_TEXTS: &[(&str, &str)] = &[
         include!("text/exceptions/GStreamer-exception-2008"),
     ),
     ("Gmsh-exception", include!("text/exceptions/Gmsh-exception")),
+    (
+        "Independent-modules-exception",
+        include!("text/exceptions/Independent-modules-exception"),
+    ),
     (
         "KiCad-libraries-exception",
         include!("text/exceptions/KiCad-libraries-exception"),
@@ -1272,6 +1310,10 @@ pub const EXCEPTION_TEXTS: &[(&str, &str)] = &[
         "gnu-javamail-exception",
         include!("text/exceptions/gnu-javamail-exception"),
     ),
+    (
+        "harbour-exception",
+        include!("text/exceptions/harbour-exception"),
+    ),
     (
         "i2p-gpl-java-exception",
         include!("text/exceptions/i2p-gpl-java-exception"),
@@ -1281,6 +1323,7 @@ pub const EXCEPTION_TEXTS: &[(&str, &str)] = &[
         include!("text/exceptions/libpri-OpenH323-exception"),
     ),
     ("mif-exception", include!("text/exceptions/mif-exception")),
+    ("mxml-exception", include!("text/exceptions/mxml-exception")),
     (
         "openvpn-openssl-exception",
         include!("text/exceptions/openvpn-openssl-exception"),

diff --git a/src/text/exceptions/CGAL-linking-exception b/src/text/exceptions/CGAL-linking-exception
@@ -0,0 +1,5 @@
+r#"As a special exception, you have permission to link this library
+with the CGAL library (http://www.cgal.org) and distribute executables,
+as long as you follow the requirements of the GNU GPL in regard to
+all of the software in the executable aside from CGAL.
+"#
diff --git a/src/text/exceptions/GPL-3.0-389-ds-base-exception b/src/text/exceptions/GPL-3.0-389-ds-base-exception
@@ -0,0 +1,11 @@
+r#"Additional permission under GPLv3 section 7:
+
+If you modify this Program, or any covered work, by
+linking or combining it with OpenSSL, or a modified
+version of OpenSSL licensed under the OpenSSL license
+(https://www.openssl.org/source/license.html), the licensors of this
+Program grant you additional permission to convey the resulting work.                                                                                                   
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts that are licensed
+under the OpenSSL license as well as that of the covered work.
+"#
diff --git a/src/text/exceptions/Independent-modules-exception b/src/text/exceptions/Independent-modules-exception
@@ -0,0 +1,19 @@
+r#"This is the file COPYING.FPC, it applies to the Free Pascal Run-Time Library 
+(RTL) and packages (packages) distributed by members of the Free Pascal 
+Development Team.
+
+The source code of the Free Pascal Runtime Libraries and packages are 
+distributed under the Library GNU General Public License 
+(see the file COPYING) with the following modification:
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent modules,
+and to copy and distribute the resulting executable under terms of your choice,
+provided that you also meet, for each linked independent module, the terms
+and conditions of the license of that module. An independent module is a module
+which is not derived from or based on this library. If you modify this
+library, you may extend this exception to your version of the library, but you are
+not obligated to do so. If you do not wish to do so, delete this exception
+statement from your version.
+"#