Update license list to 3.19 (#57)

* Update license list to 3.19 * Add CHANGELOG entry * Fixup Co-authored-by: Jake Shadle <[email protected]>
EmbarkStudios · Dec 20, 2022 · b8fde1f · b8fde1f
1 parent 878ed2a
commit b8fde1f
Show file tree

Hide file tree

Showing 15 changed files with 87 additions and 24 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#57](https://github.com/EmbarkStudios/spdx/pull/57) updated the SPDX license list from `3.18` => `3.19`.
+
 ## [0.9.0] - 2022-08-25
 ### Changed
 - [PR#55](https://github.com/EmbarkStudios/spdx/pull/55) updated the SPDX license list from `3.14` => `3.18`.

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.56.1-blue?color=fc8d62&logo=rust)](https://blog.rust-lang.org/2021/10/21/Rust-1.56.0.html)
-[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.18-blue.svg)](https://spdx.org/licenses/)
+[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.19-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.18
+ * list fetched from https://github.com/spdx/license-list-data @ v3.19
  *
  * 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.18";
+pub const VERSION: &str = "3.19";
 
 pub const LICENSES: &[(&str, &str, u8)] = &[
     ("0BSD", r#"BSD Zero Clause License"#, IS_OSI_APPROVED),
@@ -702,6 +702,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         r#"FSF Unlimited License (with License Retention)"#,
         0x0,
     ),
+    (
+        "FSFULLRWD",
+        r#"FSF Unlimited License (With License Retention    and Warranty Disclaimer)"#,
+        0x0,
+    ),
     ("FTL", r#"Freetype Project License"#, IS_FSF_LIBRE),
     ("Fair", r#"Fair License"#, IS_OSI_APPROVED),
     (
@@ -992,6 +997,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),
+    ("Knuth-CTAN", r#"Knuth CTAN License"#, 0x0),
     ("LAL-1.2", r#"Licence Art Libre 1.2"#, 0x0),
     ("LAL-1.3", r#"Licence Art Libre 1.3"#, 0x0),
     (
@@ -1620,6 +1626,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
         IS_DEPRECATED,
     ),
     ("bzip2-1.0.6", r#"bzip2 and libbzip2 License v1.0.6"#, 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),
     ("curl", r#"curl License"#, 0x0),
@@ -1642,6 +1649,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
     ("libpng-2.0", r#"PNG Reference Library version 2"#, 0x0),
     ("libselinux-1.0", r#"libselinux public domain notice"#, 0x0),
     ("libtiff", r#"libtiff License"#, 0x0),
+    (
+        "libutil-David-Nugent",
+        r#"libutil David Nugent License"#,
+        0x0,
+    ),
     ("mpi-permissive", r#"mpi Permissive License"#, 0x0),
     ("mpich2", r#"mpich2 License"#, 0x0),
     ("mplus", r#"mplus Font License"#, 0x0),
@@ -1740,4 +1752,5 @@ pub const EXCEPTIONS: &[(&str, u8)] = &[
     ("mif-exception", 0),
     ("openvpn-openssl-exception", 0),
     ("u-boot-exception-2.0", 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.18");
+/// assert_eq!(spdx::license_version(), "3.19");
 /// ```
 #[inline]
 #[must_use]

diff --git a/src/text.rs b/src/text.rs
@@ -274,6 +274,7 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("FSFAP", include!("text/licenses/FSFAP")),
     ("FSFUL", include!("text/licenses/FSFUL")),
     ("FSFULLR", include!("text/licenses/FSFULLR")),
+    ("FSFULLRWD", include!("text/licenses/FSFULLRWD")),
     ("FTL", include!("text/licenses/FTL")),
     ("Fair", include!("text/licenses/Fair")),
     ("Frameworx-1.0", include!("text/licenses/Frameworx-1.0")),
@@ -448,6 +449,7 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("JSON", include!("text/licenses/JSON")),
     ("Jam", include!("text/licenses/Jam")),
     ("JasPer-2.0", include!("text/licenses/JasPer-2.0")),
+    ("Knuth-CTAN", include!("text/licenses/Knuth-CTAN")),
     ("LAL-1.2", include!("text/licenses/LAL-1.2")),
     ("LAL-1.3", include!("text/licenses/LAL-1.3")),
     ("LGPL-2.0", include!("text/licenses/LGPL-2.0")),
@@ -707,6 +709,7 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("blessing", include!("text/licenses/blessing")),
     ("bzip2-1.0.5", include!("text/licenses/bzip2-1.0.5")),
     ("bzip2-1.0.6", include!("text/licenses/bzip2-1.0.6")),
+    ("checkmk", include!("text/licenses/checkmk")),
     (
         "copyleft-next-0.3.0",
         include!("text/licenses/copyleft-next-0.3.0"),
@@ -727,6 +730,10 @@ pub const LICENSE_TEXTS: &[(&str, &str)] = &[
     ("libpng-2.0", include!("text/licenses/libpng-2.0")),
     ("libselinux-1.0", include!("text/licenses/libselinux-1.0")),
     ("libtiff", include!("text/licenses/libtiff")),
+    (
+        "libutil-David-Nugent",
+        include!("text/licenses/libutil-David-Nugent"),
+    ),
     ("mpi-permissive", include!("text/licenses/mpi-permissive")),
     ("mpich2", include!("text/licenses/mpich2")),
     ("mplus", include!("text/licenses/mplus")),
@@ -894,4 +901,8 @@ pub const EXCEPTION_TEXTS: &[(&str, &str)] = &[
         "u-boot-exception-2.0",
         include!("text/exceptions/u-boot-exception-2.0"),
     ),
+    (
+        "x11vnc-openssl-exception",
+        include!("text/exceptions/x11vnc-openssl-exception"),
+    ),
 ];
diff --git a/src/text/exceptions/gnu-javamail-exception b/src/text/exceptions/gnu-javamail-exception
@@ -1,2 +1,2 @@
-r#"As a special exception, if you link this library with other files to produce an executable, this library does not by itself cause the resulting executable to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License."
+r#"As a special exception, if you link this library with other files to produce an executable, this library does not by itself cause the resulting executable to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License.
 "#
diff --git a/src/text/exceptions/x11vnc-openssl-exception b/src/text/exceptions/x11vnc-openssl-exception
@@ -0,0 +1,10 @@
+r#"In addition, as a special exception, Karl J. Runge
+gives permission to link the code of its release of x11vnc with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.
+"#
diff --git a/src/text/licenses/FSFULLRWD b/src/text/licenses/FSFULLRWD
@@ -0,0 +1,12 @@
+r#"Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+
+This Makefile.in is free software; the Free Software Foundation
+gives unlimited permission to copy and/or distribute it,
+with or without modifications, as long as this notice is preserved.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+"#
diff --git a/src/text/licenses/Fair b/src/text/licenses/Fair
@@ -5,6 +5,4 @@ r#"Fair License
 Usage of the works is permitted provided that this instrument is retained with the works, so that any entity that uses the works is notified of this instrument.
 
 DISCLAIMER: THE WORKS ARE WITHOUT WARRANTY.
-
-[2004, Fair License: rhid.com/fair (this URL no longer works)]
 "#
diff --git a/src/text/licenses/Knuth-CTAN b/src/text/licenses/Knuth-CTAN
@@ -0,0 +1,6 @@
+r#"This software is copyrighted. Unlimited copying and redistribution
+of this package and/or its individual files are permitted
+as long as there are no modifications. Modifications, and
+redistribution of modifications, are also permitted, but
+only if the resulting package and/or files are renamed.
+"#
diff --git a/src/text/licenses/MIT-CMU b/src/text/licenses/MIT-CMU
@@ -2,7 +2,7 @@ r#"<copyright notice>
 
 By obtaining, using, and/or copying this software and/or its associated documentation, you agree that you have read, understood, and will comply with the following terms and conditions:
 
-Permission to use, copy, modify, and distribute this software and its associated documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies, and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of the copyright holder not be used in advertising or publicity pertaining to distribution of the software without specific, written permission.
+Permission to use, copy, modify, and distribute this software and its associated documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies, and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of the copyright holder not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.
 
 THE COPYRIGHT HOLDER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 "#
diff --git a/src/text/licenses/Python-2.0.1 b/src/text/licenses/Python-2.0.1
@@ -191,18 +191,4 @@ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION
-----------------------------------------------------------------------
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
 "#
diff --git a/src/text/licenses/Spencer-86 b/src/text/licenses/Spencer-86
@@ -7,6 +7,4 @@ Permission is granted to anyone to use this software for any purpose on any comp
 2. The origin of this software must not be misrepresented, either by explicit claim or by omission.
 
 3. Altered versions must be plainly marked as such, and must not be misrepresented as being the original software.
-
-Beware that some of this code is subtly aware of the way operator precedence is structured in regular expressions. Serious changes in regular-expression syntax might require a total rethink.
 "#
diff --git a/src/text/licenses/checkmk b/src/text/licenses/checkmk
@@ -0,0 +1,10 @@
+r#"# Copyright (c) 2006, 2010  Micah Cowan
+#
+# Redistribution of this program in any form, with or without
+# modifications, is permitted, provided that the above copyright is
+# retained in distributions of this program in source form.
+#
+# (This is a free, non-copyleft license compatible with pretty much any
+# other free or proprietary license, including the GPL. It's essentially
+# a scaled-down version of the "modified" BSD license.)
+"#
diff --git a/src/text/licenses/libutil-David-Nugent b/src/text/licenses/libutil-David-Nugent
@@ -0,0 +1,16 @@
+r#"Copyright (c) 1995 David Nugent <[email protected]>
+All rights reserved.
+
+
+Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met:
+
+1.	Redistributions of source code must retain the above copyright notice immediately at the beginning of the file, without modification, this list of conditions, and the following disclaimer.
+
+2.	Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3.	This work was done expressly for inclusion into FreeBSD. Other use is permitted provided this notation is included.
+
+4.	Absolutely no warranty of function or purpose is made by the author David Nugent.
+
+5.	Modifications may be freely made to this file providing the above conditions are met.
+"#