config/license.map: new entries

1 files changed, 58 insertions, 2 deletions

diff --git a/config/license.map b/config/license.map
index bcaf168..db4c855 100644
--- a/config/license.map
+++ b/config/license.map
@@ -39,7 +39,13 @@ Boost-1.0 {
 }
 
 BSD {
+   bsd_3_clause
+   bsd3clauselicense
+}
+
+BSD-2 {
    freebsd
+   bsd_2_clause
 }
 
 CC0-1.0 {
@@ -49,10 +55,19 @@ CC0-1.0 {
 CC-BY-SA-3.0 {
    ccby-sa3.0us
 }
+
 CC-BY-SA-2.0 {
    ccbysa2.0
 }
 
+CC-BY-NC-SA-3.0 {
+   ccbyncsa3.0
+}
+
+CC-BY-NC-ND-3.0 {
+   ccbyncnd3.0us
+}
+
 || ( CC-BY-SA-3.0 CC-BY-NC-SA-3.0 ) {
    ccbysa3.0us|ccbyncsa3.0
 }
@@ -66,6 +81,10 @@ CPL-0.5 {
    commonpubliclicense1.0
 }
 
+CPL-1.0 {
+   cpl1.0
+}
+
 EPL-1.0 {
    epl
 }
@@ -92,20 +111,38 @@ GPL-2+ {
    gpl2ornewer
    gpl2ornewercopying.
    gpl2ornewer.thetermsofthislicenseareinafilecalledcopyingwhichisprovidedwithr.
+   gnugeneralpubliclicense>2
 }
 
 || ( GPL-2 Artistic-2 ) {
    gpl2|artistic2.0
 }
 
+|| ( BSD-2 GPL-2 ) {
+   freebsd|gpl2
+}
+
+|| ( BSD GPL-2 ) {
+   bsd|gpl2
+}
+
+|| ( GPL-2+ BSD-2 ) {
+   gpl>2|freebsd
+   bsd_2_clause|gpl>2
+}
+
 || ( GPL-2+ BSD ) {
    gpl>2|bsd
-   gpl>2|freebsd
+}
+
+GPL-1 {
+   gpl<2
 }
 
 GPL-3 {
    gpl3
    gpl3.0
+   gplv3
 }
 
 GPL-3+ {
@@ -114,7 +151,7 @@ GPL-3+ {
 }
 
 # gpl licenses without version:
-GPL-3+ {
+GPL-2+ {
    gnugeneralpubliclicense
    gnugeneralpubliclicensegpl
    gnugpl
@@ -122,6 +159,11 @@ GPL-3+ {
    gpl.
 }
 
+# FIXME: non-versioned license statement
+|| ( BSD GPL-2+ Apache-2.0 ) {
+   bsd|gpl|apachelicense
+}
+
 || ( GPL-3+ BSD ) {
    gpl|bsd
 }
@@ -134,6 +176,10 @@ GPL-3+ {
    gpl2|gpl3
 }
 
+|| ( GPL-2+ LGPL-3+ ) {
+   gpl>2|lgpl>3
+}
+
 LGPL-2 {
    lgpl2
 }
@@ -164,6 +210,14 @@ LGPL-3+ {
    lgpl
 }
 
+|| ( LGPL-2 LGPL-2.1 ) {
+   lgpl>2.0,<3
+}
+
+|| ( AGPL-3 GPL-1+ LGPL-2+ ) {
+   gnusomething
+}
+
 MIT {
    mitlicense
 }
@@ -182,7 +236,9 @@ MPL-1.1 {
 
 MPL-2.0 {
    mozillapubliclicense
+   mozillapubliclicense2.0
    mpl2.0
+   mpl>2.0
 }
 
 public-domain {