Skip to content

Commit 8cbe52d

Browse files
committed
fixup sha-1 of vendor libraries in OTP-28
1 parent 1ed196f commit 8cbe52d

File tree

9 files changed

+19
-8
lines changed

9 files changed

+19
-8
lines changed

HOWTO/SBOM.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ This file may be a list of JSON objects. For simplicity, we document the fields
183183
"licenseDeclared": "Zlib",
184184
"name": "asmjit",
185185
"versionInfo": "029075b84bf0161a761beb63e6eda519a29020db",
186+
"sha": "029075b84bf0161a761beb63e6eda519a29020db",
186187
"path": "./erts/emulator/asmjit",
187188
"exclude": ["./erts/emulator/asmjit/vendor.info"],
188189
"supplier": "Person: Petr Kobalicek",
@@ -202,11 +203,15 @@ Fields summary:
202203
- If you are unsure about the name of the `SPDX-TOP-LEVEL-PACKAGE`, take a look at the source SBOM to identify packages (under key `packages` in the SBOM).
203204
- `description`: a brief description of what this vendor library does.
204205
- `copyrightText`: copyright text associated with the top-level package/library/3pp using [SPDX License Identifiers](https://spdx.org/licenses/).
205-
- `downloadLocation`: URI of the vendor library to download.
206+
- `downloadLocation`: URI of the vendor library to download. If using Github, use preferably `https//` rather than `git+https//` or similars.
207+
This is because the download location is used for vulnerability scanning in `.github/scripts/otp-compliance.es`.
206208
- `homepage`: homepage of the vendor library.
207209
- `licenseDeclared`: license as declared by the vendor, following a [SPDX license identifier](https://spdx.org/licenses/).
208210
- `name`: name of the library.
209211
- `versionInfo`: version of the library/project/3pp. In case of no version number being available, write the commit sha.
212+
- `sha`: sha commit for `versionInfo`, they need to be updated together!
213+
- `ecosystem`: List of valid ecosystems in [OSV Ecosystems](https://ossf.github.io/osv-schema/#defined-ecosystems)
214+
where this value is omitted for C/C++ code (e.g., `asmjit`, `pcre2`, `zlib`, `zstd`, etc), and used in `vendor.json` for `jquery`.
210215
- `path`: path to the vendor library inside Erlang/OTP. This can point to a folder or a list of files.
211216
- Folder: any file inside the folder is considered part of the vendor library (e.g., asmjit [vendor.info](../erts/emulator/asmjit/vendor.info)).
212217
- List of files: only the files listed here are part of a vendor library (e.g., erts-config [vendor.info](../erts/autoconf/vendor.info)).
@@ -225,8 +230,7 @@ and re-run the source SBOM generation steps ([Erlang/OTP source SBOM]).
225230
### Add a New Vendor Dependency
226231

227232
Follow the same steps as in [Update SPDX Vendor Packages].
228-
When running the SBOM generator, make sure to check that the new vendor dependency exists
229-
in its own package.
233+
When running the SBOM generator, make sure to check that the new vendor dependency exists in its own package.
230234

231235
The [`renovate.json5`](../renovate.json5) file also needs to be updated
232236
to make sure that the new vendored dependency gets updated as it should.

erts/emulator/openssl/vendor.info

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"licenseDeclared": "Apache-2.0",
1616
"name": "openssl",
1717
"versionInfo": "3.5",
18+
"sha": "636dfadc70ce26f2473870570bfd9ec352806b1d",
1819
"path": "./erts/emulator/openssl",
1920
"exclude": ["./erts/emulator/openssl/vendor.info",
2021
"./erts/emulator/openssl/README",

erts/emulator/pcre/vendor.info

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"exclude": ["./erts/emulator/pcre/vendor.info",
2020
"./erts/emulator/pcre/README.pcre_update.md",
2121
"./erts/emulator/pcre/pcre.mk"],
22+
"sha": "2dce7761b1831fd3f82a9c2bd5476259d945da4d",
2223
"supplier": "Person: Philip Hazel",
2324
"purl": "pkg:generic/pcre2"
2425
}

erts/emulator/ryu/vendor.info

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
"./erts/emulator/ryu/digit_table.h",
2323
"./erts/emulator/ryu/ryu.h",
2424
"./erts/emulator/ryu/LICENSE-Apache2",
25-
"./erts/emulator/ryu/LICENSE-Boost"
26-
],
25+
"./erts/emulator/ryu/LICENSE-Boost"],
2726
"supplier": "Person: Ulf Adams",
2827
"purl": "pkg:github/ulfjack/ryu#ryu",
2928
"update": "./erts/emulator/ryu/update.sh",

erts/emulator/zlib/vendor.info

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@
1010
"ID": "erts-zlib",
1111
"description": "interface of the 'zlib' general purpose compression library",
1212
"copyrightText": "Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler",
13-
"downloadLocation": "https://zlib.net/",
13+
"downloadLocation": "https://github.com/madler/zlib",
1414
"homepage": "https://zlib.net/",
1515
"licenseDeclared": "Zlib",
1616
"name": "zlib",
1717
"versionInfo": "1.3.1",
18+
"sha": "1a8db63788c34a50e39e273d39b7e1033208aea2",
1819
"path": "./erts/emulator/zlib",
1920
"exclude": ["./erts/emulator/zlib/vendor.info",
2021
"./erts/emulator/zlib/zlib.mk"],
2122
"supplier": "Person: Mark Adler ([email protected])",
22-
"purl": "pkg:generic/zlib"
23+
"purl": "pkg:github/madler/zlib"
2324
}
2425
]

