SBOM: Static libs are Rust-based

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>

diff --git a/builder-support/helpers/generate-sbom-dnf.py b/builder-support/helpers/generate-sbom-dnf.py
index 315f1e61709aa3c280a7de756166f84dece30c3b..a48f7860a7a3c898cc1a32c9887433422581b7bb 100755 (executable)
--- a/builder-support/helpers/generate-sbom-dnf.py
+++ b/builder-support/helpers/generate-sbom-dnf.py
@@ -154,6 +154,7 @@ class StaticLibDep:
         self.license = license
         if sha256:
             self.sha256 = sha256
+        self.cargo = True
 
 def mergeLibSBOM(sbom, appInfos, lib_sbom_path, depRelations):
     with open(lib_sbom_path, encoding="utf-8") as fd:
@@ -188,7 +189,8 @@ def addAdditionalLibraryToSBOM(depFile, sbom, appInfos, depRelations):
             pkg.sha256 = depData['SHA256SUM']
         elif 'SHA256SUM_x86_64' in depData:
             pkg.sha256 = depData['SHA256SUM_x86_64']
-        pkg.cargo = True
+        if 'cargo-based' in depData:
+            pkg.cargo = depData['cargo-based']
 
         depRef = 'lib:' + pkg.name
         addDependencyToSBOM(sbom, pkg)

diff --git a/builder-support/helpers/quiche.json b/builder-support/helpers/quiche.json
index bec7fcaf46864bd262cb7bfb37f33927e99f90db..85c60995986f3e235f786ba840b8437bbf9b3146 100644 (file)
--- a/builder-support/helpers/quiche.json
+++ b/builder-support/helpers/quiche.json
@@ -2,5 +2,6 @@
   "version": "0.24.5",
   "license": "BSD-2-Clause",
   "publisher": "https://github.com/cloudflare/quiche",
-  "SHA256SUM": "7d2dff9ac5b9a53eb32d98af9b5fae944dcc7176a9fcfe1877f682b1ec935663"
+  "SHA256SUM": "7d2dff9ac5b9a53eb32d98af9b5fae944dcc7176a9fcfe1877f682b1ec935663",
+  "cargo-based": true
 }

diff --git a/builder-support/helpers/rust.json b/builder-support/helpers/rust.json
index 0b94487fa79fc8205a49d98f0e8996261708c261..18b1cf4ec6bef984636db2bbcab7892fb2892d6a 100644 (file)
--- a/builder-support/helpers/rust.json
+++ b/builder-support/helpers/rust.json
@@ -3,5 +3,6 @@
   "license": "MIT",
   "publisher": "https://www.rust-lang.org/",
   "SHA256SUM_x86_64": "9720bf4ffdd5e6112f8fc93a645d50bfdc64f95cb76d41561be196e1721b4b69",
-  "SHA256SUM_aarch64": "0bd04d32129f03465c1d2cae66f99d8c1c6d33c070b0e19b80a66b2b31ae6b9e"
+  "SHA256SUM_aarch64": "0bd04d32129f03465c1d2cae66f99d8c1c6d33c070b0e19b80a66b2b31ae6b9e",
+  "cargo-based": true
 }