Merge branch 'spdx-4.0' into 'master'

Spdx 4.0

See merge request fdroid/fdroidserver!501

fdroidserver/lint.py

@@ -561,95 +561,77 @@ def main():
 
 
 # A compiled, public domain list of official SPDX license tags from:
-# https://github.com/sindresorhus/spdx-license-list/blob/v3.0.1/spdx-simple.json
+# https://github.com/sindresorhus/spdx-license-list/blob/v4.0.0/spdx-simple.json
 # The deprecated license tags have been removed from the list, they are at the
 # bottom, starting after the last license tags that start with Z.
 # This is at the bottom, since its a long list of data
 SPDX = [
     "PublicDomain",  # an F-Droid addition, until we can enforce a better option
-    "Glide",
+    "0BSD",
+    "AAL",
     "Abstyles",
+    "Adobe-2006",
+    "Adobe-Glyph",
+    "ADSL",
     "AFL-1.1",
     "AFL-1.2",
     "AFL-2.0",
     "AFL-2.1",
     "AFL-3.0",
-    "AMPAS",
-    "APL-1.0",
-    "Adobe-Glyph",
-    "APAFML",
-    "Adobe-2006",
-    "AGPL-1.0",
     "Afmparse",
+    "AGPL-1.0",
+    "AGPL-3.0-only",
+    "AGPL-3.0-or-later",
     "Aladdin",
-    "ADSL",
     "AMDPLPA",
+    "AML",
+    "AMPAS",
     "ANTLR-PD",
     "Apache-1.0",
     "Apache-1.1",
     "Apache-2.0",
-    "AML",
+    "APAFML",
+    "APL-1.0",
     "APSL-1.0",
     "APSL-1.1",
     "APSL-1.2",
     "APSL-2.0",
-    "Artistic-1.0",
-    "Artistic-1.0-Perl",
     "Artistic-1.0-cl8",
+    "Artistic-1.0-Perl",
+    "Artistic-1.0",
     "Artistic-2.0",
-    "AAL",
     "Bahyph",
     "Barr",
     "Beerware",
     "BitTorrent-1.0",
     "BitTorrent-1.1",
-    "BSL-1.0",
     "Borceux",
-    "BSD-2-Clause",
+    "BSD-1-Clause",
     "BSD-2-Clause-FreeBSD",
     "BSD-2-Clause-NetBSD",
-    "BSD-3-Clause",
+    "BSD-2-Clause-Patent",
+    "BSD-2-Clause",
+    "BSD-3-Clause-Attribution",
     "BSD-3-Clause-Clear",
-    "BSD-3-Clause-No-Nuclear-License",
+    "BSD-3-Clause-LBNL",
     "BSD-3-Clause-No-Nuclear-License-2014",
+    "BSD-3-Clause-No-Nuclear-License",
     "BSD-3-Clause-No-Nuclear-Warranty",
+    "BSD-3-Clause",
+    "BSD-4-Clause-UC",
     "BSD-4-Clause",
     "BSD-Protection",
     "BSD-Source-Code",
-    "BSD-3-Clause-Attribution",
+    "BSL-1.0",
-    "0BSD",
-    "BSD-4-Clause-UC",
     "bzip2-1.0.5",
     "bzip2-1.0.6",
     "Caldera",
-    "CECILL-1.0",
-    "CECILL-1.1",
-    "CECILL-2.0",
-    "CECILL-2.1",
-    "CECILL-B",
-    "CECILL-C",
-    "ClArtistic",
-    "MIT-CMU",
-    "CNRI-Jython",
-    "CNRI-Python",
-    "CNRI-Python-GPL-Compatible",
-    "CPOL-1.02",
-    "CDDL-1.0",
-    "CDDL-1.1",
-    "CPAL-1.0",
-    "CPL-1.0",
     "CATOSL-1.1",
-    "Condor-1.1",
     "CC-BY-1.0",
     "CC-BY-2.0",
     "CC-BY-2.5",
     "CC-BY-3.0",
     "CC-BY-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-4.0",
     "CC-BY-NC-1.0",
     "CC-BY-NC-2.0",
     "CC-BY-NC-2.5",
@@ -665,12 +647,35 @@ SPDX = [
     "CC-BY-NC-SA-2.5",
     "CC-BY-NC-SA-3.0",
     "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-4.0",
     "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",
     "CC0-1.0",
+    "CDDL-1.0",
+    "CDDL-1.1",
+    "CDLA-Permissive-1.0",
+    "CDLA-Sharing-1.0",
+    "CECILL-1.0",
+    "CECILL-1.1",
+    "CECILL-2.0",
+    "CECILL-2.1",
+    "CECILL-B",
+    "CECILL-C",
+    "ClArtistic",
+    "CNRI-Jython",
+    "CNRI-Python-GPL-Compatible",
+    "CNRI-Python",
+    "Condor-1.1",
+    "CPAL-1.0",
+    "CPL-1.0",
+    "CPOL-1.02",
     "Crossword",
     "CrystalStacker",
     "CUA-OPL-1.0",
@@ -678,131 +683,142 @@ SPDX = [
     "curl",
     "D-FSL-1.0",
     "diffmark",
-    "WTFPL",
     "DOC",
     "Dotseqn",
     "DSDP",
     "dvipdfm",
-    "EPL-1.0",
     "ECL-1.0",
     "ECL-2.0",
-    "eGenix",
     "EFL-1.0",
     "EFL-2.0",
-    "MIT-advertising",
+    "eGenix",
-    "MIT-enna",
     "Entessa",
+    "EPL-1.0",
+    "EPL-2.0",
     "ErlPL-1.1",
     "EUDatagrid",
     "EUPL-1.0",
     "EUPL-1.1",
+    "EUPL-1.2",
     "Eurosym",
     "Fair",
-    "MIT-feh",
     "Frameworx-1.0",
     "FreeImage",
-    "FTL",
     "FSFAP",
     "FSFUL",
     "FSFULLR",
+    "FTL",
+    "GFDL-1.1-only",
+    "GFDL-1.1-or-later",
+    "GFDL-1.2-only",
+    "GFDL-1.2-or-later",
+    "GFDL-1.3-only",
+    "GFDL-1.3-or-later",
     "Giftware",
     "GL2PS",
+    "Glide",
     "Glulxe",
-    "AGPL-3.0",
-    "GFDL-1.1",
-    "GFDL-1.2",
-    "GFDL-1.3",
-    "GPL-1.0",
-    "GPL-2.0",
-    "GPL-3.0",
-    "LGPL-2.1",
-    "LGPL-3.0",
-    "LGPL-2.0",
     "gnuplot",
+    "GPL-1.0-only",
+    "GPL-1.0-or-later",
+    "GPL-2.0-only",
+    "GPL-2.0-or-later",
+    "GPL-3.0-only",
+    "GPL-3.0-or-later",
     "gSOAP-1.3b",
     "HaskellReport",
     "HPND",
     "IBM-pibs",
-    "IPL-1.0",
     "ICU",
+    "IJG",
     "ImageMagick",
     "iMatix",
     "Imlib2",
-    "IJG",
     "Info-ZIP",
     "Intel-ACPI",
     "Intel",
     "Interbase-1.0",
     "IPA",
+    "IPL-1.0",
     "ISC",
     "JasPer-2.0",
     "JSON",
+    "LAL-1.2",
+    "LAL-1.3",
+    "Latex2e",
+    "Leptonica",
+    "LGPL-2.0-only",
+    "LGPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-2.1-or-later",
+    "LGPL-3.0-only",
+    "LGPL-3.0-or-later",
+    "LGPLLR",
+    "Libpng",
+    "libtiff",
+    "LiLiQ-P-1.1",
+    "LiLiQ-R-1.1",
+    "LiLiQ-Rplus-1.1",
+    "LPL-1.0",
+    "LPL-1.02",
     "LPPL-1.0",
     "LPPL-1.1",
     "LPPL-1.2",
     "LPPL-1.3a",
     "LPPL-1.3c",
-    "Latex2e",
-    "BSD-3-Clause-LBNL",
-    "Leptonica",
-    "LGPLLR",
-    "Libpng",
-    "libtiff",
-    "LAL-1.2",
-    "LAL-1.3",
-    "LiLiQ-P-1.1",
-    "LiLiQ-Rplus-1.1",
-    "LiLiQ-R-1.1",
-    "LPL-1.02",
-    "LPL-1.0",
     "MakeIndex",
-    "MTLL",
-    "MS-PL",
-    "MS-RL",
     "MirOS",
-    "MITNFA",
+    "MIT-advertising",
+    "MIT-CMU",
+    "MIT-enna",
+    "MIT-feh",
     "MIT",
+    "MITNFA",
     "Motosoto",
+    "mpich2",
     "MPL-1.0",
     "MPL-1.1",
-    "MPL-2.0",
     "MPL-2.0-no-copyleft-exception",
-    "mpich2",
+    "MPL-2.0",
+    "MS-PL",
+    "MS-RL",
+    "MTLL",
     "Multics",
     "Mup",
     "NASA-1.3",
     "Naumen",
     "NBPL-1.0",
+    "NCSA",
     "Net-SNMP",
     "NetCDF",
-    "NGPL",
-    "NOSL",
-    "NPL-1.0",
-    "NPL-1.1",
     "Newsletr",
+    "NGPL",
+    "NLOD-1.0",
     "NLPL",
     "Nokia",
-    "NPOSL-3.0",
+    "NOSL",
-    "NLOD-1.0",
     "Noweb",
+    "NPL-1.0",
+    "NPL-1.1",
+    "NPOSL-3.0",
     "NRL",
     "NTP",
-    "Nunit",
+    "OCCT-PL",
     "OCLC-2.0",
     "ODbL-1.0",
-    "PDDL-1.0",
+    "OFL-1.0",
-    "OCCT-PL",
+    "OFL-1.1",
     "OGTSL",
-    "OLDAP-2.2.2",
     "OLDAP-1.1",
     "OLDAP-1.2",
     "OLDAP-1.3",
     "OLDAP-1.4",
-    "OLDAP-2.0",
     "OLDAP-2.0.1",
+    "OLDAP-2.0",
     "OLDAP-2.1",
-    "OLDAP-2.2",
     "OLDAP-2.2.1",
+    "OLDAP-2.2.2",
+    "OLDAP-2.2",
     "OLDAP-2.3",
     "OLDAP-2.4",
     "OLDAP-2.5",
@@ -810,14 +826,15 @@ SPDX = [
     "OLDAP-2.7",
     "OLDAP-2.8",
     "OML",
+    "OpenSSL",
     "OPL-1.0",
+    "OSET-PL-2.1",
     "OSL-1.0",
     "OSL-1.1",
     "OSL-2.0",
     "OSL-2.1",
     "OSL-3.0",
-    "OpenSSL",
+    "PDDL-1.0",
-    "OSET-PL-2.1",
     "PHP-3.0",
     "PHP-3.01",
     "Plexus",
@@ -825,62 +842,60 @@ SPDX = [
     "psfrag",
     "psutils",
     "Python-2.0",
-    "QPL-1.0",
     "Qhull",
+    "QPL-1.0",
     "Rdisc",
-    "RPSL-1.0",
+    "RHeCos-1.1",
     "RPL-1.1",
     "RPL-1.5",
-    "RHeCos-1.1",
+    "RPSL-1.0",
-    "RSCPL",
     "RSA-MD",
+    "RSCPL",
     "Ruby",
     "SAX-PD",
     "Saxpath",
     "SCEA",
-    "SWL",
-    "SMPPL",
     "Sendmail",
     "SGI-B-1.0",
     "SGI-B-1.1",
     "SGI-B-2.0",
-    "OFL-1.0",
-    "OFL-1.1",
     "SimPL-2.0",
+    "SISSL-1.2",
+    "SISSL",
     "Sleepycat",
+    "SMLNJ",
+    "SMPPL",
     "SNIA",
     "Spencer-86",
     "Spencer-94",
     "Spencer-99",
-    "SMLNJ",
-    "SugarCRM-1.1.3",
-    "SISSL",
-    "SISSL-1.2",
     "SPL-1.0",
-    "Watcom-1.0",
+    "SugarCRM-1.1.3",
+    "SWL",
     "TCL",
     "TCP-wrappers",
-    "Unlicense",
     "TMate",
     "TORQUE-1.1",
     "TOSL",
     "Unicode-DFS-2015",
     "Unicode-DFS-2016",
     "Unicode-TOU",
+    "Unlicense",
     "UPL-1.0",
-    "NCSA",
     "Vim",
     "VOSTROM",
     "VSL-1.0",
-    "W3C-20150513",
     "W3C-19980720",
+    "W3C-20150513",
     "W3C",
+    "Watcom-1.0",
     "Wsuipa",
-    "Xnet",
+    "WTFPL",
     "X11",
     "Xerox",
     "XFree86-1.1",
     "xinetd",
+    "Xnet",
     "xpp",
     "XSkat",
     "YPL-1.0",
@@ -889,8 +904,8 @@ SPDX = [
     "Zend-2.0",
     "Zimbra-1.3",
     "Zimbra-1.4",
-    "Zlib",
     "zlib-acknowledgement",
+    "Zlib",
     "ZPL-1.1",
     "ZPL-2.0",
     "ZPL-2.1",

tests/metadata-rewrite-yml/app.with.special.build.params.yml

@@ -2,7 +2,7 @@ AntiFeatures:
   - UpstreamNonFree
 Categories:
   - System
-License: GPL-3.0
+License: GPL-3.0-only
 SourceCode: https://github.com/loadrunner/Facebook-Contact-Sync
 IssueTracker: https://github.com/loadrunner/Facebook-Contact-Sync/issues
 

tests/metadata-rewrite-yml/org.fdroid.fdroid.yml

@@ -1,6 +1,6 @@
 Categories:
   - System
-License: GPL-3.0+
+License: GPL-3.0-or-later
 WebSite: https://f-droid.org
 SourceCode: https://gitlab.com/fdroid/fdroidclient
 IssueTracker: https://gitlab.com/fdroid/fdroidclient/issues

tests/metadata/app.with.special.build.params.txt

@@ -1,6 +1,6 @@
 AntiFeatures:UpstreamNonFree
 Categories:System
-License:GPL-3.0
+License:GPL-3.0-only
 Web Site:
 Source Code:https://github.com/loadrunner/Facebook-Contact-Sync
 Issue Tracker:https://github.com/loadrunner/Facebook-Contact-Sync/issues

tests/metadata/com.politedroid.txt

@@ -1,5 +1,5 @@
 Categories:Time
-License:GPL-3.0
+License:GPL-3.0-only
 Web Site:
 Source Code:https://github.com/miguelvps/PoliteDroid
 Issue Tracker:https://github.com/miguelvps/PoliteDroid/issues

tests/metadata/dump/com.politedroid.yaml

@@ -18,7 +18,7 @@ Donate: null
 FlattrID: null
 IssueTracker: https://github.com/miguelvps/PoliteDroid/issues
 LiberapayID: null
-License: GPL-3.0
+License: GPL-3.0-only
 Litecoin: null
 MaintainerNotes: ''
 Name: null

tests/metadata/dump/org.adaway.yaml

@@ -41,7 +41,7 @@ Donate: http://sufficientlysecure.org/index.php/adaway
 FlattrID: '369138'
 IssueTracker: https://github.com/dschuermann/ad-away/issues
 LiberapayID: null
-License: GPL-3.0
+License: GPL-3.0-only
 Litecoin: null
 MaintainerNotes: ''
 Name: null

tests/metadata/dump/org.smssecure.smssecure.yaml

@@ -38,7 +38,7 @@ Donate: null
 FlattrID: null
 IssueTracker: https://github.com/SMSSecure/SMSSecure/issues
 LiberapayID: null
-License: GPL-3.0
+License: GPL-3.0-only
 Litecoin: null
 MaintainerNotes: ''
 Name: null

tests/metadata/dump/org.videolan.vlc.yaml

@@ -25,7 +25,7 @@ Donate: http://www.videolan.org/contribute.html#money
 FlattrID: null
 IssueTracker: http://www.videolan.org/support/index.html#bugs
 LiberapayID: null
-License: GPL-3.0
+License: GPL-3.0-only
 Litecoin: null
 MaintainerNotes: 'Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile
 

tests/metadata/info.guardianproject.checkey.txt

@@ -1,5 +1,5 @@
 Categories:Development,GuardianProject
-License:GPL-3.0
+License:GPL-3.0-only
 Web Site:https://dev.guardianproject.info/projects/checkey
 Source Code:https://github.com/guardianproject/checkey
 Issue Tracker:https://dev.guardianproject.info/projects/checkey/issues

tests/metadata/info.guardianproject.urzip.yml

@@ -18,7 +18,7 @@ Description: |
   ★ 致用户：我们还缺少你喜欢的功能？发现了一个 bug？请告诉我们！我们乐于听取您的意见。请发送电子邮件至: support@guardianproject.info 或者加入我们的聊天室 https://guardianproject.info/contact
 
 IssueTracker: https://dev.guardianproject.info/projects/urzip/issues
-License: GPL-3.0
+License: GPL-3.0-only
 Repo: https://github.com/guardianproject/urzip.git
 RepoType: git
 SourceCode: https://github.com/guardianproject/urzip

tests/metadata/obb.main.oldversion.txt

@@ -1,5 +1,5 @@
 Categories:Development
-License:GPL-3.0
+License:GPL-3.0-only
 Source Code:https://github.com/eighthave/urzip
 Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
 

tests/metadata/obb.main.twoversions.txt

@@ -1,5 +1,5 @@
 Categories:Development
-License:GPL-3.0
+License:GPL-3.0-only
 Source Code:https://github.com/eighthave/urzip
 Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
 

tests/metadata/obb.mainpatch.current.txt

@@ -1,5 +1,5 @@
 Categories:Development
-License:GPL-3.0
+License:GPL-3.0-only
 Source Code:https://github.com/eighthave/urzip
 Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
 

tests/metadata/org.adaway.json

@@ -22,7 +22,7 @@
     "Donate": "http://sufficientlysecure.org/index.php/adaway",
     "FlattrID": "369138",
     "IssueTracker": "https://github.com/dschuermann/ad-away/issues",
-    "License": "GPL-3.0",
+    "License": "GPL-3.0-only",
     "Provides": "org.sufficientlysecure.adaway",
     "Repo": "https://github.com/dschuermann/ad-away.git",
     "RepoType": "git",

tests/metadata/org.fdroid.fdroid.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:GPL-3.0+
+License:GPL-3.0-or-later
 Web Site:https://f-droid.org
 Source Code:https://gitlab.com/fdroid/fdroidclient
 Issue Tracker:https://gitlab.com/fdroid/fdroidclient/issues

tests/metadata/org.smssecure.smssecure.txt

@@ -1,5 +1,5 @@
 Categories:Phone & SMS
-License:GPL-3.0
+License:GPL-3.0-only
 Web Site:http://www.smssecure.org
 Source Code:https://github.com/SMSSecure/SMSSecure
 Issue Tracker:https://github.com/SMSSecure/SMSSecure/issues

tests/metadata/org.videolan.vlc.yml

@@ -1,6 +1,6 @@
 Categories:
   - Multimedia
-License: GPL-3.0
+License: GPL-3.0-only
 WebSite: http://www.videolan.org/vlc/download-android.html
 SourceCode: http://git.videolan.org/?p=vlc-ports/android.git;a=summary
 IssueTracker: "http://www.videolan.org/support/index.html#bugs"

tests/metadata/souch.smsbypass.txt

@@ -1,5 +1,5 @@
 Categories:Phone & SMS
-License:GPL-3.0
+License:GPL-3.0-only
 Web Site:https://gitlab.com/souch/SMSbypass
 Source Code:https://gitlab.com/souch/SMSbypass/tree/HEAD
 Issue Tracker:https://gitlab.com/souch/SMSbypass/issues

tests/repo/index-v1.json

@@ -31,7 +31,7 @@
       "donate": "http://rodolphe.souchaud.free.fr/donate",
       "flattrID": "cad90e036b975ed129a3ce80a0750466",
       "issueTracker": "https://gitlab.com/souch/SMSbypass/issues",
-      "license": "GPL-3.0",
+      "license": "GPL-3.0-only",
       "name": "Battery level",
       "sourceCode": "https://gitlab.com/souch/SMSbypass/tree/HEAD",
       "summary": "Filter SMS and show them in a fake app",
@@ -78,7 +78,7 @@
         "Development"
       ],
       "suggestedVersionCode": "99999999",
-      "license": "GPL-3.0",
+      "license": "GPL-3.0-only",
       "name": "OBB Main Old Version",
       "sourceCode": "https://github.com/eighthave/urzip",
       "added": 1388448000000,
@@ -92,7 +92,7 @@
         "Development"
       ],
       "suggestedVersionCode": "99999999",
-      "license": "GPL-3.0",
+      "license": "GPL-3.0-only",
       "name": "OBB Main Two Versions",
       "sourceCode": "https://github.com/eighthave/urzip",
       "added": 1444608000000,
@@ -106,7 +106,7 @@
         "Development"
       ],
       "suggestedVersionCode": "99999999",
-      "license": "GPL-3.0",
+      "license": "GPL-3.0-only",
       "name": "OBB Main/Patch Current",
       "sourceCode": "https://github.com/eighthave/urzip",
       "added": 1461369600000,
@@ -134,7 +134,7 @@
       "suggestedVersionCode": "6",
       "description": "<p>Activates silent mode during calendar events.</p>",
       "issueTracker": "https://github.com/miguelvps/PoliteDroid/issues",
-      "license": "GPL-3.0",
+      "license": "GPL-3.0-only",
       "name": "Polite Droid",
       "sourceCode": "https://github.com/miguelvps/PoliteDroid",
       "summary": "Calendar tool",
@@ -155,7 +155,7 @@
       "suggestedVersionCode": "2147483647",
       "description": "<p>It\u2019s Urzip \u662f\u4e00\u4e2a\u83b7\u5f97\u5df2\u5b89\u88c5 APK \u76f8\u5173\u4fe1\u606f\u7684\u5b9e\u7528\u5de5\u5177\u3002\u5b83\u4ece\u60a8\u7684\u8bbe\u5907\u4e0a\u5df2\u5b89\u88c5\u7684\u6240\u6709\u5e94\u7528\u5f00\u59cb\uff0c\u4e00\u952e\u89e6\u6478\u5373\u53ef\u663e\u793a APK \u7684\u6307\u7eb9\uff0c\u5e76\u4e14\u63d0\u4f9b\u5230\u8fbe virustotal.com \u548c androidobservatory.org \u7684\u5feb\u6377\u94fe\u63a5\uff0c\u8ba9\u60a8\u65b9\u4fbf\u5730\u4e86\u89e3\u7279\u5b9a APK \u7684\u6863\u6848\u3002\u5b83\u8fd8\u53ef\u4ee5\u8ba9\u60a8\u5bfc\u51fa\u7b7e\u540d\u8bc1\u4e66\u548c\u751f\u6210 ApkSignaturePin Pin \u6587\u4ef6\u4f9b TrustedIntents \u5e93\u4f7f\u7528\u3002</p><p>\u2605 Urzip \u652f\u6301\u4e0b\u5217\u8bed\u8a00\uff1a Deutsch, English, espa\u00f1ol, suomi, \u65e5\u672c\u8a9e, \ud55c\uad6d\uc5b4, Norsk, portugu\u00eas (Portugal), \u0420\u0443\u0441\u0441\u043a\u0438\u0439, Sloven\u0161\u010dina, T\u00fcrk\u00e7e \u6ca1\u770b\u5230\u60a8\u7684\u8bed\u8a00\uff1f\u5e2e\u5fd9\u7ffb\u8bd1\u672c\u5e94\u7528\u5427\uff1a https://www.transifex.com/projects/p/urzip</p><p>\u2605 \u81f4\u7528\u6237\uff1a\u6211\u4eec\u8fd8\u7f3a\u5c11\u4f60\u559c\u6b22\u7684\u529f\u80fd\uff1f\u53d1\u73b0\u4e86\u4e00\u4e2a bug\uff1f\u8bf7\u544a\u8bc9\u6211\u4eec\uff01\u6211\u4eec\u4e50\u4e8e\u542c\u53d6\u60a8\u7684\u610f\u89c1\u3002\u8bf7\u53d1\u9001\u7535\u5b50\u90ae\u4ef6\u81f3: support@guardianproject.info \u6216\u8005\u52a0\u5165\u6211\u4eec\u7684\u804a\u5929\u5ba4 https://guardianproject.info/contact</p>",
       "issueTracker": "https://dev.guardianproject.info/projects/urzip/issues",
-      "license": "GPL-3.0",
+      "license": "GPL-3.0-only",
       "name": "urzip-\u03c0\u00c7\u00c7\u03c0\u00c7\u00c7\u73b0\u4ee3\u6c49\u8bed\u901a\u7528\u5b57-\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438-\u0639\u0631\u0628\u064a1234",
       "sourceCode": "https://github.com/guardianproject/urzip",
       "summary": "\u4e00\u4e2a\u5b9e\u7528\u5de5\u5177\uff0c\u83b7\u53d6\u5df2\u5b89\u88c5\u5728\u60a8\u7684\u8bbe\u5907\u4e0a\u7684\u5e94\u7528\u7684\u6709\u5173\u4fe1\u606f",

tests/repo/index.xml

@@ -16,7 +16,7 @@
 		<summary>Filter SMS and show them in a fake app</summary>
 		<icon>souch.smsbypass.9.png</icon>
 		<desc>&lt;p&gt;In order to keep away curious eyes, SMS-bypass filters incoming SMS messages before they reach your inbox. Based on bughunter2.smsfilter.&lt;/p&gt;&lt;p&gt;Features:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Discrete fake app &quot;Battery level&quot;: Long tap on Battery percentage will show SMS.&lt;/li&gt;&lt;li&gt; Filter incoming SMS specified address: redirect the SMS to SMS-bypass messages list; remove SMS arrival sound or vibration; show a discreet notification icon (battery level); vibrate if checked in settings&lt;/li&gt;&lt;li&gt; Add contact from contact list&lt;/li&gt;&lt;li&gt; Export messages to a text file&lt;/li&gt;&lt;/ul&gt;</desc>
-		<license>GPL-3.0</license>
+		<license>GPL-3.0-only</license>
 		<categories>Phone &amp; SMS</categories>
 		<category>Phone &amp; SMS</category>
 		<web>https://gitlab.com/souch/SMSbypass</web>
@@ -103,7 +103,7 @@
 		<summary></summary>
 		<icon>obb.main.oldversion.1444412523.png</icon>
 		<desc>&lt;p&gt;No description available&lt;/p&gt;</desc>
-		<license>GPL-3.0</license>
+		<license>GPL-3.0-only</license>
 		<categories>Development</categories>
 		<category>Development</category>
 		<web></web>
@@ -138,7 +138,7 @@
 		<summary></summary>
 		<icon>obb.main.twoversions.1101617.png</icon>
 		<desc>&lt;p&gt;No description available&lt;/p&gt;</desc>
-		<license>GPL-3.0</license>
+		<license>GPL-3.0-only</license>
 		<categories>Development</categories>
 		<category>Development</category>
 		<web></web>
@@ -196,7 +196,7 @@
 		<summary></summary>
 		<icon>obb.mainpatch.current.1619.png</icon>
 		<desc>&lt;p&gt;No description available&lt;/p&gt;</desc>
-		<license>GPL-3.0</license>
+		<license>GPL-3.0-only</license>
 		<categories>Development</categories>
 		<category>Development</category>
 		<web></web>
@@ -229,7 +229,7 @@
 		<summary>Calendar tool</summary>
 		<icon>com.politedroid.6.png</icon>
 		<desc>&lt;p&gt;Activates silent mode during calendar events.&lt;/p&gt;</desc>
-		<license>GPL-3.0</license>
+		<license>GPL-3.0-only</license>
 		<categories>Time</categories>
 		<category>Time</category>
 		<web></web>
@@ -294,7 +294,7 @@
 		<summary>一个实用工具，获取已安装在您的设备上的应用的有关信息</summary>
 		<icon>info.guardianproject.urzip.100.png</icon>
 		<desc>&lt;p&gt;It’s Urzip 是一个获得已安装 APK 相关信息的实用工具。它从您的设备上已安装的所有应用开始，一键触摸即可显示 APK 的指纹，并且提供到达 virustotal.com 和 androidobservatory.org 的快捷链接，让您方便地了解特定 APK 的档案。它还可以让您导出签名证书和生成 ApkSignaturePin Pin 文件供 TrustedIntents 库使用。&lt;/p&gt;&lt;p&gt;★ Urzip 支持下列语言： Deutsch, English, español, suomi, 日本語, 한국어, Norsk, português (Portugal), Русский, Slovenščina, Türkçe 没看到您的语言？帮忙翻译本应用吧： https://www.transifex.com/projects/p/urzip&lt;/p&gt;&lt;p&gt;★ 致用户：我们还缺少你喜欢的功能？发现了一个 bug？请告诉我们！我们乐于听取您的意见。请发送电子邮件至: support@guardianproject.info 或者加入我们的聊天室 https://guardianproject.info/contact&lt;/p&gt;</desc>
-		<license>GPL-3.0</license>
+		<license>GPL-3.0-only</license>
 		<categories>Development,GuardianProject,1,2.0</categories>
 		<category>Development</category>
 		<web>https://dev.guardianproject.info/projects/urzip</web>

tests/run-tests

@@ -591,7 +591,7 @@ REPOROOT=`create_test_dir`
 cd $REPOROOT
 mkdir repo
 mkdir metadata
-echo "License:GPL-2.0" >> metadata/fake.txt
+echo "License:GPL-2.0-only" >> metadata/fake.txt
 echo "Summary:Yup still fake" >> metadata/fake.txt
 echo "Categories:Internet" >> metadata/fake.txt
 echo "Description:" >> metadata/fake.txt