Skip to content

update SPDX license data to 3.26.0 #234

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

Merged
cbgbt merged 3 commits into from
Jan 7, 2025
Merged

update SPDX license data to 3.26.0 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fe65a6
update SPDX license data to 3.26.0
cbgbt Jan 3, 2025
af659f1
license-scan: add latest spdx license data
cbgbt Jan 3, 2025
c37b7e0
license-scan: allow skipping directories in scanned sources
cbgbt Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ RUN rm /license-scan/{clarify,deny}.toml

FROM sdk-cargo as sdk-license-scan

ENV SPDXVER="3.19"
ENV SPDXVER="3.26.0"

USER builder
WORKDIR /home/builder/license-scan
Expand Down
7 changes: 7 additions & 0 deletions configs/cargo-deny/clarify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
[spdx]
ignore-licenses = [
# Apache-2.0 is often misclassified as Pixar, which is a significantly more rare
# https://github.com/jpeddicord/askalono/issues/94
"Pixar"
]

[clarify.askalono]
expression = "Apache-2.0"
license-files = [
Expand Down
7 changes: 7 additions & 0 deletions configs/cargo-make/clarify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
[spdx]
ignore-licenses = [
# Apache-2.0 is often misclassified as Pixar, which is a significantly more rare
# https://github.com/jpeddicord/askalono/issues/94
"Pixar"
]

[clarify.bstr]
expression = "(MIT OR Apache-2.0) AND Unicode-DFS-2016"
license-files = [
Expand Down
4 changes: 2 additions & 2 deletions hashes/license-scan
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# https://github.com/spdx/license-list-data/archive/v3.19.tar.gz#/license-list-data-3.19.tar.gz
SHA512 (license-list-data-3.19.tar.gz) = 23d90eece2f164a00ad710c84c3f3194bf54830b4c2b5c2739c4bf713c95ab161697850eecb20d1c3dfbdad24aa795a75bf11f9473982824fc9fe885962b7433
# https://github.com/spdx/license-list-data/archive/v3.26.0.tar.gz#/license-list-data-3.26.0.tar.gz
SHA512 (license-list-data-3.26.0.tar.gz) = 67e618d4642dfe4f366935d9514d6f7941d3711e77c49bc1b340ac572d36015981b8f10c72a9f80f1d83e132ae7e5093c0155e0c0e786e4777ee16d1cb7b885a
102 changes: 81 additions & 21 deletions license-scan/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion license-scan/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ ignore = "0.4"
lazy_static = "1"
semver = { version = "1", features = ["serde"] }
serde = { version = "1", features = ["derive"] }
spdx = "0.3"
spdx = "0.10"
structopt = { version = "0.3", default-features = false }
tempfile = "3"
toml = "0.8"
twox-hash = "1"
walkdir = "2"
Expand Down
22 changes: 16 additions & 6 deletions license-scan/clarify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
[spdx]
ignore-licenses = [
# Apache-2.0 is often misclassified as Pixar, which is a significantly more rare
# https://github.com/jpeddicord/askalono/issues/94
"Pixar"
]

[clarify.askalono]
expression = "Apache-2.0"
license-files = [
Expand All @@ -21,7 +28,6 @@ license-files = [
{ path = "COPYING", hash = 0x278afbcf },
{ path = "LICENSE-APACHE", hash = 0x24b54f4b },
{ path = "LICENSE-MIT", hash = 0x462dee44 },
{ path = "src/unicode/data/LICENSE-UNICODE", hash = 0x70f7339 },
]

[clarify.crossbeam-channel]
Expand Down Expand Up @@ -58,12 +64,16 @@ license-files = [
{ path = "src/unicode_tables/LICENSE-UNICODE", hash = 0xa7f28b93 },
]

[clarify.unicode-ident]
expression = "(MIT OR Apache-2.0) AND Unicode-DFS-2016"
[clarify.spdx]
expression = "MIT OR Apache-2.0"
license-files = [
{ path = "LICENSE-APACHE", hash = 0xb5518783 },
{ path = "LICENSE-MIT", hash = 0x386ca1bc },
{ path = "LICENSE-UNICODE", hash = 0x9698cbbe },
{ path = "LICENSE-MIT", hash = 0xa502ee8a },
{ path = "LICENSE-APACHE", hash = 0x4fccb6b7 },
]
skip-dirs = [
# The spdx crate contains the full text of referred licenses
"src/text/licenses",
"src/text/exceptions",
]

[clarify.zstd-safe]
Expand Down
Loading