Skip to content

Commit f63a4ff

Browse files
aclark4lifeCopilot
andcommitted
Address jkowalleck review comments on SBOM generation
- Remove upstream PURL from vendored raqm component (modified copy must not carry the original's PURL); use Pillow-scoped bom-ref pkg:pypi/pillow@{version}#thirdparty/raqm instead - Point raqm externalReferences to Pillow's vendored copy in the repo rather than the upstream project URL (upstream refs are preserved in the pedigree ancestors entry) - Change pybind11 scope from 'optional' to 'excluded' since it is a build-time-only dependency with no runtime reachability - Update dependency cross-references to use the new raqm bom-ref Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 7cd4ac0 commit f63a4ff

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

.github/generate-sbom.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,13 @@ def generate(version: str) -> dict:
7979

8080
vendored_components = [
8181
{
82-
"bom-ref": "pkg:github/HOST-Oman/libraqm@0.10.5",
82+
"bom-ref": f"{purl}#thirdparty/raqm",
8383
"type": "library",
8484
"name": "raqm",
8585
"version": "0.10.5",
8686
"description": "Complex text layout library "
8787
"(vendored in src/thirdparty/raqm/)",
8888
"licenses": [{"license": {"id": "MIT"}}],
89-
"purl": "pkg:github/HOST-Oman/libraqm@0.10.5",
9089
"hashes": [
9190
{
9291
"alg": "SHA-256",
@@ -167,10 +166,9 @@ def generate(version: str) -> dict:
167166
),
168167
},
169168
"externalReferences": [
170-
{"type": "vcs", "url": "https://github.com/HOST-Oman/libraqm"},
171169
{
172-
"type": "distribution",
173-
"url": "https://github.com/HOST-Oman/libraqm/releases/tag/v0.10.5",
170+
"type": "vcs",
171+
"url": "https://github.com/python-pillow/Pillow/tree/main/src/thirdparty/raqm",
174172
},
175173
],
176174
},
@@ -423,7 +421,7 @@ def generate(version: str) -> dict:
423421
"bom-ref": "pkg:pypi/pybind11",
424422
"type": "library",
425423
"name": "pybind11",
426-
"scope": "optional",
424+
"scope": "excluded",
427425
"description": "C++/Python binding library "
428426
"(build-time dependency for PIL._imagingmath).",
429427
"licenses": [{"license": {"id": "BSD-3-Clause"}}],
@@ -455,7 +453,7 @@ def generate(version: str) -> dict:
455453
"ref": f"{purl}#c-ext/PIL._imagingft",
456454
"dependsOn": [
457455
"pkg:generic/freetype2",
458-
"pkg:github/HOST-Oman/libraqm@0.10.5",
456+
f"{purl}#thirdparty/raqm",
459457
f"{purl}#thirdparty/fribidi-shim",
460458
"pkg:generic/harfbuzz",
461459
"pkg:generic/fribidi",
@@ -478,7 +476,7 @@ def generate(version: str) -> dict:
478476
"dependsOn": ["pkg:pypi/pybind11"],
479477
},
480478
{
481-
"ref": "pkg:github/HOST-Oman/libraqm@0.10.5",
479+
"ref": f"{purl}#thirdparty/raqm",
482480
"dependsOn": [
483481
f"{purl}#thirdparty/fribidi-shim",
484482
"pkg:generic/harfbuzz",

0 commit comments

Comments
 (0)