From 2e23a7780ea9c01be337d9bf05c7fdfbcd7d6ecc Mon Sep 17 00:00:00 2001 From: Nick Richards Date: Tue, 15 Mar 2022 21:48:39 +0000 Subject: update to spdx 3.16 --- libappstream-glib/as-license-ids.txt | 112 ++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 7 deletions(-) diff --git a/libappstream-glib/as-license-ids.txt b/libappstream-glib/as-license-ids.txt index f27a9f0..5ea0853 100644 --- a/libappstream-glib/as-license-ids.txt +++ b/libappstream-glib/as-license-ids.txt @@ -1,4 +1,4 @@ -# the list of licenses from http://spdx.org/licenses/ version: 3.5 +# the list of licenses from http://spdx.org/licenses/ version: 3.16 including deprecated versions for backwards compatibility 0BSD AAL Abstyles @@ -20,80 +20,112 @@ AMDPLPA AML AMPAS ANTLR-PD +ANTLR-PD-fallback Apache-1.0 Apache-1.1 Apache-2.0 APAFML APL-1.0 +App-s2p APSL-1.0 APSL-1.1 APSL-1.2 APSL-2.0 +Arphic-1999 Artistic-1.0 Artistic-1.0-cl8 Artistic-1.0-Perl Artistic-2.0 +Baekmuk Bahyph Barr Beerware BitTorrent-1.0 BitTorrent-1.1 +blessing +BlueOak-1.0.0 Borceux BSD-1-Clause BSD-2-Clause -BSD-2-Clause-FreeBSD -BSD-2-Clause-NetBSD BSD-2-Clause-Patent +BSD-2-Clause-Views BSD-3-Clause BSD-3-Clause-Attribution BSD-3-Clause-Clear BSD-3-Clause-LBNL +BSD-3-Clause-Modification +BSD-3-Clause-No-Military-License BSD-3-Clause-No-Nuclear-License BSD-3-Clause-No-Nuclear-License-2014 BSD-3-Clause-No-Nuclear-Warranty +BSD-3-Clause-Open-MPI BSD-4-Clause +BSD-4-Clause-Shortened BSD-4-Clause-UC BSD-Protection BSD-Source-Code BSL-1.0 -bzip2-1.0.5 +BUSL-1.1 bzip2-1.0.6 +C-UDA-1.0 +CAL-1.0 +CAL-1.0-Combined-Work-Exception Caldera CATOSL-1.1 -CC0-1.0 CC-BY-1.0 CC-BY-2.0 CC-BY-2.5 +CC-BY-2.5-AU CC-BY-3.0 +CC-BY-3.0-AT +CC-BY-3.0-DE +CC-BY-3.0-NL +CC-BY-3.0-US CC-BY-4.0 CC-BY-NC-1.0 CC-BY-NC-2.0 CC-BY-NC-2.5 CC-BY-NC-3.0 +CC-BY-NC-3.0-DE CC-BY-NC-4.0 CC-BY-NC-ND-1.0 CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.5 CC-BY-NC-ND-3.0 +CC-BY-NC-ND-3.0-DE +CC-BY-NC-ND-3.0-IGO CC-BY-NC-ND-4.0 CC-BY-NC-SA-1.0 CC-BY-NC-SA-2.0 +CC-BY-NC-SA-2.0-FR +CC-BY-NC-SA-2.0-UK CC-BY-NC-SA-2.5 CC-BY-NC-SA-3.0 +CC-BY-NC-SA-3.0-DE +CC-BY-NC-SA-3.0-IGO CC-BY-NC-SA-4.0 CC-BY-ND-1.0 CC-BY-ND-2.0 CC-BY-ND-2.5 CC-BY-ND-3.0 +CC-BY-ND-3.0-DE CC-BY-ND-4.0 CC-BY-SA-1.0 CC-BY-SA-2.0 +CC-BY-SA-2.0-UK +CC-BY-SA-2.1-JP CC-BY-SA-2.5 CC-BY-SA-3.0 +CC-BY-SA-3.0-AT +CC-BY-SA-3.0-DE CC-BY-SA-4.0 +CC-PDDC +CC0-1.0 CDDL-1.0 CDDL-1.1 +CDL-1.0 CDLA-Permissive-1.0 +CDLA-Permissive-2.0 CDLA-Sharing-1.0 CECILL-1.0 CECILL-1.1 @@ -103,10 +135,15 @@ CECILL-B CECILL-C CERN-OHL-1.1 CERN-OHL-1.2 +CERN-OHL-P-2.0 +CERN-OHL-S-2.0 +CERN-OHL-W-2.0 ClArtistic CNRI-Jython CNRI-Python CNRI-Python-GPL-Compatible +COIL-1.0 +Community-Spec-1.0 Condor-1.1 copyleft-next-0.3.0 copyleft-next-0.3.1 @@ -120,8 +157,10 @@ Cube curl D-FSL-1.0 diffmark +DL-DE-BY-2.0 DOC Dotseqn +DRL-1.0 DSDP dvipdfm ECL-1.0 @@ -129,32 +168,51 @@ ECL-2.0 EFL-1.0 EFL-2.0 eGenix +Elastic-2.0 Entessa +EPICS EPL-1.0 EPL-2.0 ErlPL-1.1 +etalab-2.0 EUDatagrid EUPL-1.0 EUPL-1.1 EUPL-1.2 Eurosym Fair +FDK-AAC Frameworx-1.0 +FreeBSD-DOC FreeImage FSFAP FSFUL FSFULLR FTL +GD +GFDL-1.1-invariants-only +GFDL-1.1-invariants-or-later +GFDL-1.1-no-invariants-only +GFDL-1.1-no-invariants-or-later GFDL-1.1-only GFDL-1.1-or-later +GFDL-1.2-invariants-only +GFDL-1.2-invariants-or-later +GFDL-1.2-no-invariants-only +GFDL-1.2-no-invariants-or-later GFDL-1.2-only GFDL-1.2-or-later +GFDL-1.3-invariants-only +GFDL-1.3-invariants-or-later +GFDL-1.3-no-invariants-only +GFDL-1.3-no-invariants-or-later GFDL-1.3-only GFDL-1.3-or-later Giftware GL2PS Glide Glulxe +GLWTPL gnuplot GPL-1.0-only GPL-1.0-or-later @@ -164,8 +222,10 @@ GPL-3.0-only GPL-3.0-or-later gSOAP-1.3b HaskellReport +Hippocratic-2.1 HPND HPND-sell-variant +HTMLTIDY IBM-pibs ICU IJG @@ -179,6 +239,7 @@ Interbase-1.0 IPA IPL-1.0 ISC +Jam JasPer-2.0 JPNIC JSON @@ -195,10 +256,12 @@ LGPL-3.0-or-later LGPLLR Libpng libpng-2.0 +libselinux-1.0 libtiff LiLiQ-P-1.1 LiLiQ-R-1.1 LiLiQ-Rplus-1.1 +Linux-man-pages-copyleft Linux-OpenIB LPL-1.0 LPL-1.02 @@ -215,6 +278,8 @@ MIT-advertising MIT-CMU MIT-enna MIT-feh +MIT-Modern-Variant +MIT-open-group MITNFA Motosoto mpich2 @@ -225,17 +290,24 @@ MPL-2.0-no-copyleft-exception MS-PL MS-RL MTLL +MulanPSL-1.0 +MulanPSL-2.0 Multics Mup +NAIST-2003 NASA-1.3 Naumen NBPL-1.0 +NCGL-UK-2.0 NCSA -NetCDF Net-SNMP +NetCDF Newsletr NGPL +NIST-PD +NIST-PD-fallback NLOD-1.0 +NLOD-2.0 NLPL Nokia NOSL @@ -245,12 +317,21 @@ NPL-1.1 NPOSL-3.0 NRL NTP +NTP-0 +O-UDA-1.0 OCCT-PL OCLC-2.0 ODbL-1.0 ODC-By-1.0 OFL-1.0 +OFL-1.0-no-RFN +OFL-1.0-RFN OFL-1.1 +OFL-1.1-no-RFN +OFL-1.1-RFN +OGC-1.0 +OGDL-Taiwan-1.0 +OGL-Canada-2.0 OGL-UK-1.0 OGL-UK-2.0 OGL-UK-3.0 @@ -274,17 +355,23 @@ OLDAP-2.8 OML OpenSSL OPL-1.0 +OPUBL-1.0 OSET-PL-2.1 OSL-1.0 OSL-1.1 OSL-2.0 OSL-2.1 OSL-3.0 +Parity-6.0.0 +Parity-7.0.0 PDDL-1.0 PHP-3.0 PHP-3.01 Plexus +PolyForm-Noncommercial-1.0.0 +PolyForm-Small-Business-1.0.0 PostgreSQL +PSF-2.0 psfrag psutils Python-2.0 @@ -298,14 +385,17 @@ RPSL-1.0 RSA-MD RSCPL Ruby -Saxpath SAX-PD +Saxpath SCEA +SchemeReport Sendmail Sendmail-8.23 SGI-B-1.0 SGI-B-1.1 SGI-B-2.0 +SHL-0.5 +SHL-0.51 SimPL-2.0 SISSL SISSL-1.2 @@ -317,6 +407,9 @@ Spencer-86 Spencer-94 Spencer-99 SPL-1.0 +SSH-OpenSSH +SSH-short +SSPL-1.0 SugarCRM-1.1.3 SWL TAPR-OHL-1.0 @@ -327,6 +420,7 @@ TORQUE-1.1 TOSL TU-Berlin-1.0 TU-Berlin-2.0 +UCL-1.0 Unicode-DFS-2015 Unicode-DFS-2016 Unicode-TOU @@ -342,6 +436,7 @@ Watcom-1.0 Wsuipa WTFPL X11 +X11-distribute-modifications-variant Xerox XFree86-1.1 xinetd @@ -361,6 +456,9 @@ ZPL-2.0 ZPL-2.1 AGPL-1.0 AGPL-3.0 +BSD-2-Clause-FreeBSD +BSD-2-Clause-NetBSD +bzip2-1.0.5 eCos-2.0 GFDL-1.1 GFDL-1.2 -- cgit v1.2.1