Update to 3.21 (#62)

* Update SPDX license list to 3.21 * Fix doctest * Update CHANGELOG --------- Co-authored-by: Tobias Naumann <tobias.naumann@iml.fraunhofer.de>
EmbarkStudios · Jul 14, 2023 · bb6f301 · bb6f301
1 parent 5531e8d
commit bb6f301
Show file tree

Hide file tree

Showing 36 changed files with 1,028 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+### Changed
+- [PR#61](https://github.com/EmbarkStudios/spdx/pull/61) updated the SPDX license list from `3.20` => `3.21`.
+
+### Fixed
+- [PR#60](https://github.com/EmbarkStudios/spdx/pull/60) fixed a few typos.
+
 ## [0.10.1] - 2023-04-06
 ### Changed
 - [PR#59](https://github.com/EmbarkStudios/spdx/pull/59) updated the SPDX license list from `3.19` => `3.20`.

diff --git a/README.md b/README.md
@@ -9,7 +9,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.20-blue.svg)](https://spdx.org/licenses/)
+[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.21-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.20
+ * list fetched from https://github.com/spdx/license-list-data @ v3.21
  *
  * 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.20";
+pub const VERSION: &str = "3.21";
 
 pub const LICENSES: &[(&str, &str, u8)] = &[
     ("0BSD", r#"BSD Zero Clause License"#, IS_OSI_APPROVED),
@@ -109,6 +109,16 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Apple Public Source License 2.0"#,
         IS_OSI_APPROVED | IS_FSF_LIBRE,
     ),
+    (
+        "ASWF-Digital-Assets-1.0",
+        r#"ASWF Digital Assets License version 1.0"#,
+        0x0,
+    ),
+    (
+        "ASWF-Digital-Assets-1.1",
+        r#"ASWF Digital Assets License 1.1"#,
+        0x0,
+    ),
     ("Abstyles", r#"Abstyles License"#, 0x0),
     ("AdaCore-doc", r#"AdaCore Doc License"#, 0x0),
     (
@@ -272,6 +282,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ),
     ("Bitstream-Vera", r#"Bitstream Vera Font License"#, 0x0),
     ("BlueOak-1.0.0", r#"Blue Oak Model License 1.0.0"#, 0x0),
+    ("Boehm-GC", r#"Boehm-Demers-Weiser GC License"#, 0x0),
     ("Borceux", r#"Borceux license"#, 0x0),
     (
         "Brian-Gladman-3-Clause",
@@ -538,6 +549,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Creative Commons Attribution Share Alike 3.0 Germany"#,
         IS_COPYLEFT,
     ),
+    (
+        "CC-BY-SA-3.0-IGO",
+        r#"Creative Commons Attribution-ShareAlike 3.0 IGO"#,
+        IS_COPYLEFT,
+    ),
     (
         "CC-BY-SA-4.0",
         r#"Creative Commons Attribution Share Alike 4.0 International"#,
@@ -740,7 +756,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ),
     (
         "FSFULLRWD",
-        r#"FSF Unlimited License (With License Retention    and Warranty Disclaimer)"#,
+        r#"FSF Unlimited License (With License Retention and Warranty Disclaimer)"#,
         0x0,
     ),
     ("FTL", r#"Freetype Project License"#, IS_FSF_LIBRE),
@@ -1045,6 +1061,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("ImageMagick", r#"ImageMagick License"#, 0x0),
     ("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),
     (
         "Intel",
         r#"Intel Open Source License"#,
@@ -1169,6 +1186,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         0x0,
     ),
     ("Latex2e", r#"Latex2e License"#, 0x0),
+    (
+        "Latex2e-translated-notice",
+        r#"Latex2e with translated notice permission"#,
+        0x0,
+    ),
     ("Leptonica", r#"Leptonica License"#, 0x0),
     (
         "LiLiQ-P-1.1",
@@ -1191,14 +1213,30 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Linux Kernel Variant of OpenIB.org license"#,
         0x0,
     ),
+    (
+        "Linux-man-pages-1-para",
+        r#"Linux man-pages - 1 paragraph"#,
+        0x0,
+    ),
     (
         "Linux-man-pages-copyleft",
         r#"Linux man-pages Copyleft"#,
         0x0,
     ),
+    (
+        "Linux-man-pages-copyleft-2-para",
+        r#"Linux man-pages Copyleft - 2 paragraphs"#,
+        0x0,
+    ),
+    (
+        "Linux-man-pages-copyleft-var",
+        r#"Linux man-pages Copyleft Variant"#,
+        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-Festival", r#"MIT Festival Variant"#, 0x0),
     (
         "MIT-Modern-Variant",
         r#"MIT License Modern Variant"#,
@@ -1288,6 +1326,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"NIST Public Domain Notice with license fallback"#,
         0x0,
     ),
+    ("NIST-Software", r#"NIST Software License"#, 0x0),
     (
         "NLOD-1.0",
         r#"Norwegian Licence for Open Government Data (NLOD) 1.0"#,
@@ -1417,8 +1456,18 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Open LDAP Public License v2.8"#,
         IS_OSI_APPROVED,
     ),
+    (
+        "OLFL-1.3",
+        r#"Open Logistics Foundation License Version 1.3"#,
+        IS_OSI_APPROVED,
+    ),
     ("OML", r#"Open Market License"#, 0x0),
     ("OPL-1.0", r#"Open Public License v1.0"#, 0x0),
+    (
+        "OPL-UK-3.0",
+        r#"United    Kingdom Open Parliament Licence v3.0"#,
+        0x0,
+    ),
     ("OPUBL-1.0", r#"Open Publication License v1.0"#, 0x0),
     (
         "OSET-PL-2.1",
@@ -1532,6 +1581,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"SGI Free Software License B v2.0"#,
         IS_FSF_LIBRE,
     ),
+    ("SGP4", r#"SGP4 Permission Notice"#, 0x0),
     ("SHL-0.5", r#"Solderpad Hardware License v0.5"#, 0x0),
     (
         "SHL-0.51",
@@ -1608,6 +1658,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Technische Universitaet Berlin License 2.0"#,
         0x0,
     ),
+    ("TermReadKey", r#"TermReadKey License"#, 0x0),
     ("UCAR", r#"UCAR License"#, 0x0),
     (
         "UCL-1.0",
@@ -1630,6 +1681,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         IS_OSI_APPROVED,
     ),
     ("Unicode-TOU", r#"Unicode Terms of Use"#, 0x0),
+    ("UnixCrypt", r#"UnixCrypt License"#, 0x0),
     (
         "Unlicense",
         r#"The Unlicense"#,
@@ -1667,6 +1719,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Sybase Open Watcom Public License 1.0"#,
         IS_OSI_APPROVED,
     ),
+    ("Widget-Workshop", r#"Widget Workshop License"#, 0x0),
     ("Wsuipa", r#"Wsuipa License"#, 0x0),
     ("X11", r#"X11 License"#, IS_FSF_LIBRE),
     (
@@ -1676,7 +1729,9 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ),
     ("XFree86-1.1", r#"XFree86 License 1.1"#, IS_FSF_LIBRE),
     ("XSkat", r#"XSkat License"#, 0x0),
+    ("Xdebug-1.03", r#"Xdebug License v 1.03"#, 0x0),
     ("Xerox", r#"Xerox License"#, 0x0),
+    ("Xfig", r#"Xfig License"#, 0x0),
     ("Xnet", r#"X.Net License"#, IS_OSI_APPROVED),
     ("YPL-1.0", r#"Yahoo! Public License v1.0"#, 0x0),
     (
@@ -1712,6 +1767,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("copyleft-next-0.3.1", r#"copyleft-next 0.3.1"#, 0x0),
     ("curl", r#"curl License"#, 0x0),
     ("diffmark", r#"diffmark license"#, 0x0),
+    ("dtoa", r#"David M. Gay dtoa License"#, 0x0),
     ("dvipdfm", r#"dvipdfm License"#, 0x0),
     (
         "eCos-2.0",
@@ -1735,6 +1791,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"libutil David Nugent License"#,
         0x0,
     ),
+    ("metamail", r#"metamail License"#, 0x0),
     ("mpi-permissive", r#"mpi Permissive License"#, 0x0),
     ("mpich2", r#"mpich2 License"#, 0x0),
     ("mplus", r#"mplus Font License"#, 0x0),
@@ -1793,9 +1850,11 @@ pub const IMPRECISE_NAMES: &[(&str, &str)] = &[
 
 pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("389-exception", 0),
+    ("Asterisk-exception", 0),
     ("Autoconf-exception-2.0", 0),
     ("Autoconf-exception-3.0", 0),
     ("Autoconf-exception-generic", 0),
+    ("Autoconf-exception-macro", 0),
     ("Bison-exception-2.2", 0),
     ("Bootloader-exception", 0),
     ("CLISP-exception-2.0", 0),
@@ -1807,13 +1866,15 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("GCC-exception-2.0", 0),
     ("GCC-exception-3.1", 0),
     ("GNAT-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),
     ("KiCad-libraries-exception", 0),
     ("LGPL-3.0-linking-exception", 0),
+    ("LLGPL", 0),
     ("LLVM-exception", 0),
     ("LZMA-exception", 0),
     ("Libtool-exception", 0),
@@ -1833,12 +1894,15 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("Swift-exception", 0),
     ("Universal-FOSS-exception-1.0", 0),
     ("WxWindows-exception-3.1", 0),
+    ("cryptsetup-OpenSSL-exception", 0),
     ("eCos-exception-2.0", 0),
     ("freertos-exception-2.0", 0),
     ("gnu-javamail-exception", 0),
     ("i2p-gpl-java-exception", 0),
+    ("libpri-OpenH323-exception", 0),
     ("mif-exception", 0),
     ("openvpn-openssl-exception", 0),
     ("u-boot-exception-2.0", 0),
+    ("vsftpd-openssl-exception", 0),
     ("x11vnc-openssl-exception", 0),
 ];
diff --git a/src/lib.rs b/src/lib.rs
@@ -541,7 +541,7 @@ pub fn exception_id(name: &str) -> Option<ExceptionId> {
 /// the license and exception identifiers are sourced from
 ///
 /// ```
-/// assert_eq!(spdx::license_version(), "3.20");
+/// assert_eq!(spdx::license_version(), "3.21");
 /// ```
 #[inline]
 #[must_use]