Merge pull request #3936 from aboutcode-org/misc-updates

Apply miscellaneous license detection updates

Author: pombredanne

etc/scripts/licenses/buildrules.py

@@ -72,6 +72,7 @@ def __attrs_post_init__(self, *args, **kwargs):
             print(rdat)
             print("########################################################")
             raise
+        self.data = {k: v for k, v in self.data.items() if v is not None or (v is None and k == "license_expression")}
 
 
 def load_data(location="00-new-licenses.txt"):

src/licensedcode/data/licenses/mit-taylor-variant.LICENSE

@@ -9,13 +9,14 @@ other_spdx_license_keys:
     - LicenseRef-scancode-mit-taylor-variant
 other_urls:
     - https://github.com/pkgconf/pkgconf/blob/master/cli/main.c#L8
+notes: Originally from https://github.com/quinntaylor/CHDataStructures/blob/097c0e3f4d7ae1c24266d3d03434e07b9b76f3db/source/Util.h#L6C1-L9C1
 ---
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
 with or without fee is hereby granted, provided that the above copyright notice
 and this permission notice appear in all copies.
 
-The software is  provided "as is", without warranty of any kind, including all
+The software is provided "as is", without warranty of any kind, including all
 implied warranties of merchantability and fitness. In no event shall the authors
 or copyright holders be liable for any claim, damages, or other liability,
 whether in an action of contract, tort, or otherwise, arising from, out of, or

src/licensedcode/data/rules/agpl-3.0-plus_11.RULE

@@ -5,8 +5,8 @@ ignorable_urls:
     - http://www.gnu.org/licenses
 ---
 
-is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+is free software: you can redistribute it and/or modify it under the terms of the {{GNU Affero General Public License}} as published by the Free Software Foundation, {{either version 3 of the License, or (at your option) any later version.}}
 
  is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License along with . If not, see http://www.gnu.org/licenses/.
+You should have received a copy of the GNU Affero General Public License along with . If not, see http://www.gnu.org/licenses/.

src/licensedcode/data/rules/agpl-3.0-plus_161.RULE

@@ -7,5 +7,5 @@ referenced_filenames:
 ---
 
 This script is part of GNU Ghostscript and is distributed under
-the terms of the GNU Affero General Public License. See the file COPYING
-for more information.
+the terms of the {{GNU Affero General Public License.}} See the file COPYING
+for more information.