erts/emulator/zstd/vendor.info

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"licenseDeclared": "BSD-3-Clause OR GPL-2.0-only",
1616
"name": "zstd",
1717
"versionInfo": "v1.5.7",
18+
"sha": "f8745da6ff1ad1e7bab384bd1f9d742439278e99",
1819
"path": "./erts/emulator/zstd",
1920
"exclude": ["./erts/emulator/zstd/vendor.info",
2021
"./erts/emulator/zstd/update.sh",

lib/common_test/priv/vendor.info

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"downloadLocation": "https://github.com/jquery/jquery",
1414
"homepage": "https://jquery.com",
1515
"licenseDeclared": "MIT",
16+
"ecosystem": "npm",
1617
"name": "jquery",
1718
"versionInfo": "3.7.1",
1819
"path": ["./lib/common_test/priv/jquery-latest.js"],
@@ -26,7 +27,8 @@
2627
"downloadLocation": "https://github.com/Mottie/tablesorter",
2728
"homepage": "https://github.com/Mottie/tablesorter",
2829
"licenseDeclared": "BSD-3-Clause OR GPL-2.0-only",
29-
"name": "jquery-tablesorter",
30+
"ecosystem": "npm",
31+
"name": "tablesorter",
3032
"versionInfo": "2.32",
3133
"path": ["./lib/common_test/priv/jquery.tablesorter.min.js"],
3234
"supplier": "Person: Christian Bach",

lib/erl_interface/src/openssl/vendor.info

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"licenseDeclared": "Apache-2.0",
1616
"name": "openssl",
1717
"versionInfo": "3.5",
18+
"sha": "636dfadc70ce26f2473870570bfd9ec352806b1d",
1819
"path": "./lib/erl_interface/src/openssl",
1920
"exclude": ["./lib/erl_interface/src/openssl/vendor.info",
2021
"./lib/erl_interface/src/openssl/README",

lib/wx/vendor.info

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"licenseDeclared": "LicenseRef-scancode-wxwindows-free-doc-3",
1616
"name": "wx",
1717
"versionInfo": "dc585039bbd426829e3433002023a93f9bedd0c2",
18+
"sha": "dc585039bbd426829e3433002023a93f9bedd0c2",
1819
"path": "./lib/wx",
1920
"comments": "This only applies to the source code of Erlang files in 'src', and specifically to the documentation embedded in them",
2021
"supplier": "NOASSERTION",

0 commit comments

Comments
 (0)