Skip to content

feat(licenses): creative commons detection rewritten. Bug fixes. #1284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 11, 2019
Merged

feat(licenses): creative commons detection rewritten. Bug fixes. #1284

merged 1 commit into from
Mar 11, 2019

Conversation

rlintu
Copy link
Contributor

@rlintu rlintu commented Feb 12, 2019

Description

Creative Commons detection restructured.

New license detections:

  • MIT-0, universal-foss-exception-1.0, hp-snmp-pp
    License reference bugs corrected.

How to test

nomos regression test

@rlintu
feat(licenses): creative commons detection rewritten. Bug fixes.
93dbe3d 
New license detections:
- MIT-0, universal-foss-exception-1.0, hp-snmp-pp
License reference bugs corrected.
@ghost ghost assigned rlintu Feb 12, 2019
@ghost ghost added the needs code review label Feb 12, 2019
@rlintu
Copy link
Contributor Author

rlintu commented Feb 12, 2019

Creative Commons detection code in nomos was a mess. It has been cleaned and restructured and naming was changed according to SPDX naming convention.
There are following nomos detection differences between this PR (C) and master (M) code:

C NomosTestfiles/Apache/Apache-2.0_e.txt contains license(s) Apache-2.0,CC-BY
M NomosTestfiles/Apache/Apache-2.0_e.txt contains license(s) Apache-2.0
C NomosTestfiles/Apache/Apache-2.0_j.txt contains license(s) Apache-2.0
M NomosTestfiles/Apache/Apache-2.0_j.txt contains license(s) Apache_v2-possibility

C NomosTestfiles/CC/CC-BY-1.0_ref.txt contains license(s) CC-BY-1.0
M NomosTestfiles/CC/CC-BY-1.0_ref.txt contains license(s) No_license_found
C NomosTestfiles/CC/CC-BY-2.0_ref.txt contains license(s) CC-BY-2.0
M NomosTestfiles/CC/CC-BY-2.0_ref.txt contains license(s) No_license_found
C NomosTestfiles/CC/CC-BY-2.5_ref.txt contains license(s) Apache-2.0,CC-BY-2.5
M NomosTestfiles/CC/CC-BY-2.5_ref.txt contains license(s) Apache-2.0,CC-BY
C NomosTestfiles/CC/malloc.h contains license(s) CC-BY-NC-ND-2.0
M NomosTestfiles/CC/malloc.h contains license(s) CC-BY-ND-2.0
C NomosTestfiles/CC/md5.js contains license(s) CCPL
M NomosTestfiles/CC/md5.js contains license(s) CC-BY
C NomosTestfiles/CC/memory_map.h contains license(s) CC-BY-NC-ND-2.0
M NomosTestfiles/CC/memory_map.h contains license(s) CC-BY-ND-2.0

C NomosTestfiles/CPL/CPL-1.0_ref_a.txt contains license(s) Apache-2.0,CPL-1.0
M NomosTestfiles/CPL/CPL-1.0_ref_a.txt contains license(s) Apache-2.0

C NomosTestfiles/Dual-license/EPL-1.0_or_MPL-2.0_1.txt contains license(s) Dual-license,EPL-1.0,MPL-2.0
M NomosTestfiles/Dual-license/EPL-1.0_or_MPL-2.0_1.txt contains license(s) Dual-license,H2,MPL-2.0
C NomosTestfiles/Dual-license/EPL-1.0_or_MPL-2.0_2.txt contains license(s) Dual-license,EPL-1.0,MPL-2.0
M NomosTestfiles/Dual-license/EPL-1.0_or_MPL-2.0_2.txt contains license(s) Dual-license,EPL,MPL
C NomosTestfiles/Dual-license/EPL-2.0_or_GPL-2.0_or_LGPL-2.1.txt contains license(s) Dual-license,EPL-2.0,GPL-2.0+,LGPL-2.1+
M NomosTestfiles/Dual-license/EPL-2.0_or_GPL-2.0_or_LGPL-2.1.txt contains license(s) Dual-license,GPL-2.0+,LGPL-2.1+
C NomosTestfiles/Dual-license/GPL-2.0_or_BSD.txt contains license(s) BSD,Dual-license,GPL-2.0
M NomosTestfiles/Dual-license/GPL-2.0_or_BSD.txt contains license(s) BSD,Dual-license,GPL,GPL-2.0
C NomosTestfiles/Dual-license/GPL-2.0_or_Linux-OpenIB_1.txt contains license(s) Dual-license,GPL-2.0,Linux-OpenIB
M NomosTestfiles/Dual-license/GPL-2.0_or_Linux-OpenIB_1.txt contains license(s) Dual-license,Linux-OpenIB
C NomosTestfiles/Dual-license/GPL-2.0_or_Linux-OpenIB_2.txt contains license(s) Dual-license,GPL-2.0,Linux-OpenIB,MIT-style
M NomosTestfiles/Dual-license/GPL-2.0_or_Linux-OpenIB_2.txt contains license(s) Dual-license,GPL-2.0,MIT-style
C NomosTestfiles/Dual-license/MIT_or_GPL-3.0.txt contains license(s) Dual-license,GPL-3.0,MIT
M NomosTestfiles/Dual-license/MIT_or_GPL-3.0.txt contains license(s) GPL-3.0,MIT

