Skip to content

Commit db4f3a8

Browse files
Add license/rule modifications from SPDX 3.23
Reference: aboutcode-org/scancode-licensedb#49 Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent f70bbb7 commit db4f3a8

39 files changed

+591
-262
lines changed

src/licensedcode/data/licenses/bison-exception-2.0.LICENSE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ name: Bison exception to GPL 2.0 or later
55
category: Copyleft Limited
66
owner: Free Software Foundation (FSF)
77
is_exception: yes
8-
spdx_license_key: LicenseRef-scancode-bison-exception-2.0
8+
spdx_license_key: Bison-exception-1.24
9+
other_spdx_license_keys:
10+
- LicenseRef-scancode-bison-exception-2.0
911
faq_url: http://www.gnu.org/software/bison/manual/bison.html#Conditions
12+
other_urls:
13+
- https://github.com/arineng/rwhoisd/blob/master/rwhoisd/mkdb/y.tab.c#L180
1014
standard_notice: |
1115
This library is free software; you can redistribute it and/or modify it
1216
under the terms of the GNU General Public License as published by the Free

src/licensedcode/data/licenses/brian-gladman.LICENSE

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@ name: Brian Gladman License
55
category: Permissive
66
owner: Brian Gladman
77
homepage_url: http://www.gladman.me.uk/AES
8-
spdx_license_key: LicenseRef-scancode-brian-gladman
8+
spdx_license_key: Brian-Gladman-2-Clause
9+
other_spdx_license_keys:
10+
- LicenseRef-scancode-brian-gladman
911
text_urls:
1012
- http://gladman.plushost.co.uk/oldsite/AES/aes-src-12-09-11.zip
13+
other_urls:
14+
- https://web.mit.edu/kerberos/krb5-1.21/doc/mitK5license.html
15+
- https://github.com/krb5/krb5/blob/krb5-1.21.2-final/NOTICE#L140-L156
1116
---
1217

1318
The redistribution and use of this software (with or without changes)

src/licensedcode/data/licenses/bsd-simplified-darwin.LICENSE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ short_name: BSD Simplified Darwin
44
name: BSD Simplified Darwin
55
category: Permissive
66
owner: Ian Darwin
7-
spdx_license_key: LicenseRef-scancode-bsd-simplified-darwin
7+
spdx_license_key: BSD-2-Clause-Darwin
8+
other_spdx_license_keys:
9+
- LicenseRef-scancode-bsd-simplified-darwin
10+
other_urls:
11+
- https://github.com/file/file/blob/master/COPYING
812
---
913

1014
This software is not subject to any export provision of the United States

src/licensedcode/data/licenses/bsd-top.LICENSE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ owner: nexB
77
notes: |
88
This is a variant composed of clause 1 and 3 of a BSD-Modified and some
99
additional conditions on position and content of the notice
10-
spdx_license_key: LicenseRef-scancode-bsd-top
10+
spdx_license_key: BSD-Source-beginning-file
11+
other_spdx_license_keys:
12+
- LicenseRef-scancode-bsd-top
13+
other_urls:
14+
- https://github.com/lattera/freebsd/blob/master/sys/cam/cam.c#L4
1115
minimum_coverage: 70
1216
---
1317

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
key: caldera-no-preamble
3+
short_name: Caldera License (without preamble)
4+
name: Caldera License (without preamble)
5+
notes: |
6+
Added in SPDX license list 3.23
7+
This was previously the license rule: bsd-original_46.RULE
8+
spdx_license_key: Caldera-no-preamble
9+
other_urls:
10+
- https://github.com/apache/apr/blob/trunk/LICENSE#L298C6-L298C29
11+
---
12+
13+
Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
14+
15+
Redistribution and use in source and binary forms, with or without
16+
modification, are permitted provided that the following conditions are
17+
met:
18+
19+
Redistributions of source code and documentation must retain the above
20+
copyright notice, this list of conditions and the following disclaimer.
21+
22+
Redistributions in binary form must reproduce the above copyright
23+
notice, this list of conditions and the following disclaimer in the
24+
documentation and/or other materials provided with the distribution.
25+
26+
All advertising materials mentioning features or use of this software
27+
must display the following acknowledgement:
28+
29+
This product includes software developed or owned by Caldera
30+
International, Inc.
31+
32+
Neither the name of Caldera International, Inc. nor the names of other
33+
contributors may be used to endorse or promote products derived from
34+
this software without specific prior written permission.
35+
36+
USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
37+
INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED
38+
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
39+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
40+
NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
41+
INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
42+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
43+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
44+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
45+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
46+
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
47+
POSSIBILITY OF SUCH DAMAGE.

