Skip to content

Commit

Permalink
Merge pull request #1963 from AyanSinhaMahapatra/license-updates-bugs
Browse files Browse the repository at this point in the history
Solve license detection bugs
  • Loading branch information
pombredanne authored Apr 2, 2020
2 parents 2a90d9f + 7984a2e commit a4b133f
Show file tree
Hide file tree
Showing 48 changed files with 205 additions and 56 deletions.
34 changes: 6 additions & 28 deletions src/licensedcode/data/rules/bsd-new_635.RULE
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
The framework is free software. It is released under the terms of
the following BSD License.
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
* Neither the name of nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.

2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/bsd-new_635.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
license_expression: bsd-new
is_license_text: yes
is_license_notice: yes
relevance: 100
29 changes: 29 additions & 0 deletions src/licensedcode/data/rules/bsd-new_696.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
The framework is free software. It is released under the terms of
the following BSD License.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
* Neither the name of nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
3 changes: 3 additions & 0 deletions src/licensedcode/data/rules/bsd-new_696.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
license_expression: bsd-new
is_license_text: yes
relevance: 100
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.

This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.

This program 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 General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */

/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton. Alternatively, if you modify or redistribute
the parser skeleton itself, you may (at your option) remove this
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.

This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
license_expression: bsd-new AND gpl-2.0-plus WITH bison-exception-2.2
is_license_notice: yes
minimum_coverage: 99
referenced_filenames:
- Copyright.txt
8 changes: 8 additions & 0 deletions src/licensedcode/data/rules/bzip2-libbzip-2010_18.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
" This program is free software; you can redistribute it and/or modify
" it under the terms set out in the LICENSE file, which is included
" in the bzip2-1.0.5 source distribution.

" This program 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
" LICENSE file for more details.
5 changes: 5 additions & 0 deletions src/licensedcode/data/rules/bzip2-libbzip-2010_18.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
license_expression: bzip2-libbzip-2010
is_license_notice: yes
relevance: 100
referenced_filenames:
- LICENSE
1 change: 1 addition & 0 deletions src/licensedcode/data/rules/gpl-2.0-plus_180.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
license_expression: gpl-2.0-plus
is_license_notice: yes
minimum_coverage: 80
22 changes: 21 additions & 1 deletion src/licensedcode/data/rules/gpl-2.0-plus_596.RULE
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
original code distributed under GPL V2 or later
This code was developed from version 2.1.1 of the Atmel drivers,
released by Atmel corp. under the GPL in December 2002. It also
includes code from the Linux aironet drivers (C) Benjamin Reed,
and the Linux PCMCIA package, (C) David Hinds.

For all queries about this code, please contact the current author,
Simon Kelley <simon@thekelleys.org.uk> and not Atmel Corporation.

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

This software 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 General Public License for more details.

You should have received a copy of the GNU General Public License
along with Atmel wireless lan drivers; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
9 changes: 9 additions & 0 deletions src/licensedcode/data/rules/gpl-2.0-plus_596.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
license_expression: gpl-2.0-plus
is_license_notice: yes
relevance: 100
ignorable_copyrights:
- (c) Benjamin Reed
- (c) David Hinds
ignorable_emails:
- simon@thekelleys.org.uk
ignorable_holders:
- Benjamin Reed
- David Hinds

1 change: 1 addition & 0 deletions src/licensedcode/data/rules/gpl-2.0-plus_624.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
original code distributed under GPL V2 or later
3 changes: 3 additions & 0 deletions src/licensedcode/data/rules/gpl-2.0-plus_624.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
license_expression: gpl-2.0-plus
is_license_notice: yes
relevance: 100
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/gpl-2.0_867.RULE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See the file `COPYING.GPLv2` for details.
* This code is distributed under the terms of GNU GPL v2
4 changes: 1 addition & 3 deletions src/licensedcode/data/rules/gpl-2.0_867.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
license_expression: gpl-2.0
is_license_reference: yes
is_license_notice: yes
relevance: 100
referenced_filenames:
- COPYING.GPLv2
1 change: 1 addition & 0 deletions src/licensedcode/data/rules/gpl-2.0_885.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
See the file `COPYING.GPLv2` for details.
5 changes: 5 additions & 0 deletions src/licensedcode/data/rules/gpl-2.0_885.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
license_expression: gpl-2.0
is_license_reference: yes
relevance: 100
referenced_filenames:
- COPYING.GPLv2
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
GNU is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.

As a special exception to the GNU Lesser General Public License,
if you distribute this file as part of a program or library that
is built using GNU, you may include this file under the
same distribution terms that you use for the rest of that program.

