Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 3.24 #70

Merged
merged 2 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- next-header -->
## [Unreleased] - ReleaseDate
### Changed
- [PR#70](https://github.com/EmbarkStudios/spdx/pull/70) update SPDX license list to 3.24.0.

## [0.10.4] - 2024-02-26
### Changed
- [PR#65](https://github.com/EmbarkStudios/spdx/pull/65) update SPDX license list to 3.23.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.23-blue.svg)](https://spdx.org/licenses/)
[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.24.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)

Expand Down
61 changes: 59 additions & 2 deletions src/identifiers.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* list fetched from https://github.com/spdx/license-list-data @ v3.23
* list fetched from https://github.com/spdx/license-list-data @ v3.24.0
*
* AUTO-GENERATED BY ./update
* DO NOT MODIFY
Expand All @@ -13,10 +13,11 @@ pub const IS_DEPRECATED: u8 = 0x4;
pub const IS_COPYLEFT: u8 = 0x8;
pub const IS_GNU: u8 = 0x10;

pub const VERSION: &str = "3.23";
pub const VERSION: &str = "3.24.0";

pub const LICENSES: &[(&str, &str, u8)] = &[
("0BSD", r#"BSD Zero Clause License"#, IS_OSI_APPROVED),
("3D-Slicer-1.0", r#"3D Slicer License v1.0"#, 0x0),
("AAL", r#"Attribution Assurance License"#, IS_OSI_APPROVED),
("ADSL", r#"Amazon Digital Services License"#, 0x0),
(
Expand Down Expand Up @@ -74,6 +75,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"GNU Affero General Public License v3.0 or later"#,
IS_OSI_APPROVED | IS_FSF_LIBRE | IS_COPYLEFT | IS_GNU,
),
("AMD-newlib", r#"AMD newlib License"#, 0x0),
("AMDPLPA", r#"AMD's plpa_map.c License"#, 0x0),
("AML", r#"Apple MIT License"#, 0x0),
("AML-glslang", r#"AML glslang variant License"#, 0x0),
Expand Down Expand Up @@ -196,6 +198,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"BSD 2-Clause with views sentence"#,
0x0,
),
(
"BSD-2-Clause-first-lines",
r#"BSD 2-Clause - first lines requirement"#,
0x0,
),
(
"BSD-3-Clause",
r#"BSD 3-Clause "New" or "Revised" License"#,
Expand Down Expand Up @@ -725,6 +732,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"Caldera License (without preamble)"#,
0x0,
),
("Catharon", r#"Catharon License"#, 0x0),
("ClArtistic", r#"Clarified Artistic License"#, IS_FSF_LIBRE),
("Clips", r#"Clips License"#, 0x0),
(
Expand Down Expand Up @@ -1078,6 +1086,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
("Glide", r#"3dfx Glide License"#, 0x0),
("Glulxe", r#"Glulxe License"#, 0x0),
("Graphics-Gems", r#"Graphics Gems License"#, 0x0),
("Gutmann", r#"Gutmann License"#, 0x0),
("HP-1986", r#"Hewlett-Packard 1986 License"#, 0x0),
("HP-1989", r#"Hewlett-Packard 1989 License"#, 0x0),
(
Expand All @@ -1100,6 +1109,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"Historical Permission Notice and Disclaimer - INRIA-IMAG variant"#,
0x0,
),
(
"HPND-Intel",
r#"Historical Permission Notice and Disclaimer - Intel variant"#,
0x0,
),
(
"HPND-Kevlin-Henney",
r#"Historical Permission Notice and Disclaimer - Kevlin Henney variant"#,
Expand All @@ -1125,6 +1139,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"Historical Permission Notice and Disclaimer - University of California variant"#,
0x0,
),
(
"HPND-UC-export-US",
r#"Historical Permission Notice and Disclaimer - University of California, US export warning"#,
0x0,
),
(
"HPND-doc",
r#"Historical Permission Notice and Disclaimer - documentation variant"#,
Expand All @@ -1140,11 +1159,26 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"HPND with US Government export control warning"#,
0x0,
),
(
"HPND-export-US-acknowledgement",
r#"HPND with US Government export control warning and acknowledgment"#,
0x0,
),
(
"HPND-export-US-modify",
r#"HPND with US Government export control warning and modification rqmt"#,
0x0,
),
(
"HPND-export2-US",
r#"HPND with US Government export control and 2 disclaimers"#,
0x0,
),
(
"HPND-merchantability-variant",
r#"Historical Permission Notice and Disclaimer - merchantability variant"#,
0x0,
),
(
"HPND-sell-MIT-disclaimer-xserver",
r#"Historical Permission Notice and Disclaimer - sell xserver variant with MIT disclaimer"#,
Expand All @@ -1165,6 +1199,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"HPND sell variant with MIT disclaimer"#,
0x0,
),
(
"HPND-sell-variant-MIT-disclaimer-rev",
r#"HPND sell variant with MIT disclaimer - reverse"#,
0x0,
),
("HTMLTIDY", r#"HTML Tidy License"#, 0x0),
("HaskellReport", r#"Haskell Language Report License"#, 0x0),
("Hippocratic-2.1", r#"Hippocratic License 2.1"#, 0x0),
Expand Down Expand Up @@ -1375,6 +1414,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
("MIT-0", r#"MIT No Attribution"#, IS_OSI_APPROVED),
("MIT-CMU", r#"CMU License"#, 0x0),
("MIT-Festival", r#"MIT Festival Variant"#, 0x0),
("MIT-Khronos-old", r#"MIT Khronos - old variant"#, 0x0),
(
"MIT-Modern-Variant",
r#"MIT License Modern Variant"#,
Expand Down Expand Up @@ -1456,7 +1496,9 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
IS_OSI_APPROVED,
),
("NBPL-1.0", r#"Net Boolean Public License v1"#, 0x0),
("NCBI-PD", r#"NCBI Public Domain Notice"#, 0x0),
("NCGL-UK-2.0", r#"Non-Commercial Government Licence"#, 0x0),
("NCL", r#"NCL Source Code License"#, 0x0),
(
"NCSA",
r#"University of Illinois/NCSA Open Source License"#,
Expand Down Expand Up @@ -1518,6 +1560,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
("Noweb", r#"Noweb License"#, 0x0),
("Nunit", r#"Nunit License"#, IS_DEPRECATED | IS_FSF_LIBRE),
("O-UDA-1.0", r#"Open Use of Data Agreement v1.0"#, 0x0),
("OAR", r#"OAR License"#, 0x0),
("OCCT-PL", r#"Open CASCADE Technology Public License"#, 0x0),
(
"OCLC-2.0",
Expand Down Expand Up @@ -1663,6 +1706,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"PHP License v3.01"#,
IS_OSI_APPROVED | IS_FSF_LIBRE,
),
("PPL", r#"Peer Production License"#, 0x0),
("PSF-2.0", r#"Python Software Foundation License 2.0"#, 0x0),
(
"Parity-6.0.0",
Expand Down Expand Up @@ -1795,6 +1839,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
),
("SugarCRM-1.1.3", r#"SugarCRM Public License v1.1.3"#, 0x0),
("Sun-PPP", r#"Sun PPP License"#, 0x0),
("Sun-PPP-2000", r#"Sun PPP License (2000)"#, 0x0),
("SunPro", r#"SunPro License"#, 0x0),
("Symlinks", r#"Symlinks License"#, 0x0),
("TAPR-OHL-1.0", r#"TAPR Open Hardware License v1.0"#, 0x0),
Expand Down Expand Up @@ -1927,6 +1972,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
("Zimbra-1.3", r#"Zimbra Public License v1.3"#, IS_FSF_LIBRE),
("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),
(
"bcrypt-Solar-Designer",
r#"bcrypt Solar Designer License"#,
Expand All @@ -1944,6 +1990,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
("copyleft-next-0.3.0", r#"copyleft-next 0.3.0"#, 0x0),
("copyleft-next-0.3.1", r#"copyleft-next 0.3.1"#, 0x0),
("curl", r#"curl License"#, 0x0),
(
"cve-tou",
r#"Common Vulnerability Enumeration ToU License"#,
0x0,
),
("diffmark", r#"diffmark license"#, 0x0),
("dtoa", r#"David M. Gay dtoa License"#, 0x0),
("dvipdfm", r#"dvipdfm License"#, 0x0),
Expand Down Expand Up @@ -1979,6 +2030,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
("mpi-permissive", r#"mpi Permissive License"#, 0x0),
("mpich2", r#"mpich2 License"#, 0x0),
("mplus", r#"mplus Font License"#, 0x0),
("pkgconf", r#"pkgconf License"#, 0x0),
("pnmstitch", r#"pnmstitch License"#, 0x0),
("psfrag", r#"psfrag License"#, 0x0),
("psutils", r#"psutils License"#, 0x0),
Expand All @@ -1988,6 +2040,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
("softSurfer", r#"softSurfer License"#, 0x0),
("ssh-keyscan", r#"ssh-keyscan License"#, 0x0),
("swrule", r#"swrule License"#, 0x0),
("threeparttable", r#"threeparttable License"#, 0x0),
("ulem", r#"ulem License"#, 0x0),
("w3m", r#"w3m License"#, 0x0),
(
Expand All @@ -2003,6 +2056,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
),
("xlock", r#"xlock License"#, 0x0),
("xpp", r#"XPP License"#, 0x0),
("xzoom", r#"xzoom License"#, 0x0),
(
"zlib-acknowledgement",
r#"zlib/libpng License with Acknowledgement"#,
Expand Down Expand Up @@ -2047,6 +2101,7 @@ pub const IMPRECISE_NAMES: &[(&str, &str)] = &[
pub const EXCEPTIONS: &[(&str, u8)] = &[
("389-exception", 0),
("Asterisk-exception", 0),
("Asterisk-linking-protocols-exception", 0),
("Autoconf-exception-2.0", 0),
("Autoconf-exception-3.0", 0),
("Autoconf-exception-generic", 0),
Expand Down Expand Up @@ -2085,11 +2140,13 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
("OCCT-exception-1.0", 0),
("OCaml-LGPL-linking-exception", 0),
("OpenJDK-assembly-exception-1.0", 0),
("PCRE2-exception", 0),
("PS-or-PDF-font-exception-20170817", 0),
("QPL-1.0-INRIA-2004-exception", 0),
("Qt-GPL-exception-1.0", 0),
("Qt-LGPL-exception-1.1", 0),
("Qwt-exception-1.0", 0),
("RRDtool-FLOSS-exception-2.0", 0),
("SANE-exception", 0),
("SHL-2.0", 0),
("SHL-2.1", 0),
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ pub fn exception_id(name: &str) -> Option<ExceptionId> {
/// the license and exception identifiers are sourced from
///
/// ```
/// assert_eq!(spdx::license_version(), "3.23");
/// assert_eq!(spdx::license_version(), "3.24.0");
/// ```
#[inline]
#[must_use]
Expand Down
Loading
Loading