Skip to content

Commit b8640f7

Browse files
pombredannepombredanne
authored
Merge pull request #2871 from nexB/more-license-improvements
Improve license detection
2 parents e5f5d27 + 6dc4424 commit b8640f7

File tree

2,290 files changed

+7975
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,290 files changed

+7975
-98
lines changed

‎etc/scripts/licenses/buildrules.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,10 @@ def cli(licenses_file):
204204
relevance = rdata.data.get("relevance")
205205
rdata.data["has_stored_relevance"] = bool(relevance)
206206

207+
license_expression = rdata.data.get("license_expression")
208+
if license_expression:
209+
rdata.data["license_expression"] = license_expression.lower().strip()
210+
207211
minimum_coverage = rdata.data.get("minimum_coverage")
208212
rdata.data["has_stored_minimum_coverage"] = bool(minimum_coverage)
209213

@@ -226,7 +230,7 @@ def cli(licenses_file):
226230
text = rule.text()
227231

228232
existing_rule = rule_exists(text)
229-
skinny_text = " ".join(text[:80].split())
233+
skinny_text = " ".join(text[:80].split()).replace("{", " ").replace("}", " ")
230234

231235
existing_msg = (
232236
f"Skipping rule for: {base_name!r}, "

‎src/licensedcode/data/licenses/cc-by-3.0-at.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ text_urls:
1010
- https://creativecommons.org/licenses/by/3.0/at/legalcode
1111
faq_url: https://creativecommons.org/licenses/by/3.0/at/
1212
ignorable_urls:
13-
- https://creativecommons.org/
14-
13+
- https://creativecommons.org/

‎src/licensedcode/data/licenses/cc-by-sa-3.0-at.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ homepage_url: https://creativecommons.org/licenses/by-sa/3.0/at/legalcode
88
spdx_license_key: CC-BY-SA-3.0-AT
99
faq_url: https://creativecommons.org/licenses/by-sa/3.0/at/
1010
ignorable_urls:
11-
- https://creativecommons.org/
12-
- https://creativecommons.org/compatiblelicenses
13-
11+
- https://creativecommons.org/
12+
- https://creativecommons.org/compatiblelicenses

‎src/licensedcode/data/licenses/etalab-2.0.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
key: etalab-2.0
2-
language: en
3-
short_name: Etalab Open License 2.0 English
4-
name: Etalab Open License 2.0 English
2+
short_name: Etalab Open License 2.0
3+
name: Etalab Open License 2.0
54
category: Permissive
65
owner: DINUM
76
homepage_url: https://raw.githubusercontent.com/DISIC/politique-de-contribution-open-source/master/LICENSE

‎src/licensedcode/data/licenses/gitlab-ee.LICENSE‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
The GitLab Enterprise Edition (EE) license (the “EE License”)
2+
Copyright (c) 2011-present GitLab B.V.
3+
4+
With regard to the GitLab Software:
5+
6+
This software and associated documentation files (the "Software") may only be
7+
used in production, if you (and any entity that you represent) have agreed to,
8+
and are in compliance with, the GitLab Subscription Terms of Service, available
9+
at https://about.gitlab.com/terms/#subscription (the “EE Terms”), or other
10+
agreement governing the use of the Software, as agreed by you and GitLab,
11+
and otherwise have a valid GitLab Enterprise Edition subscription for the
12+
correct number of user seats. Subject to the foregoing sentence, you are free to
13+
modify this Software and publish patches to the Software. You agree that GitLab
14+
and/or its licensors (as applicable) retain all right, title and interest in and
15+
to all such modifications and/or patches, and all such modifications and/or
16+
patches may only be used, copied, modified, displayed, distributed, or otherwise
17+
exploited with a valid GitLab Enterprise Edition subscription for the correct
18+
number of user seats. Notwithstanding the foregoing, you may copy and modify
19+
the Software for development and testing purposes, without requiring a
20+
subscription. You agree that GitLab and/or its licensors (as applicable) retain
21+
all right, title and interest in and to all such modifications. You are not
22+
granted any other rights beyond what is expressly stated herein. Subject to the
23+
foregoing, it is forbidden to copy, merge, publish, distribute, sublicense,
24+
and/or sell the Software.
25+
26+
This EE License applies only to the part of this Software that is not
27+
distributed as part of GitLab Community Edition (CE). Any part of this Software
28+
distributed as part of GitLab CE or is served client-side as an image, font,
29+
cascading stylesheet (CSS), file which produces or is compiled, arranged,
30+
augmented, or combined into client-side JavaScript, in whole or in part, is
31+
copyrighted under the MIT Expat license. The full text of this EE License shall
32+
be included in all copies or substantial portions of the Software.
33+
34+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
35+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
36+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
37+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
38+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
39+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
40+
SOFTWARE.
41+
42+
For all third party components incorporated into the GitLab Software, those
43+
components are licensed under the original license provided by the owner of the
44+
applicable component.

‎src/licensedcode/data/licenses/gitlab-ee.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
key: gitlab-ee
2+
short_name: GitLab EE
3+
name: GitLab Enterprise Edition (EE) license
4+
category: Commercial
5+
owner: GitLab.org
6+
homepage_url: https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/LICENSE
7+
spdx_license_key: LicenseRef-scancode-gitlab-ee
8+
faq_url: https://docs.gitlab.com/ee/development/licensing.html
9+
ignorable_copyrights:
10+
- Copyright (c) 2011-present GitLab B.V.
11+
ignorable_holders:
12+
- GitLab B.V.
13+
ignorable_urls:
14+
- https://about.gitlab.com/terms/#subscription

‎src/licensedcode/data/licenses/jdbm-1.00.LICENSE‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
JDBM LICENSE v1.00
2+
3+
Redistribution and use of this software and associated documentation
4+
("Software"), with or without modification, are permitted provided
5+
that the following conditions are met:
6+
7+
1. Redistributions of source code must retain copyright
8+
statements and notices. Redistributions must also contain a
9+
copy of this document.
10+
11+
2. Redistributions in binary form must reproduce the
12+
above copyright notice, this list of conditions and the
13+
following disclaimer in the documentation and/or other
14+
materials provided with the distribution.
15+
16+
3. The name "JDBM" must not be used to endorse or promote
17+
products derived from this Software without prior written
18+
permission of Cees de Groot. For written permission,
19+
please contact cg@cdegroot.com.
20+
21+
4. Products derived from this Software may not be called "JDBM"
22+
nor may "JDBM" appear in their names without prior written
23+
permission of Cees de Groot.
24+
25+
5. Due credit should be given to the JDBM Project
26+
(http://jdbm.sourceforge.net/).
27+
28+
THIS SOFTWARE IS PROVIDED BY THE JDBM PROJECT AND CONTRIBUTORS
29+
``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
30+
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
31+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
32+
CEES DE GROOT OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
33+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
34+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
35+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
36+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
37+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
38+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
39+
OF THE POSSIBILITY OF SUCH DAMAGE.

‎src/licensedcode/data/licenses/jdbm-1.00.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
key: jdbm-1.00
2+
short_name: JDBM License v1.00
3+
name: JDBM License v1.00
4+
category: Permissive
5+
owner: JovalCM
6+
homepage_url: https://github.com/joval/jdbm/blob/master/LICENSE.txt
7+
spdx_license_key: LicenseRef-scancode-jdbm-1.00
8+
ignorable_urls:
9+
- http://jdbm.sourceforge.net/
10+
ignorable_emails:
11+
- cg@cdegroot.com

0 commit comments

Comments
 (0)