From 18bca4c1e4546c47d1304932cad1894c6f329b1f Mon Sep 17 00:00:00 2001 From: manny martinez Date: Mon, 14 Dec 2020 10:12:23 -0800 Subject: [PATCH] Fixed the handling of GNU LGPL licenses --- index.js | 4 ++++ package.json | 5 +++-- test.js | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index c51a79f..5effafd 100644 --- a/index.js +++ b/index.js @@ -186,6 +186,10 @@ var transforms = [ .replace(/ (\d)/, '-$1') .replace(/ ?International/, '') + '-4.0' + }, + // e.g. 'GNU (LESSER GENERAL PUBLIC LICENSE | LGPL) + function (argument) { + return argument.replace(/GNU (lesser general public license|lgpl).*/gi, 'LGPL-3.0-or-later') } ] diff --git a/package.json b/package.json index c497ddd..cf6e4fa 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,14 @@ { "name": "spdx-correct", "description": "correct invalid SPDX expressions", - "version": "3.1.1", + "version": "3.1.2", "author": "Kyle E. Mitchell (https://kemitchell.com)", "contributors": [ "Kyle E. Mitchell (https://kemitchell.com)", "Christian Zommerfelds ", "Tal Einat ", - "Dan Butvinik " + "Dan Butvinik ", + "Emmanuel Martinez " ], "dependencies": { "spdx-expression-parse": "^3.0.0", diff --git a/test.js b/test.js index 0ce552e..333df34 100644 --- a/test.js +++ b/test.js @@ -193,8 +193,9 @@ var examples = { 'GNU General Public License': 'GPL-3.0-or-later', 'GNU General Public License, version 2': 'GPL-2.0-only', 'GNU General Public': 'GPL-3.0-or-later', - 'GNU LESSER GENERAL PUBLIC LICENSE': 'GPL-3.0-or-later', - 'GNU LGPL v3.0': 'GPL-3.0-or-later', + ' GNU Lesser General Public License v3 or later (LGPLv3+)': 'LGPL-3.0-or-later', + 'GNU LESSER GENERAL PUBLIC LICENSE': 'LGPL-3.0-or-later', + 'GNU LGPL v3.0': 'LGPL-3.0-or-later', 'GNU License v3': 'GPL-3.0-or-later', 'GNU V3': 'GPL-3.0-or-later', 'GNU v2': 'GPL-2.0-only',