-
-
Notifications
You must be signed in to change notification settings - Fork 562
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.
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
Update to spdx 3.22 #3554
Update to spdx 3.22 #3554
Conversation
These license additions and license/rule updates are added automatically using the new spdx-synclic script. Features are: * Update old licenses on `perfect-detection` * Add new licenses where we don't have good detection at all * Deprecate generic rules when we have perfect detections to those, as we are adding licenses for those * In case of multiple detections/matches we are adding a new license and adding the detection details to the new file as notes to review there Reference: https://github.com/spdx/license-list-XML/releases/tag/v3.22 Reference: #3541 Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
4c3d26f
to
8dc4a87
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Things remaining:
- Add also HPND-Pbmplus and HP-1989 licenses.
for reference:
HPND-Pbmplus:
https://github.com/spdx/license-list-data/blob/main/text/HPND-Pbmplus.txt
https://github.com/spdx/license-list-data/blob/main/text/xlock.txt
See https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/rules/libpbm_1.RULE
and https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/libpbm.LICENSE
HP-1989:
https://github.com/spdx/license-list-data/blob/main/text/HP-1989.txt
https://github.com/spdx/license-list-data/blob/main/text/HP-1986.txt
See https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/osf-1990.LICENSE
and https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/rules/osf-1990_3.RULE
and https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/rules/osf-1990_6.RULE
- Review more comments above and remove notes with detection details.
- Remove copyrights
- Add more license rules for these licenses.
- Review
category: Permissive | ||
owner: Regents of the University of California | ||
name: BSD 3-Clause Flex variant | ||
notes: | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/flex-2.5.LICENSE which has a slightly different license text, but has rules which are matching.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@AyanSinhaMahapatra Rather than create a new scancode license, I think that we should update the existing scancode flex-2.5 license to match this new SPDX license:
- replace the license text in the scancode licensedb
- update the spdx_license_key to BSD-3-Clause-flex to replace the current LicenseRef
I am aware that in the license text we normally avoid copyrights and references to specific organizations and code projects, but I think that is appropriate for this license, which we would call a component_license.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see my notes regarding the flex license. Everything else looks good.
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra Regarding HPND-Pbmplus, I think we need to update In both cases, I think the RULE specs need to be rather aggressive regarding required text to identify a good detection. I hope that this is similar to what you were thinking? |
@AyanSinhaMahapatra Regarding HP-1989, I think we need to update and we need to create a new license in scancode to correspond with HP-1986 |
@DennisClark regarding Regarding HP-1989 what you said makes sense,
But in case of HPND-Pbmplus, we already had the spdx license key as If we instead change the license texts so that we have |
@AyanSinhaMahapatra on further reflection, your remarks starting with "If we instead change the license texts ... " make more sense; please go ahead and do that. The good news in all this is that these licenses are extremely rare, so I doubt that we'll be causing much trouble with this solution, if any. |
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
603bbbf
to
410745e
Compare
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
ca07a83
to
05e6af0
Compare
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
All green! Merging. |
These license additions and license/rule updates are added
automatically using the new spdx-synclic script. Features are:
perfect-detection
as we are adding licenses for those
adding the detection details to the new file as notes to review there
Also reviewed the license additions and removed notes in resolved
licenses. Added category and owners, deprecate rules as required.
Reference: https://github.com/spdx/license-list-XML/releases/tag/v3.22
Reference: #3541
Tasks
Run tests locally to check for errors.