GNU 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 Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with GNU; see the file COPYING.LIB. If not, a
copy can be downloaded from http://www.gnu.org/licenses/lgpl.html,
or obtained by writing to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
license_expression: lgpl-2.0-plus WITH libtool-exception-2.0
is_license_notice: yes
minimum_coverage: 90
referenced_filenames:
- COPYING.LIB
ignorable_urls:
- http://www.gnu.org/licenses/lgpl.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
license_expression: lgpl-2.0-plus WITH wxwindows-exception-3.1
is_license_notice: yes
minimum_coverage: 60
10 changes: 1 addition & 9 deletions src/licensedcode/data/rules/not-a-license_428.RULE
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
There are certain libraries you can combine with FFmpeg whose licenses are not
compatible with the GPL and/or the LGPL. If you wish to enable these
libraries, even in circumstances that their license may be incompatible, pass
`--enable-nonfree` to configure. This will cause the resulting binary to be
unredistributable.

The Fraunhofer FDK AAC and OpenSSL libraries are under licenses which are
incompatible with the GPLv2 and v3. To the best of our knowledge, they are
compatible with the LGPL.
S5PC100_GPL2(0)
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/not-a-license_428.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
is_negative: yes
notes: FFmpeg commenst about external libraries licenses
notes: used in linux, GPIOlib support
5 changes: 2 additions & 3 deletions src/licensedcode/data/rules/not-a-license_429.RULE
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
Remember, libre != gratis; the open source license grants you the freedom to use
and modify, but not commitments of other people's time. Please be respectful,
and set your expectations accordingly.
.ngpio = S5PC100_GPIO_L2_NR,
.label = "GPL2",
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/not-a-license_429.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
is_negative: yes
notes: commetaries about open source licenses
notes: used in linux, GPIOlib support
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/not-a-license_430.RULE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Net-BSD style
S5PC100_GPL3(0)
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/not-a-license_430.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
is_negative: yes
notes: not a license
notes: used in linux, GPIOlib support
3 changes: 2 additions & 1 deletion src/licensedcode/data/rules/not-a-license_431.RULE
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
page mode ZPL
.ngpio = S5PC100_GPIO_L3_NR,
.label = "GPL3",
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/not-a-license_431.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
is_negative: yes
notes: this is cups zebra not zope
notes: used in linux, GPIOlib support
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/not-a-license_432.RULE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Zebra EPL
S5PC100_GPL1(0)
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/not-a-license_432.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
is_negative: yes
notes: this is cups zebra not zope
notes: used in linux, GPIOlib support
3 changes: 2 additions & 1 deletion src/licensedcode/data/rules/not-a-license_433.RULE
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Zebra ZPL
.ngpio = S5PC100_GPIO_L1_NR,
.label = "GPL1",
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/not-a-license_433.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
is_negative: yes
notes: this is cups zebra not zope
notes: used in linux, GPIOlib support
9 changes: 9 additions & 0 deletions src/licensedcode/data/rules/not-a-license_438.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
There are certain libraries you can combine with FFmpeg whose licenses are not
compatible with the GPL and/or the LGPL. If you wish to enable these
libraries, even in circumstances that their license may be incompatible, pass
`--enable-nonfree` to configure. This will cause the resulting binary to be
unredistributable.

The Fraunhofer FDK AAC and OpenSSL libraries are under licenses which are
incompatible with the GPLv2 and v3. To the best of our knowledge, they are
compatible with the LGPL.
2 changes: 2 additions & 0 deletions src/licensedcode/data/rules/not-a-license_438.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
is_negative: yes
notes: FFmpeg commenst about external libraries licenses
3 changes: 3 additions & 0 deletions src/licensedcode/data/rules/not-a-license_439.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Remember, libre != gratis; the open source license grants you the freedom to use
and modify, but not commitments of other people's time. Please be respectful,
and set your expectations accordingly.
2 changes: 2 additions & 0 deletions src/licensedcode/data/rules/not-a-license_439.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
is_negative: yes
notes: commetaries about open source licenses
1 change: 1 addition & 0 deletions src/licensedcode/data/rules/not-a-license_440.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Net-BSD style
2 changes: 2 additions & 0 deletions src/licensedcode/data/rules/not-a-license_440.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
is_negative: yes
notes: not a license
1 change: 1 addition & 0 deletions src/licensedcode/data/rules/not-a-license_441.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
page mode ZPL
2 changes: 2 additions & 0 deletions src/licensedcode/data/rules/not-a-license_441.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
is_negative: yes
notes: this is cups zebra not zope
1 change: 1 addition & 0 deletions src/licensedcode/data/rules/not-a-license_442.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Zebra EPL
2 changes: 2 additions & 0 deletions src/licensedcode/data/rules/not-a-license_442.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
is_negative: yes
notes: this is cups zebra not zope
1 change: 1 addition & 0 deletions src/licensedcode/data/rules/not-a-license_443.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Zebra ZPL
2 changes: 2 additions & 0 deletions src/licensedcode/data/rules/not-a-license_443.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
is_negative: yes
notes: this is cups zebra not zope

0 comments on commit a4b133f

Please sign in to comment.