C NomosTestfiles/EUPL/EUPL-1.2.txt contains license(s) CC-BY,EUPL-1.2,LGPL,MPL
M NomosTestfiles/EUPL/EUPL-1.2.txt contains license(s) EUPL-1.2,LGPL,MPL

C NomosTestfiles/GPL/GPL-2.0_j.txt contains license(s) GPL-2.0
M NomosTestfiles/GPL/GPL-2.0_j.txt contains license(s) GPL-possibility
C NomosTestfiles/GPL/outcommentedMODULE_LICENSE.txt contains license(s) GPL
M NomosTestfiles/GPL/outcommentedMODULE_LICENSE.txt contains license(s) GPL-possibility
C NomosTestfiles/GPL/universal-foss-exception.txt contains license(s) universal-foss-exception-1.0
M NomosTestfiles/GPL/universal-foss-exception.txt contains license(s) UnclassifiedLicense
C NomosTestfiles/GPL/universal-foss-exception_url.txt contains license(s) universal-foss-exception-1.0
M NomosTestfiles/GPL/universal-foss-exception_url.txt contains license(s) See-URL

C NomosTestfiles/HP/hp-snmp-pp.txt contains license(s) hp-snmp-pp
M NomosTestfiles/HP/hp-snmp-pp.txt contains license(s) HP
C NomosTestfiles/HP/snmp_pp.cpp contains license(s) hp-snmp-pp
M NomosTestfiles/HP/snmp_pp.cpp contains license(s) HP

C NomosTestfiles/ICU/ICU-license-3.txt contains license(s) ICU
M NomosTestfiles/ICU/ICU-license-3.txt contains license(s) MIT-style

C NomosTestfiles/IPTC/IPTC.txt contains license(s) IPTC
M NomosTestfiles/IPTC/IPTC.txt contains license(s) UnclassifiedLicense

C NomosTestfiles/MIT/MIT-0.txt contains license(s) MIT-0
M NomosTestfiles/MIT/MIT-0.txt contains license(s) MIT-style
C NomosTestfiles/MIT/MIT-ref_i.txt contains license(s) MIT
M NomosTestfiles/MIT/MIT-ref_i.txt contains license(s) MIT-possibility

C NomosTestfiles/No_license_found/GPL-Ghostscript_b.txt contains license(s) No_license_found
M NomosTestfiles/No_license_found/GPL-Ghostscript_b.txt contains license(s) GPL

C NomosTestfiles/OZPLB/OZPLB_ref_a.txt contains license(s) Apache-2.0,BSD-3-Clause,OZPLB-1.0
M NomosTestfiles/OZPLB/OZPLB_ref_a.txt contains license(s) Apache-2.0,BSD

C NomosTestfiles/Qwt/Qwt_ref_a.txt contains license(s) Qwt-exception-1.0
M NomosTestfiles/Qwt/Qwt_ref_a.txt contains license(s) UnclassifiedLicense

C NomosTestfiles/SPDX/MIT-0 contains license(s) MIT-0
M NomosTestfiles/SPDX/MIT-0 contains license(s) MIT

C NomosTestfiles/UCAR/UCAR.txt contains license(s) UCAR
M NomosTestfiles/UCAR/UCAR.txt contains license(s) UCAR-style

C NomosTestfiles/Zlib/zlib_ref_a.txt contains license(s) Zlib
M NomosTestfiles/Zlib/zlib_ref_a.txt contains license(s) No_license_found

@mcjaeger mcjaeger added this to the 3.5.0 milestone Mar 11, 2019
@shaheemazmalmmd shaheemazmalmmd merged commit ba85729 into fossology:master Mar 11, 2019
@ghost ghost removed the ready label Mar 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shaheemazmalmmd shaheemazmalmmd shaheemazmalmmd approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

3.5.0

Development

Successfully merging this pull request may close these issues.

3 participants

@rlintu @shaheemazmalmmd @mcjaeger