From 6f84754927798552584877e79c9121e41fd045b7 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sat, 21 Oct 2017 15:13:56 -0700 Subject: [PATCH 01/11] Update identifiers and splits Signed-off-by: Gary O'Neall --- pull.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/pull.py b/pull.py index 880dca1..4d1a626 100755 --- a/pull.py +++ b/pull.py @@ -47,6 +47,20 @@ 'CC-BY-ND-3.0', 'CC-BY-ND-4.0', ], + 'CC-BY': [ # any version + 'CC-BY-1.0', + 'CC-BY-2.0', + 'CC-BY-2.5', + 'CC-BY-3.0', + 'CC-BY-4.0', + ], + 'CC-BY-SA': [ # any version + 'CC-BY-SA-1.0', + 'CC-BY-SA-2.0', + 'CC-BY-SA-2.5', + 'CC-BY-SA-3.0', + 'CC-BY-SA-4.0', + ], 'FDL': [ 'FDLv1.1', 'FDLv1.2', @@ -70,9 +84,21 @@ 'AcademicFreeLicense2.1': {'spdx': 'AFL-2.1'}, 'AcademicFreeLicense3.0': {'spdx': 'AFL-3.0'}, 'Aladdin': {'spdx': 'Aladdin'}, + 'apache1.1': {'spdx': 'Apache-1.1'}, + 'apache1': {'spdx': 'Apache-1.0'}, + 'apache2': {'spdx': 'Apache-2.0'}, + 'apsl1': {'spdx': 'APSL-1.0'}, + 'apsl2': {'spdx': 'APSL-2.0'}, 'ArtisticLicense': {'spdx': 'Artistic-1.0'}, 'ArtisticLicense2': {'spdx': 'Artistic-2.0'}, 'BerkeleyDB': {'spdx': 'Sleepycat'}, + 'bittorrent': {'spdx': 'BitTorrent-1.1'}, + 'boost': {'spdx': 'BSL-1.0'}, + 'CC-BY-1.0': {'spdx': 'CC-BY-1.0'}, + 'CC-BY-2.0': {'spdx': 'CC-BY-2.0'}, + 'CC-BY-2.5': {'spdx': 'CC-BY-2.5'}, + 'CC-BY-3.0': {'spdx': 'CC-BY-3.0'}, + 'CC-BY-4.0': {'spdx': 'CC-BY-4.0'}, 'CC-BY-NC-1.0': {'spdx': 'CC-BY-NC-1.0'}, 'CC-BY-NC-2.0': {'spdx': 'CC-BY-NC-2.0'}, 'CC-BY-NC-2.5': {'spdx': 'CC-BY-NC-2.5'}, @@ -83,6 +109,11 @@ 'CC-BY-ND-2.5': {'spdx': 'CC-BY-ND-2.5'}, 'CC-BY-ND-3.0': {'spdx': 'CC-BY-ND-3.0'}, 'CC-BY-ND-4.0': {'spdx': 'CC-BY-ND-4.0'}, + 'CC-BY-SA-1.0': {'spdx': 'CC-BY-SA-1.0'}, + 'CC-BY-SA-2.0': {'spdx': 'CC-BY-SA-2.0'}, + 'CC-BY-SA-2.5': {'spdx': 'CC-BY-SA-2.5'}, + 'CC-BY-SA-3.0': {'spdx': 'CC-BY-SA-3.0'}, + 'CC-BY-SA-4.0': {'spdx': 'CC-BY-SA-4.0'}, 'CC0': {'spdx': 'CC0-1.0'}, 'CDDL': {'spdx': 'CDDL-1.0'}, 'CPAL': {'spdx': 'CPAL-1.0'}, @@ -103,8 +134,21 @@ 'FDL1.2': {'spdx': 'GFDL-1.2'}, 'FDL1.3': {'spdx': 'GFDL-1.3'}, 'FreeBSD': {'spdx': 'BSD-2-Clause'}, + 'freetype': {'spdx': 'FTL'}, 'GNUAllPermissive': {'spdx': 'FSFAP'}, 'GNUGPLv3': {'spdx': 'GPL-3.0'}, + 'GPLv2': {'spdx': 'GPL-2.0'}, + 'HPND': {'spdx': 'HPND'}, + 'iMatix': {'spdx': 'iMatix'}, + 'ijg': {'spdx': 'IJG'}, + 'intel': {'spdx': 'Intel'}, + 'ISC': {'spdx': 'ISC'}, + 'LGPLv3': {'spdx': 'LGPL-3.0'}, + 'LGPLv2.1': {'spdx': 'LGPL-2.1'}, + 'ModifiedBSD': {'spdx': 'BSD-3-Clause'}, + 'MPL-2.0': {'spdx':'MPL-2.0'}, + 'NCSA': {'spdx':'NCSA'}, + # FIXME: still working through this } From 87db910b05af20c95129b0e75e6b0fd49fb3c811 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sat, 21 Oct 2017 17:22:19 -0700 Subject: [PATCH 02/11] Added identifiers up through the letter N Signed-off-by: Gary O'Neall --- pull.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pull.py b/pull.py index c62d8d1..3b024ba 100755 --- a/pull.py +++ b/pull.py @@ -71,7 +71,15 @@ 'FDLv1.2', 'FDLv1.3', ], + 'FreeArt': [ # any version + 'LAL-1.2', + 'LAL-1.3', + ], 'FreeBSDDL': ['FreeBSD'], # unify (multi-tag) + 'NPL': [ #any version + 'NPL-1.0', + 'NPL-1.1', + ], # FIXME: still working through this } @@ -121,9 +129,13 @@ 'CeCILL-B': {'spdx': 'CECILL-B'}, 'CeCILL-C': {'spdx': 'CECILL-C'}, 'ClarifiedArtistic': {'spdx': 'ClArtistic'}, + 'clearbsd': {'spdx': 'BSD-3-Clause-Clear'}, 'CommonPublicLicense10': {'spdx': 'CPL-1.0'}, + 'cpol': {'spdx': 'CPOL-1.02'}, 'Condor': {'spdx': 'Condor-1.1'}, 'ECL2.0': {'spdx': 'ECL-2.0'}, + 'eCos11': {'spdx': 'RHeCos-1.1'}, + 'eCos2.0': {'spdx': 'eCos-2.0'}, 'EPL': {'spdx': 'EPL-1.0'}, 'EPL2': {'spdx': 'EPL-2.0'}, # not in license-list-XML yet 'EUDataGrid': {'spdx': 'EUDatagrid'}, @@ -137,17 +149,37 @@ 'freetype': {'spdx': 'FTL'}, 'GNUAllPermissive': {'spdx': 'FSFAP'}, 'GNUGPLv3': {'spdx': 'GPL-3.0'}, + 'gnuplot': {'spdx': 'gnuplot'}, 'GPLv2': {'spdx': 'GPL-2.0'}, 'HPND': {'spdx': 'HPND'}, + 'IBMPL': {'spdx': 'IPL-1.0'}, 'iMatix': {'spdx': 'iMatix'}, + 'imlib': {'spdx': 'Imlib2'}, 'ijg': {'spdx': 'IJG'}, 'intel': {'spdx': 'Intel'}, + 'IPAFONT': {'spdx': 'IPA'}, 'ISC': {'spdx': 'ISC'}, + 'JSON': {'spdx': 'JSON'}, + 'LAL-1.2': {'spdx':'LAL-1.2'}, + 'LAL-1.3': {'spdx':'LAL-1.3'}, 'LGPLv3': {'spdx': 'LGPL-3.0'}, 'LGPLv2.1': {'spdx': 'LGPL-2.1'}, + 'LPPL-1.2': {'spdx': 'LPPL-1.2'}, + 'LPPL-1.3a': {'spdx': 'LPPL-1.3a'}, + 'lucent102': {'spdx': 'LPL-1.02'}, 'ModifiedBSD': {'spdx': 'BSD-3-Clause'}, + 'MPL': {'spdx': 'MPL-1.1'}, 'MPL-2.0': {'spdx':'MPL-2.0'}, + 'ms-pl': {'spdx': 'MPL-1.1'}, + 'ms-rl': {'spdx': 'MS-RL'}, + 'NASA': {'spdx': 'NASA-1.3'}, 'NCSA': {'spdx':'NCSA'}, + 'newOpenLDAP': {'spdx': 'OLDAP-2.7'}, + 'Nokia': {'spdx': 'Nokia'}, + 'NoLicense': {'spdx': 'UNSPECIFIED'}, + 'NOSL': {'spdx': 'NOSL'}, + 'NPL-1.0': {'spdx': 'NPL-1.0'}, + 'NPL-1.1': {'spdx': 'NPL-1.1'}, # FIXME: still working through this } From eb672a3a698ee818e10a13625a0d6d35fc4e3ea7 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 22 Oct 2017 10:47:21 -0700 Subject: [PATCH 03/11] Fix error for MS-PL spdx ID per pull request review --- pull.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pull.py b/pull.py index 3b024ba..fbb0b10 100755 --- a/pull.py +++ b/pull.py @@ -170,7 +170,7 @@ 'ModifiedBSD': {'spdx': 'BSD-3-Clause'}, 'MPL': {'spdx': 'MPL-1.1'}, 'MPL-2.0': {'spdx':'MPL-2.0'}, - 'ms-pl': {'spdx': 'MPL-1.1'}, + 'ms-pl': {'spdx': 'MS-PL'}, 'ms-rl': {'spdx': 'MS-RL'}, 'NASA': {'spdx': 'NASA-1.3'}, 'NCSA': {'spdx':'NCSA'}, From baf1bad8d91e6dbd05f3dc409acbee16a38f4fad Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 22 Oct 2017 10:47:56 -0700 Subject: [PATCH 04/11] Change NoLicense from NOASSERTION to NONE per pull request review comment --- pull.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pull.py b/pull.py index fbb0b10..f107215 100755 --- a/pull.py +++ b/pull.py @@ -176,7 +176,7 @@ 'NCSA': {'spdx':'NCSA'}, 'newOpenLDAP': {'spdx': 'OLDAP-2.7'}, 'Nokia': {'spdx': 'Nokia'}, - 'NoLicense': {'spdx': 'UNSPECIFIED'}, + 'NoLicense': {'spdx': 'NONE'}, 'NOSL': {'spdx': 'NOSL'}, 'NPL-1.0': {'spdx': 'NPL-1.0'}, 'NPL-1.1': {'spdx': 'NPL-1.1'}, From 74f396541abe3f265ad29154c24f78ff4933688b Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 22 Oct 2017 11:45:35 -0700 Subject: [PATCH 05/11] Add remaining license IDs and splits - please note the comments on the license IDs as some of these required judgement as to the associated SPDX license ID --- pull.py | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/pull.py b/pull.py index f107215..14cbe10 100755 --- a/pull.py +++ b/pull.py @@ -80,7 +80,31 @@ 'NPL-1.0', 'NPL-1.1', ], - # FIXME: still working through this + 'OSL': [ # any version through 3.0 + 'OSL-1.0', + 'OSL-1.1', + 'OSL-2.0', + 'OSL-2.1', + 'OSL-3.0', + ], + 'RPL': [ # any version - Note that FSF website does not state any version, but references version 1.3 in the URL. It is assumed that it also covers version 1.1 and 1.5, but this should be verified with FSF. + 'RPL-1.1', + 'RPL-1.3', + 'RPL-1.5', + ], + 'Unicode': [ # any version + 'Unicode-DFS-2015', + 'Unicode-DFS-2016', + ], + 'W3C': [ # any version + 'W3C', + 'W3C-20150513', + 'W3C-19980720', + ], + 'Zope2.0': [ # Versions 2.0 and later + 'ZPL-2.0', + 'ZPL-2.1', + ], } IDENTIFIERS = { @@ -180,6 +204,48 @@ 'NOSL': {'spdx': 'NOSL'}, 'NPL-1.0': {'spdx': 'NPL-1.0'}, 'NPL-1.1': {'spdx': 'NPL-1.1'}, + 'ODbl': {'spdx': 'ODbL-1.0'}, + 'oldOpenLDAP': {'spdx': 'OLDAP-2.7'}, + 'OpenPublicL': {'spdx': 'OPL-1.0'}, + 'OpenSSL': {'spdx': 'OpenSSL'}, + 'OriginalBSD': {'spdx': 'BSD-4-Clause'}, + 'OSL-1.0': {'spdx': 'OSL-1.0'}, + 'OSL-1.1': {'spdx': 'OSL-1.1'}, + 'OSL-2.0': {'spdx': 'OSL-2.0'}, + 'OSL-2.1': {'spdx': 'OSL-2.1'}, + 'OSL-3.0': {'spdx': 'OSL-3.0'}, + 'PHP-3.01': {'spdx': 'PHP-3.01'}, + 'Python': {'spdx': 'Python-2.0'}, # Note: references 'later versions which are not in the SPDX license list + 'QPL': {'spdx': 'QPL-1.0'}, + 'RPL-1.1': {'spdx': 'RPL-1.1'}, + 'RPL-1.5': {'spdx': 'RPL-1.5'}, + 'RPSL': {'spdx': 'RPSL-1.0'}, + 'Ruby': {'spdx': 'Ruby'}, # Note that the text linked is 'not an exact match to the SPDX license list + 'SGIFreeB': {'spdx': 'SGI-B-2.0'}, + 'SILOFL': {'spdx': 'OFL-1.1'}, + 'SISSL': {'spdx': 'SISSL'}, # Note that the header on the 'FSF website states version 1.0, but the link points to 'version 1.1. The SPDX license is version 1.1 + 'SPL': {'spdx': 'SPL-1.0'}, + 'StandardMLofNJ': {'spdx': 'SMLNJ'}, + 'Unicode-DFS-2015': {'spdx': 'Unicode-DFS-2015'}, + 'Unicode-DFS-2016': {'spdx': 'Unicode-DFS-2016'}, + 'Unlicense': {'spdx': 'Unlicense'}, + 'UPL': {'spdx': 'UPL-1.0'}, + 'Vim': {'spdx': 'Vim'}, + 'W3C': {'spdx': 'W3C'}, + 'W3C-20150513': {'spdx': 'W3C-20150513'}, + 'W3C-19980720': {'spdx': 'W3C-19980720'}, + 'Watcom': {'spdx': 'Watcom-1.0'}, + 'WTFPL': {'spdx': 'WTFPL'}, + 'X11License': {'spdx': 'X11'}, + 'XFree861.1License': {'spdx': 'XFree86-1.1'}, + 'xinetd': {'spdx': 'xinetd'}, + 'Yahoo': {'spdx': 'YPL-1.1'}, + 'Zend': {'spdx': 'Zend-2.0'}, + 'Zimbra': {'spdx': 'Zimbra-1.3'}, + 'ZLib': {'spdx': 'Zlib'}, + 'Zope': {'spdx': 'ZPL-1.1'}, # Note the FSF refers to version 1.0 and SPDX uses version 1.1 - it should be verified that 1.1 should be included + 'ZPL-2.0': {'spdx': 'ZPL-2.0'}, + 'ZPL-2.1': {'spdx': 'ZPL-2.1'}, # FIXME: still working through this } From 5e63316a9cd507323e98e40214fb361b4d18c5f7 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 22 Oct 2017 11:45:53 -0700 Subject: [PATCH 06/11] Add a list of unassociated SPDX license IDs --- unassociated-license-ids.md | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 unassociated-license-ids.md diff --git a/unassociated-license-ids.md b/unassociated-license-ids.md new file mode 100644 index 0000000..ba51b44 --- /dev/null +++ b/unassociated-license-ids.md @@ -0,0 +1,47 @@ +# The following FSF license tags did not have any obvious match to an SPDX license +* ACDL +* Arphic +* ATTPublicLicense +* CryptixGeneralLicense +* DOR +* dsl +* ecfonts +* GNUVerbatim +* GPL-PA +* GPLFonts- this may be an exception? +* GPLOther +* HESSLA +* informal +* Jahia +* josl +* ksh93 +* Lha +* Ms-SS +* PerlLicense - Not including due to the description on the FSF website does not seem to represent this license +RPL- References version 1.3 which is not in the SPDX license list. SPDX has versions 1.1 and 1.5 +* OculusRift +* OpenContentL +* OpenPublicationL +* PINE +* Plan9 +* PPL +* PublicDomain +* Phorum +* Python1.6a2 +* PythonOld +* Scilab +* Scratch +* SML +* Squeak +* SunCommunitySourceLicense +* SunSolarisSourceCode +* SystemC-3.0 +* Truecrypt-3.0 +* UtahPublicLicense +* WebM +* YaST + + + + + From 8cde30aea2358d886896623f9279bb14f46423e5 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 22 Oct 2017 11:50:32 -0700 Subject: [PATCH 07/11] Change ecos 2.0 SPDX identifier to a non-deprecated license expression --- pull.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pull.py b/pull.py index 14cbe10..49a3ee3 100755 --- a/pull.py +++ b/pull.py @@ -157,7 +157,7 @@ 'CommonPublicLicense10': {'spdx': 'CPL-1.0'}, 'cpol': {'spdx': 'CPOL-1.02'}, 'Condor': {'spdx': 'Condor-1.1'}, - 'ECL2.0': {'spdx': 'ECL-2.0'}, + 'ECL2.0': {'spdx': 'GPL-2.0 WITH eCos-exception-2.0'}, 'eCos11': {'spdx': 'RHeCos-1.1'}, 'eCos2.0': {'spdx': 'eCos-2.0'}, 'EPL': {'spdx': 'EPL-1.0'}, From e67963043dd73fd997dd3451ef08e42baab5a573 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 22 Oct 2017 11:50:32 -0700 Subject: [PATCH 08/11] Change ecos 2.0 SPDX identifier to a non-deprecated license expression --- pull.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pull.py b/pull.py index 14cbe10..77d8868 100755 --- a/pull.py +++ b/pull.py @@ -159,7 +159,7 @@ 'Condor': {'spdx': 'Condor-1.1'}, 'ECL2.0': {'spdx': 'ECL-2.0'}, 'eCos11': {'spdx': 'RHeCos-1.1'}, - 'eCos2.0': {'spdx': 'eCos-2.0'}, + 'eCos2.0': {'spdx': 'GPL-2.0+ WITH eCos-exception-2.0'}, 'EPL': {'spdx': 'EPL-1.0'}, 'EPL2': {'spdx': 'EPL-2.0'}, # not in license-list-XML yet 'EUDataGrid': {'spdx': 'EUDatagrid'}, From 2056ef4e3272c5b7f8d81e02e0aeddf2ba92acd4 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 22 Oct 2017 12:01:54 -0700 Subject: [PATCH 09/11] trying to clean up last commit - should fix incorrect ECL2.0 --- pull.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pull.py b/pull.py index 6afc97c..77d8868 100755 --- a/pull.py +++ b/pull.py @@ -157,7 +157,7 @@ 'CommonPublicLicense10': {'spdx': 'CPL-1.0'}, 'cpol': {'spdx': 'CPOL-1.02'}, 'Condor': {'spdx': 'Condor-1.1'}, - 'ECL2.0': {'spdx': 'GPL-2.0 WITH eCos-exception-2.0'}, + 'ECL2.0': {'spdx': 'ECL-2.0'}, 'eCos11': {'spdx': 'RHeCos-1.1'}, 'eCos2.0': {'spdx': 'GPL-2.0+ WITH eCos-exception-2.0'}, 'EPL': {'spdx': 'EPL-1.0'}, From e9b2687622f9d5809548e2a2104db044a370f4a5 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 22 Oct 2017 16:22:04 -0700 Subject: [PATCH 10/11] Take a more conservative approach and remove the more ambiguous license matches to the spdx license list and remove the unassociated-license-ids.md file per pull request review --- pull.py | 2 -- unassociated-license-ids.md | 47 ------------------------------------- 2 files changed, 49 deletions(-) delete mode 100644 unassociated-license-ids.md diff --git a/pull.py b/pull.py index 77d8868..55f1db5 100755 --- a/pull.py +++ b/pull.py @@ -220,7 +220,6 @@ 'RPL-1.1': {'spdx': 'RPL-1.1'}, 'RPL-1.5': {'spdx': 'RPL-1.5'}, 'RPSL': {'spdx': 'RPSL-1.0'}, - 'Ruby': {'spdx': 'Ruby'}, # Note that the text linked is 'not an exact match to the SPDX license list 'SGIFreeB': {'spdx': 'SGI-B-2.0'}, 'SILOFL': {'spdx': 'OFL-1.1'}, 'SISSL': {'spdx': 'SISSL'}, # Note that the header on the 'FSF website states version 1.0, but the link points to 'version 1.1. The SPDX license is version 1.1 @@ -243,7 +242,6 @@ 'Zend': {'spdx': 'Zend-2.0'}, 'Zimbra': {'spdx': 'Zimbra-1.3'}, 'ZLib': {'spdx': 'Zlib'}, - 'Zope': {'spdx': 'ZPL-1.1'}, # Note the FSF refers to version 1.0 and SPDX uses version 1.1 - it should be verified that 1.1 should be included 'ZPL-2.0': {'spdx': 'ZPL-2.0'}, 'ZPL-2.1': {'spdx': 'ZPL-2.1'}, diff --git a/unassociated-license-ids.md b/unassociated-license-ids.md deleted file mode 100644 index ba51b44..0000000 --- a/unassociated-license-ids.md +++ /dev/null @@ -1,47 +0,0 @@ -# The following FSF license tags did not have any obvious match to an SPDX license -* ACDL -* Arphic -* ATTPublicLicense -* CryptixGeneralLicense -* DOR -* dsl -* ecfonts -* GNUVerbatim -* GPL-PA -* GPLFonts- this may be an exception? -* GPLOther -* HESSLA -* informal -* Jahia -* josl -* ksh93 -* Lha -* Ms-SS -* PerlLicense - Not including due to the description on the FSF website does not seem to represent this license -RPL- References version 1.3 which is not in the SPDX license list. SPDX has versions 1.1 and 1.5 -* OculusRift -* OpenContentL -* OpenPublicationL -* PINE -* Plan9 -* PPL -* PublicDomain -* Phorum -* Python1.6a2 -* PythonOld -* Scilab -* Scratch -* SML -* Squeak -* SunCommunitySourceLicense -* SunSolarisSourceCode -* SystemC-3.0 -* Truecrypt-3.0 -* UtahPublicLicense -* WebM -* YaST - - - - - From eb9e7c322376f4d45860a826ad3e22257e35994d Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 22 Oct 2017 16:43:23 -0700 Subject: [PATCH 11/11] Correct tags for ccbysa and ccby --- pull.py | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/pull.py b/pull.py index 55f1db5..b37d874 100755 --- a/pull.py +++ b/pull.py @@ -47,20 +47,6 @@ 'CC-BY-ND-3.0', 'CC-BY-ND-4.0', ], - 'CC-BY': [ # any version - 'CC-BY-1.0', - 'CC-BY-2.0', - 'CC-BY-2.5', - 'CC-BY-3.0', - 'CC-BY-4.0', - ], - 'CC-BY-SA': [ # any version - 'CC-BY-SA-1.0', - 'CC-BY-SA-2.0', - 'CC-BY-SA-2.5', - 'CC-BY-SA-3.0', - 'CC-BY-SA-4.0', - ], 'FDL': [ 'FDLv1.1', 'FDLv1.2', @@ -126,11 +112,7 @@ 'BerkeleyDB': {'spdx': 'Sleepycat'}, 'bittorrent': {'spdx': 'BitTorrent-1.1'}, 'boost': {'spdx': 'BSL-1.0'}, - 'CC-BY-1.0': {'spdx': 'CC-BY-1.0'}, - 'CC-BY-2.0': {'spdx': 'CC-BY-2.0'}, - 'CC-BY-2.5': {'spdx': 'CC-BY-2.5'}, - 'CC-BY-3.0': {'spdx': 'CC-BY-3.0'}, - 'CC-BY-4.0': {'spdx': 'CC-BY-4.0'}, + 'ccby': {'spdx': 'CC-BY-4.0'}, 'CC-BY-NC-1.0': {'spdx': 'CC-BY-NC-1.0'}, 'CC-BY-NC-2.0': {'spdx': 'CC-BY-NC-2.0'}, 'CC-BY-NC-2.5': {'spdx': 'CC-BY-NC-2.5'}, @@ -141,11 +123,7 @@ 'CC-BY-ND-2.5': {'spdx': 'CC-BY-ND-2.5'}, 'CC-BY-ND-3.0': {'spdx': 'CC-BY-ND-3.0'}, 'CC-BY-ND-4.0': {'spdx': 'CC-BY-ND-4.0'}, - 'CC-BY-SA-1.0': {'spdx': 'CC-BY-SA-1.0'}, - 'CC-BY-SA-2.0': {'spdx': 'CC-BY-SA-2.0'}, - 'CC-BY-SA-2.5': {'spdx': 'CC-BY-SA-2.5'}, - 'CC-BY-SA-3.0': {'spdx': 'CC-BY-SA-3.0'}, - 'CC-BY-SA-4.0': {'spdx': 'CC-BY-SA-4.0'}, + 'ccbysa': {'spdx': 'CC-BY-SA-4.0'}, 'CC0': {'spdx': 'CC0-1.0'}, 'CDDL': {'spdx': 'CDDL-1.0'}, 'CPAL': {'spdx': 'CPAL-1.0'},