Update license list to 3.22 (#63)

* Update license list to 3.22 * Oops * Update README * Use stable for clippy
EmbarkStudios · Jan 4, 2024 · 725564d · 725564d
1 parent 6f59401
commit 725564d
Show file tree

Hide file tree

Showing 58 changed files with 1,018 additions and 12 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.65.0
+      - uses: dtolnay/rust-toolchain@stable
         with:
           components: "rustfmt,clippy"
 

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#63](https://github.com/EmbarkStudios/spdx/pull/63) update SPDX license list to 3.22.
+
 ## [0.10.2] - 2023-07-14
 ### Changed
 - [PR#61](https://github.com/EmbarkStudios/spdx/pull/61) updated the SPDX license list from `3.20` => `3.21`.

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.21-blue.svg)](https://spdx.org/licenses/)
+[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.22-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.21
+ * list fetched from https://github.com/spdx/license-list-data @ v3.22
  *
  * 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.21";
+pub const VERSION: &str = "3.22";
 
 pub const LICENSES: &[(&str, &str, u8)] = &[
     ("0BSD", r#"BSD Zero Clause License"#, IS_OSI_APPROVED),
@@ -127,6 +127,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         0x0,
     ),
     ("Adobe-Glyph", r#"Adobe Glyph List License"#, 0x0),
+    ("Adobe-Utopia", r#"Adobe Utopia Font License"#, 0x0),
     ("Afmparse", r#"Afmparse License"#, 0x0),
     ("Aladdin", r#"Aladdin Free Public License"#, 0x0),
     ("Apache-1.0", r#"Apache License 1.0"#, IS_FSF_LIBRE),
@@ -195,6 +196,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"BSD 3-Clause Clear License"#,
         IS_FSF_LIBRE,
     ),
+    (
+        "BSD-3-Clause-HP",
+        r#"Hewlett-Packard BSD variant license"#,
+        0x0,
+    ),
     (
         "BSD-3-Clause-LBNL",
         r#"Lawrence Berkeley National Labs BSD variant license"#,
@@ -230,6 +236,8 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"BSD 3-Clause Open MPI variant"#,
         0x0,
     ),
+    ("BSD-3-Clause-Sun", r#"BSD 3-Clause Sun Microsystems"#, 0x0),
+    ("BSD-3-Clause-flex", r#"BSD 3-Clause Flex variant"#, 0x0),
     (
         "BSD-4-Clause",
         r#"BSD 4-Clause "Original" or "Old" License"#,
@@ -253,8 +261,10 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"BSD with Attribution and HPND disclaimer"#,
         0x0,
     ),
+    ("BSD-Inferno-Nettverk", r#"BSD-Inferno-Nettverk"#, 0x0),
     ("BSD-Protection", r#"BSD Protection License"#, IS_COPYLEFT),
     ("BSD-Source-Code", r#"BSD Source Code Attribution"#, 0x0),
+    ("BSD-Systemics", r#"Systemics BSD variant license"#, 0x0),
     (
         "BSL-1.0",
         r#"Boost Software License 1.0"#,
@@ -682,6 +692,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Cornell Lossless JPEG License"#,
         0x0,
     ),
+    ("Cronyx", r#"Cronyx License"#, 0x0),
     ("Crossword", r#"Crossword License"#, 0x0),
     ("CrystalStacker", r#"CrystalStacker License"#, 0x0),
     ("Cube", r#"Cube License"#, 0x0),
@@ -691,6 +702,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Data licence Germany – attribution – version 2.0"#,
         0x0,
     ),
+    (
+        "DL-DE-ZERO-2.0",
+        r#"Data licence Germany – zero – version 2.0"#,
+        0x0,
+    ),
     ("DOC", r#"DOC License"#, 0x0),
     ("DRL-1.0", r#"Detection Rule License 1.0"#, 0x0),
     ("DSDP", r#"DSDP License"#, 0x0),
@@ -746,6 +762,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("Entessa", r#"Entessa Public License v1.0"#, IS_OSI_APPROVED),
     ("ErlPL-1.1", r#"Erlang Public License v1.1"#, 0x0),
     ("Eurosym", r#"Eurosym License"#, 0x0),
+    ("FBM", r#"Fuzzy Bitmap License"#, 0x0),
     ("FDK-AAC", r#"Fraunhofer FDK AAC Codec Library"#, 0x0),
     ("FSFAP", r#"FSF All Permissive License"#, IS_FSF_LIBRE),
     ("FSFUL", r#"FSF Unlimited License"#, 0x0),
@@ -761,13 +778,15 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ),
     ("FTL", r#"Freetype Project License"#, IS_FSF_LIBRE),
     ("Fair", r#"Fair License"#, IS_OSI_APPROVED),
+    ("Ferguson-Twofish", r#"Ferguson Twofish License"#, 0x0),
     (
         "Frameworx-1.0",
         r#"Frameworx Open License 1.0"#,
         IS_OSI_APPROVED,
     ),
     ("FreeBSD-DOC", r#"FreeBSD Documentation License"#, 0x0),
     ("FreeImage", r#"FreeImage Public License v1.0"#, 0x0),
+    ("Furuseth", r#"Furuseth License"#, 0x0),
     ("GD", r#"GD License"#, 0x0),
     (
         "GFDL-1.1",
@@ -1006,21 +1025,57 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("Glulxe", r#"Glulxe License"#, 0x0),
     ("Graphics-Gems", r#"Graphics Gems License"#, 0x0),
     ("HP-1986", r#"Hewlett-Packard 1986 License"#, 0x0),
+    ("HP-1989", r#"Hewlett-Packard 1989 License"#, 0x0),
     (
         "HPND",
         r#"Historical Permission Notice and Disclaimer"#,
         IS_OSI_APPROVED | IS_FSF_LIBRE,
     ),
+    (
+        "HPND-DEC",
+        r#"Historical Permission Notice and Disclaimer - DEC variant"#,
+        0x0,
+    ),
     (
         "HPND-Markus-Kuhn",
         r#"Historical Permission Notice and Disclaimer - Markus Kuhn variant"#,
         0x0,
     ),
+    (
+        "HPND-Pbmplus",
+        r#"Historical Permission Notice and Disclaimer - Pbmplus variant"#,
+        0x0,
+    ),
+    (
+        "HPND-UC",
+        r#"Historical Permission Notice and Disclaimer - University of California variant"#,
+        0x0,
+    ),
+    (
+        "HPND-doc",
+        r#"Historical Permission Notice and Disclaimer - documentation variant"#,
+        0x0,
+    ),
+    (
+        "HPND-doc-sell",
+        r#"Historical Permission Notice and Disclaimer - documentation sell variant"#,
+        0x0,
+    ),
     (
         "HPND-export-US",
         r#"HPND with US Government export control warning"#,
         0x0,
     ),
+    (
+        "HPND-export-US-modify",
+        r#"HPND with US Government export control warning and modification rqmt"#,
+        0x0,
+    ),
+    (
+        "HPND-sell-regexpr",
+        r#"Historical Permission Notice and Disclaimer - sell regexpr variant"#,
+        0x0,
+    ),
     (
         "HPND-sell-variant",
         r#"Historical Permission Notice and Disclaimer - sell variant"#,
@@ -1078,6 +1133,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("JSON", r#"JSON License"#, 0x0),
     ("Jam", r#"Jam License"#, IS_OSI_APPROVED),
     ("JasPer-2.0", r#"JasPer License"#, 0x0),
+    ("Kastrup", r#"Kastrup License"#, 0x0),
     ("Kazlib", r#"Kazlib License"#, 0x0),
     ("Knuth-CTAN", r#"Knuth CTAN License"#, 0x0),
     ("LAL-1.2", r#"Licence Art Libre 1.2"#, 0x0),
@@ -1233,6 +1289,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Linux man-pages Copyleft Variant"#,
         0x0,
     ),
+    ("Lucida-Bitmap-Fonts", r#"Lucida Bitmap Fonts 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),
@@ -1247,7 +1304,10 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("MIT-enna", r#"enna License"#, 0x0),
     ("MIT-feh", r#"feh License"#, 0x0),
     ("MIT-open-group", r#"MIT Open Group variant"#, 0x0),
+    ("MIT-testregex", r#"MIT testregex Variant"#, 0x0),
     ("MITNFA", r#"MIT +no-false-attribs license"#, 0x0),
+    ("MMIXware", r#"MMIXware License"#, 0x0),
+    ("MPEG-SSG", r#"MPEG Software Simulation"#, 0x0),
     (
         "MPL-1.0",
         r#"Mozilla Public License 1.0"#,
@@ -1282,6 +1342,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("MTLL", r#"Matrix Template Library License"#, 0x0),
     ("MakeIndex", r#"MakeIndex License"#, 0x0),
     ("Martin-Birgmeier", r#"Martin Birgmeier License"#, 0x0),
+    ("McPhee-slideshow", r#"McPhee Slideshow License"#, 0x0),
     ("Minpack", r#"Minpack License"#, 0x0),
     ("MirOS", r#"The MirOS Licence"#, IS_OSI_APPROVED),
     ("Motosoto", r#"Motosoto License"#, IS_OSI_APPROVED),
@@ -1501,6 +1562,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ),
     ("OpenPBS-2.3", r#"OpenPBS v2.3 Software License"#, 0x0),
     ("OpenSSL", r#"OpenSSL License"#, IS_FSF_LIBRE),
+    ("PADL", r#"PADL License"#, 0x0),
     (
         "PDDL-1.0",
         r#"Open Data Commons Public Domain Dedication & License 1.0"#,
@@ -1581,6 +1643,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"SGI Free Software License B v2.0"#,
         IS_FSF_LIBRE,
     ),
+    ("SGI-OpenGL", r#"SGI OpenGL License"#, 0x0),
     ("SGP4", r#"SGP4 Permission Notice"#, 0x0),
     ("SHL-0.5", r#"Solderpad Hardware License v0.5"#, 0x0),
     (
@@ -1598,6 +1661,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Sun Industry Standards Source License v1.2"#,
         0x0,
     ),
+    ("SL", r#"SL License"#, 0x0),
     (
         "SMLNJ",
         r#"Standard ML of New Jersey License"#,
@@ -1628,6 +1692,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Sleepycat License"#,
         IS_OSI_APPROVED | IS_FSF_LIBRE,
     ),
+    ("Soundex", r#"Soundex License"#, 0x0),
     ("Spencer-86", r#"Spencer License 86"#, 0x0),
     ("Spencer-94", r#"Spencer License 94"#, 0x0),
     ("Spencer-99", r#"Spencer License 99"#, 0x0),
@@ -1648,6 +1713,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("TPDL", r#"Time::ParseDate License"#, 0x0),
     ("TPL-1.0", r#"THOR Public License 1.0"#, 0x0),
     ("TTWL", r#"Text-Tabs+Wrap License"#, 0x0),
+    ("TTYP0", r#"TTYP0 License"#, 0x0),
     (
         "TU-Berlin-1.0",
         r#"Technische Universitaet Berlin License 1.0"#,
@@ -1670,6 +1736,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"Universal Permissive License v1.0"#,
         IS_OSI_APPROVED | IS_FSF_LIBRE,
     ),
+    (
+        "URT-RLE",
+        r#"Utah Raster Toolkit Run Length Encoded License"#,
+        0x0,
+    ),
     (
         "Unicode-DFS-2015",
         r#"Unicode License Agreement - Data Files and Software (2015)"#,
@@ -1751,6 +1822,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         IS_OSI_APPROVED | IS_FSF_LIBRE,
     ),
     ("Zed", r#"Zed License"#, 0x0),
+    ("Zeeff", r#"Zeeff License"#, 0x0),
     ("Zend-2.0", r#"Zend License v2.0"#, IS_FSF_LIBRE),
     ("Zimbra-1.3", r#"Zimbra Public License v1.3"#, IS_FSF_LIBRE),
     ("Zimbra-1.4", r#"Zimbra Public License v1.4"#, 0x0),
@@ -1762,6 +1834,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         IS_DEPRECATED,
     ),
     ("bzip2-1.0.6", r#"bzip2 and libbzip2 License v1.0.6"#, 0x0),
+    ("check-cvs", r#"check-cvs License"#, 0x0),
     ("checkmk", r#"Checkmk License"#, 0x0),
     ("copyleft-next-0.3.0", r#"copyleft-next 0.3.0"#, 0x0),
     ("copyleft-next-0.3.1", r#"copyleft-next 0.3.1"#, 0x0),
@@ -1776,6 +1849,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ),
     ("eGenix", r#"eGenix.com Public License 1.1.0"#, 0x0),
     ("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),
     ("gnuplot", r#"gnuplot License"#, IS_FSF_LIBRE),
     (
@@ -1791,13 +1865,20 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"libutil David Nugent License"#,
         0x0,
     ),
+    ("lsof", r#"lsof License"#, 0x0),
+    ("magaz", r#"magaz 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),
+    ("pnmstitch", r#"pnmstitch License"#, 0x0),
     ("psfrag", r#"psfrag License"#, 0x0),
     ("psutils", r#"psutils License"#, 0x0),
+    ("python-ldap", r#"Python ldap License"#, 0x0),
     ("snprintf", r#"snprintf License"#, 0x0),
+    ("ssh-keyscan", r#"ssh-keyscan License"#, 0x0),
+    ("swrule", r#"swrule License"#, 0x0),
+    ("ulem", r#"ulem License"#, 0x0),
     ("w3m", r#"w3m License"#, 0x0),
     (
         "wxWindows",
@@ -1854,6 +1935,7 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("Autoconf-exception-2.0", 0),
     ("Autoconf-exception-3.0", 0),
     ("Autoconf-exception-generic", 0),
+    ("Autoconf-exception-generic-3.0", 0),
     ("Autoconf-exception-macro", 0),
     ("Bison-exception-2.2", 0),
     ("Bootloader-exception", 0),
@@ -1864,8 +1946,10 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("Fawkes-Runtime-exception", 0),
     ("Font-exception-2.0", 0),
     ("GCC-exception-2.0", 0),
+    ("GCC-exception-2.0-note", 0),
     ("GCC-exception-3.1", 0),
     ("GNAT-exception", 0),
+    ("GNU-compiler-exception", 0),
     ("GPL-3.0-interface-exception", 0),
     ("GPL-3.0-linking-exception", 0),
     ("GPL-3.0-linking-source-exception", 0),
@@ -1888,10 +1972,13 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("Qt-GPL-exception-1.0", 0),
     ("Qt-LGPL-exception-1.1", 0),
     ("Qwt-exception-1.0", 0),
+    ("SANE-exception", 0),
     ("SHL-2.0", 0),
     ("SHL-2.1", 0),
     ("SWI-exception", 0),
     ("Swift-exception", 0),
+    ("Texinfo-exception", 0),
+    ("UBDL-exception", 0),
     ("Universal-FOSS-exception-1.0", 0),
     ("WxWindows-exception-3.1", 0),
     ("cryptsetup-OpenSSL-exception", 0),
@@ -1902,6 +1989,7 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("libpri-OpenH323-exception", 0),
     ("mif-exception", 0),
     ("openvpn-openssl-exception", 0),
+    ("stunnel-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
@@ -412,6 +412,7 @@ impl Ord for LicenseItem {
 }
 
 impl PartialOrd for LicenseItem {
+    #[allow(clippy::non_canonical_partial_ord_impl)]
     fn partial_cmp(&self, o: &Self) -> Option<Ordering> {
         match (self, o) {
             (Self::Spdx { id: a, .. }, Self::Spdx { id: b, .. }) => a.partial_cmp(b),
@@ -541,7 +542,7 @@ pub fn exception_id(name: &str) -> Option<ExceptionId> {
 /// the license and exception identifiers are sourced from
 ///
 /// ```
-/// assert_eq!(spdx::license_version(), "3.21");
+/// assert_eq!(spdx::license_version(), "3.22");
 /// ```
 #[inline]
 #[must_use]