src/licensedcode/data/licenses/drl-1.1.LICENSE

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,27 @@ name: Detection Rule License (DRL) 1.1
55
category: Permissive
66
owner: Florian Roth
77
homepage_url: https://github.com/Neo23x0/signature-base/blob/master/LICENSE
8-
spdx_license_key: LicenseRef-scancode-drl-1.1
8+
spdx_license_key: DRL-1.1
9+
other_spdx_license_keys:
10+
- LicenseRef-scancode-drl-1.1
11+
other_urls:
12+
- https://github.com/SigmaHQ/Detection-Rule-License/blob/6ec7fbde6101d101b5b5d1fcb8f9b69fbc76c04a/LICENSE.Detection.Rules.md
913
---
1014

1115
Detection Rule License (DRL) 1.1
1216

13-
Permission is hereby granted, free of charge, to any person obtaining a copy
14-
of this rule set and associated documentation files (the "Rules"), to deal
15-
in the Rules without restriction, including without limitation the rights to
16-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
17-
of the Rules, and to permit persons to whom the Rules are furnished to do so,
18-
subject to the following conditions:
19-
20-
If you share the Rules (including in modified form), you must retain the
21-
following if it is supplied within the Rules:
22-
23-
1. identification of the authors(s) ("author" field) of the Rule and any
24-
others designated to receive attribution, in any reasonable manner
25-
requested by the Rule author (including by pseudonym if designated).
26-
27-
2. a URI or hyperlink to the Rule set or explicit Rule to the extent
28-
reasonably practicable
29-
30-
3. indicate the Rules are licensed under this Detection Rule License, and
31-
include the text of, or the URI or hyperlink to, this Detection Rule
32-
License to the extent reasonably practicable
33-
34-
If you use the Rules (including in modified form) on data, messages based on
35-
matches with the Rules must retain the following if it is supplied within the
36-
Rules:
37-
38-
1. identification of the authors(s) ("author" field) of the Rule and any
39-
others designated to receive attribution, in any reasonable manner
40-
requested by the Rule author (including by pseudonym if designated).
41-
42-
THE RULES ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
43-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
44-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
45-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
46-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
47-
OUT OF OR IN CONNECTION WITH THE RULES OR THE USE OR OTHER DEALINGS IN THE
48-
RULES.
17+
Permission is hereby granted, free of charge, to any person obtaining a copy of this rule set and associated documentation files (the "Rules"), to deal in the Rules without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Rules, and to permit persons to whom the Rules are furnished to do so, subject to the following conditions:
18+
19+
If you share the Rules (including in modified form), you must retain the following if it is supplied within the Rules:
20+
21+
identification of the authors(s) ("author" field) of the Rule and any others designated to receive attribution, in any reasonable manner requested by the Rule author (including by pseudonym if designated).
22+
23+
a URI or hyperlink to the Rule set or explicit Rule to the extent reasonably practicable
24+
25+
indicate the Rules are licensed under this Detection Rule License, and include the text of, or the URI or hyperlink to, this Detection Rule License to the extent reasonably practicable
26+
27+
If you use the Rules (including in modified form) on data, messages based on matches with the Rules must retain the following if it is supplied within the Rules:
28+
29+
identification of the authors(s) ("author" field) of the Rule and any others designated to receive attribution, in any reasonable manner requested by the Rule author (including by pseudonym if designated).
30+
31+
THE RULES ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 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 IN CONNECTION WITH THE RULES OR THE USE OR OTHER DEALINGS IN THE RULES.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
key: fsfap-no-warranty-disclaimer
3+
short_name: FSF All Permissive License (without Warranty)
4+
name: FSF All Permissive License (without Warranty)
5+
notes: |
6+
Added in SPDX license list 3.23
7+
This was previously the license rule: fsf-ap_3.RULE
8+
spdx_license_key: FSFAP-no-warranty-disclaimer
9+
other_urls:
10+
- https://git.savannah.gnu.org/cgit/wget.git/tree/util/trunc.c?h=v1.21.3&id=40747a11e44ced5a8ac628a41f879ced3e2ebce9#n6
11+
---
12+
13+
Copyright (C) 2008 Micah J. Cowan
14+
15+
Copying and distribution of this file, with or without modification,
16+
are permitted in any medium without royalty provided the copyright
17+
notice and this notice are preserved.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
key: gtkbook
3+
short_name: gtkbook License
4+
name: gtkbook License
5+
notes: |
6+
Added in SPDX license list 3.23
7+
This was previously the license rule: other-permissive_102.RULE
8+
spdx_license_key: gtkbook
9+
other_urls:
10+
- https://github.com/slogan621/gtkbook
11+
- https://github.com/oetiker/rrdtool-1.x/blob/master/src/plbasename.c#L8-L11
12+
---
13+
14+
Copyright 2005 Syd Logan, All Rights Reserved
15+
16+
This code is distributed without warranty. You are free to use
17+
this code for any purpose, however, if this code is republished or
18+
redistributed in its original form, as hardcopy or electronically,
19+
then you must include this copyright notice along with the code.

