Merge d905419 into 9053f61

fossology · Jun 14, 2021 · 638ad37 · 638ad37
2 parents 9053f61 + d905419
commit 638ad37
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/nomos/agent/STRINGS.in b/src/nomos/agent/STRINGS.in
@@ -12209,6 +12209,10 @@ k
 %KEY% "(\<gnu|free\>|l?gpl)"
 %STR% "(lesser|library) (gpl|general public licen[cs]e)"
 #
+%ENTRY% _TEXT_MPLV2
+%KEY% "licen[cs]"
+%STR% "MPL.?([\/ -])?2(\.?0)?"
+#
 %ENTRY% _TEXT_LICSET
 %KEY% "licen[cs]"
 %STR% "(these licen[cs]es|this licen[cs]e set|set of licen[cs]es)"
@@ -12722,7 +12726,7 @@ k
 #
 %ENTRY% _URL_MPL_LATEST
 %KEY% "\<([mn]pl|mozilla|netscape)\>"
-%STR% "w?w?w?\.?mozilla\.?org/[MN]PL/ "
+%STR% "w?w?w?\.?mozilla\.?org/[MN]PL/"
 #
 %ENTRY% _URL_MPL10
 %KEY% "\<([mn]pl|mozilla|netscape)\>"
@@ -12734,7 +12738,7 @@ k
 #
 %ENTRY% _URL_MPL20
 %KEY% "\<([mn]pl|mozilla|netscape)\>"
-%STR% "w?w?w?\.?mozilla\.?org/[MN]PL/MPL-2\.?0"
+%STR% "w?w?w?\.?mozilla\.?org/[MN]PL/(MPL-)?2\.?0"
 #
 %ENTRY% _URL_MulanPSL
 %KEY% "licen[cs]"

diff --git a/src/nomos/agent/parse.c b/src/nomos/agent/parse.c
@@ -6831,7 +6831,11 @@ char *parseLicenses(char *filetext, int size, scanres_t *scp,
   }
   cleanLicenceBuffer();
   /* Mozilla Public License possibility */
-  if (!lmem[_mMPL] && URL_INFILE(_URL_MPL_LATEST)) {
+  if (!lmem[_mMPL] && INFILE(_TEXT_MPLV2) && INFILE(_URL_MPL20)) {
+      INTERESTING("MPL-2.0");
+      lmem[_mMPL] = 1;
+  }
+  else if (!lmem[_mMPL] && URL_INFILE(_URL_MPL_LATEST)) {
     INTERESTING(lDebug ? "MPL(latest)" : "MPL");
   }
   cleanLicenceBuffer();