Merge branch 'fossdd-update-spdx' into 'master'

Update SPDX License List

See merge request fdroid/fdroidserver!867

fdroidserver/lint.py

@@ -682,9 +682,8 @@ APPROVED_LICENSES = [
     'Artistic-1.0-Perl',
     'Artistic-1.0-cl8',
     'Artistic-2.0',
-    'Beerware',
+    'BSD-1-Clause',
     'BSD-2-Clause',
-    'BSD-2-Clause-FreeBSD',
     'BSD-2-Clause-Patent',
     'BSD-3-Clause',
     'BSD-3-Clause-Clear',
@@ -692,6 +691,8 @@ APPROVED_LICENSES = [
     'BSD-4-Clause',
     'BSL-1.0',
     'BitTorrent-1.1',
+    'CAL-1.0',
+    'CAL-1.0-Combined-Work-Exception',
     'CATOSL-1.1',
     'CC-BY-4.0',
     'CC-BY-SA-4.0',
@@ -754,7 +755,6 @@ APPROVED_LICENSES = [
     'LiLiQ-Rplus-1.1',
     'MIT',
     'MIT-0',
-    'MIT-CMU',
     'MPL-1.0',
     'MPL-1.1',
     'MPL-2.0',
@@ -763,6 +763,7 @@ APPROVED_LICENSES = [
     'MS-RL',
     'MirOS',
     'Motosoto',
+    'MulanPSL-2.0',
     'Multics',
     'NASA-1.3',
     'NCSA',
@@ -778,9 +779,12 @@ APPROVED_LICENSES = [
     'ODbL-1.0',
     'OFL-1.0',
     'OFL-1.1',
+    'OFL-1.1-RFN',
+    'OFL-1.1-no-RFN',
     'OGTSL',
     'OLDAP-2.3',
     'OLDAP-2.7',
+    'OLDAP-2.8',
     'OSET-PL-2.1',
     'OSL-1.0',
     'OSL-1.1',
@@ -804,7 +808,9 @@ APPROVED_LICENSES = [
     'SPL-1.0',
     'SimPL-2.0',
     'Sleepycat',
+    'UCL-1.0',
     'UPL-1.0',
+    'Unicode-DFS-2016',
     'Unlicense',
     'VSL-1.0',
     'Vim',
@@ -814,7 +820,6 @@ APPROVED_LICENSES = [
     'X11',
     'XFree86-1.1',
     'Xnet',
-    'XSkat',
     'YPL-1.1',
     'ZPL-2.0',
     'ZPL-2.1',