src/licensedcode/data/licenses/hdparm.LICENSE

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,22 @@ short_name: HDPARM License
44
name: HDPARM License
55
category: Permissive
66
owner: Unspecified
7-
spdx_license_key: LicenseRef-scancode-hdparm
7+
spdx_license_key: hdparm
8+
other_spdx_license_keys:
9+
- LicenseRef-scancode-hdparm
10+
other_urls:
11+
- https://github.com/Distrotech/hdparm/blob/4517550db29a91420fb2b020349523b1b4512df2/LICENSE.TXT
812
minimum_coverage: 90
913
ignorable_emails:
1014
- mlord@pobox.com
1115
---
1216

13-
You may freely use, modify, and redistribute the hdparm program, as either
14-
binary or source, or both.
17+
BSD-Style Open Source License:
1518

16-
The only condition is that my name and copyright notice remain in the source
17-
code as-is.
19+
You may freely use, modify, and redistribute the hdparm program,
20+
as either binary or source, or both.
21+
22+
The only condition is that my name and copyright notice
23+
remain in the source code as-is.
1824

1925
Mark Lord (mlord@pobox.com)
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
key: hpnd-inria-imag
3+
short_name: Historical Permission Notice and Disclaimer - INRIA-IMAG variant
4+
name: Historical Permission Notice and Disclaimer - INRIA-IMAG variant
5+
notes: |
6+
Added in SPDX license list 3.23
7+
This was previously the license rule: other-permissive_44.RULE
8+
spdx_license_key: HPND-INRIA-IMAG
9+
other_urls:
10+
- https://github.com/ppp-project/ppp/blob/master/pppd/ipv6cp.c#L75-L83
11+
---
12+
13+
This software is available with usual "research" terms with
14+
the aim of retain credits of the software. Permission to use,
15+
copy, modify and distribute this software for any purpose and
16+
without fee is hereby granted, provided that the above copyright
17+
notice and this permission notice appear in all copies, and
18+
the name of INRIA, IMAG, or any contributor not be used in
19+
advertising or publicity pertaining to this material without
20+
the prior explicit permission. The software is provided "as
21+
is" without any warranties, support or liabilities of any kind.

0 commit comments

Comments
 (0)