Skip to content

Commit 0c3e51e

Browse files
authored
Merge pull request #32 from Yurunsoft/update-3.8
Update to SPDX 3.7 & 3.8
2 parents 1aba277 + 76b8f2e commit 0c3e51e

File tree

2 files changed

+74
-3
lines changed

2 files changed

+74
-3
lines changed

res/spdx-exceptions.json

+6
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@
4747
"gnu-javamail-exception": [
4848
"GNU JavaMail exception"
4949
],
50+
"GPL-3.0-linking-exception": [
51+
"GPL-3.0 Linking Exception"
52+
],
53+
"GPL-3.0-linking-source-exception": [
54+
"GPL-3.0 Linking Exception (with Corresponding Source)"
55+
],
5056
"GPL-CC-1.0": [
5157
"GPL Cooperation Commitment 1.0"
5258
],

res/spdx-licenses.json

+68-3
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@
540540
false
541541
],
542542
"CERN-OHL-1.1": [
543-
"CERN Open Hardware License v1.1",
543+
"CERN Open Hardware Licence v1.1",
544544
false,
545545
false
546546
],
@@ -704,6 +704,11 @@
704704
false,
705705
false
706706
],
707+
"etalab-2.0": [
708+
"Etalab Open License 2.0",
709+
false,
710+
false
711+
],
707712
"EUDatagrid": [
708713
"EU DataGrid Software License",
709714
true,
@@ -1124,6 +1129,11 @@
11241129
false,
11251130
false
11261131
],
1132+
"libselinux-1.0": [
1133+
"libselinux public domain notice",
1134+
false,
1135+
false
1136+
],
11271137
"libtiff": [
11281138
"libtiff License",
11291139
false,
@@ -1190,7 +1200,7 @@
11901200
false
11911201
],
11921202
"MirOS": [
1193-
"MirOS License",
1203+
"The MirOS Licence",
11941204
true,
11951205
false
11961206
],
@@ -1201,7 +1211,7 @@
12011211
],
12021212
"MIT-0": [
12031213
"MIT No Attribution",
1204-
true,
1214+
false,
12051215
false
12061216
],
12071217
"MIT-advertising": [
@@ -1274,6 +1284,11 @@
12741284
false,
12751285
false
12761286
],
1287+
"MulanPSL-1.0": [
1288+
"Mulan Permissive Software License, Version 1",
1289+
false,
1290+
false
1291+
],
12771292
"Multics": [
12781293
"Multics License",
12791294
true,
@@ -1374,6 +1389,11 @@
13741389
true,
13751390
false
13761391
],
1392+
"NTP-0": [
1393+
"NTP No Attribution",
1394+
false,
1395+
false
1396+
],
13771397
"Nunit": [
13781398
"Nunit License",
13791399
false,
@@ -1404,11 +1424,36 @@
14041424
false,
14051425
false
14061426
],
1427+
"OFL-1.0-no-RFN": [
1428+
"SIL Open Font License 1.0 with no Reserved Font Name",
1429+
false,
1430+
false
1431+
],
1432+
"OFL-1.0-RFN": [
1433+
"SIL Open Font License 1.0 with Reserved Font Name",
1434+
false,
1435+
false
1436+
],
14071437
"OFL-1.1": [
14081438
"SIL Open Font License 1.1",
14091439
true,
14101440
false
14111441
],
1442+
"OFL-1.1-no-RFN": [
1443+
"SIL Open Font License 1.1 with no Reserved Font Name",
1444+
true,
1445+
false
1446+
],
1447+
"OFL-1.1-RFN": [
1448+
"SIL Open Font License 1.1 with Reserved Font Name",
1449+
true,
1450+
false
1451+
],
1452+
"OGL-Canada-2.0": [
1453+
"Open Government Licence - Canada",
1454+
false,
1455+
false
1456+
],
14121457
"OGL-UK-1.0": [
14131458
"Open Government Licence v1.0",
14141459
false,
@@ -1584,6 +1629,11 @@
15841629
true,
15851630
false
15861631
],
1632+
"PSF-2.0": [
1633+
"Python Software Foundation License 2.0",
1634+
false,
1635+
false
1636+
],
15871637
"psfrag": [
15881638
"psfrag License",
15891639
false,
@@ -1754,6 +1804,16 @@
17541804
true,
17551805
false
17561806
],
1807+
"SSH-OpenSSH": [
1808+
"SSH OpenSSH license",
1809+
false,
1810+
false
1811+
],
1812+
"SSH-short": [
1813+
"SSH short notice",
1814+
false,
1815+
false
1816+
],
17571817
"SSPL-1.0": [
17581818
"Server Side Public License, v 1",
17591819
false,
@@ -1814,6 +1874,11 @@
18141874
false,
18151875
false
18161876
],
1877+
"UCL-1.0": [
1878+
"Upstream Compatibility License v1.0",
1879+
true,
1880+
false
1881+
],
18171882
"Unicode-DFS-2015": [
18181883
"Unicode License Agreement - Data Files and Software (2015)",
18191884
false,

0 commit comments

Comments
 (0)