From c4de2e5f0c2984eba1f487522e0de80a7dbdba3c Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Sun, 11 May 2025 19:57:18 +0100 Subject: [PATCH 1/3] Update osquery. riscv64 builds Signed-off-by: Prabhu Subramanian --- .github/workflows/release.yml | 7 ++++ .github/workflows/test.yml | 3 ++ build.ps1 | 10 +++--- build.sh | 2 +- package-lock.json | 4 +-- package.json | 2 +- packages/darwin-amd64/build-darwin-amd64.sh | 1 + packages/darwin-amd64/package.json | 2 +- packages/darwin-arm64/build-darwin-arm64.sh | 6 ++-- packages/darwin-arm64/package.json | 2 +- packages/linux-amd64/build-linux-amd64.sh | 6 ++-- packages/linux-amd64/package.json | 2 +- packages/linux-arm/package.json | 2 +- packages/linux-arm64/build-linux-arm64.sh | 10 +++--- packages/linux-arm64/package.json | 2 +- packages/linux-riscv64/build-linux-riscv64.sh | 12 +++++++ packages/linux-riscv64/index.js | 8 +++++ packages/linux-riscv64/package.json | 34 +++++++++++++++++++ packages/linux-riscv64/plugins/.gitignore | 6 ++++ packages/linux-riscv64/plugins/.gitkeep | 0 packages/linux-riscv64/plugins/.npmignore | 0 packages/ppc64/package.json | 2 +- packages/windows-amd64/build-windows-amd64.sh | 10 +++--- packages/windows-amd64/package.json | 2 +- packages/windows-arm64/build-windows-arm64.sh | 10 +++--- packages/windows-arm64/package.json | 2 +- thirdparty/trivy/Makefile | 6 +++- 27 files changed, 113 insertions(+), 40 deletions(-) create mode 100755 packages/linux-riscv64/build-linux-riscv64.sh create mode 100644 packages/linux-riscv64/index.js create mode 100644 packages/linux-riscv64/package.json create mode 100644 packages/linux-riscv64/plugins/.gitignore create mode 100644 packages/linux-riscv64/plugins/.gitkeep create mode 100644 packages/linux-riscv64/plugins/.npmignore diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e753447..f9560b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,6 +66,13 @@ jobs: npm publish --access=public --@cyclonedx:registry='https://registry.npmjs.org' popd + pushd packages/linux-riscv64 + echo "cyclonedx:registry=https://npm.pkg.github.com" > ~/.npmrc + npm publish --access=public --@cyclonedx:registry='https://npm.pkg.github.com' + echo "cyclonedx:registry=https://registry.npmjs.org" > ~/.npmrc + npm publish --access=public --@cyclonedx:registry='https://registry.npmjs.org' + popd + pushd packages/linux-arm echo "cyclonedx:registry=https://npm.pkg.github.com" > ~/.npmrc npm publish --access=public --@cyclonedx:registry='https://npm.pkg.github.com' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 39347bb..516a60e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,6 +54,9 @@ jobs: pushd packages/linux-arm64 npm publish --dry-run popd + pushd packages/linux-riscv64 + npm publish --dry-run + popd pushd packages/linux-arm npm publish --dry-run popd diff --git a/build.ps1 b/build.ps1 index 53fad4b..8ed211d 100644 --- a/build.ps1 +++ b/build.ps1 @@ -5,9 +5,9 @@ New-Item -ItemType Directory -Path plugins\trivy -Force Invoke-WebRequest -Uri https://github.com/upx/upx/releases/download/v5.0.1/upx-5.0.1-win64.zip -UseBasicParsing -OutFile upx-5.0.1-win64.zip Expand-Archive -Path upx-5.0.1-win64.zip -DestinationPath . -Force -Invoke-WebRequest -Uri https://github.com/osquery/osquery/releases/download/5.16.0/osquery-5.16.0.windows_x86_64.zip -UseBasicParsing -OutFile osquery-5.16.0.windows_x86_64.zip -Expand-Archive -Path osquery-5.16.0.windows_x86_64.zip -DestinationPath . -Force -copy "osquery-5.16.0.windows_x86_64\Program Files\osquery\osqueryi.exe" plugins\osquery\osqueryi-windows-amd64.exe +Invoke-WebRequest -Uri https://github.com/osquery/osquery/releases/download/5.17.0/osquery-5.17.0.windows_x86_64.zip -UseBasicParsing -OutFile osquery-5.17.0.windows_x86_64.zip +Expand-Archive -Path osquery-5.17.0.windows_x86_64.zip -DestinationPath . -Force +copy "osquery-5.17.0.windows_x86_64\Program Files\osquery\osqueryi.exe" plugins\osquery\osqueryi-windows-amd64.exe upx-5.0.1-win64\upx.exe -9 --lzma plugins\osquery\osqueryi-windows-amd64.exe plugins\osquery\osqueryi-windows-amd64.exe --help @@ -20,7 +20,7 @@ copy build\* ..\..\plugins\trivy\ Remove-Item build -Recurse -Force cd ..\.. -Remove-Item osquery-5.16.0.windows_x86_64 -Recurse -Force -Remove-Item osquery-5.16.0.windows_x86_64.zip -Recurse -Force +Remove-Item osquery-5.17.0.windows_x86_64 -Recurse -Force +Remove-Item osquery-5.17.0.windows_x86_64.zip -Recurse -Force Remove-Item upx-5.0.1-win64 -Recurse -Force Remove-Item upx-5.0.1-win64.zip -Recurse -Force diff --git a/build.sh b/build.sh index 20ed26a..dd4de32 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ done upx -9 --lzma ./plugins/trivy/trivy-cdxgen-linux-amd64 ./plugins/trivy/trivy-cdxgen-linux-amd64 -v -for flavours in windows-amd64 linux-amd64 linux-arm64 linux-arm windows-arm64 darwin-arm64 darwin-amd64 ppc64 +for flavours in windows-amd64 linux-amd64 linux-arm64 linux-riscv64 linux-arm windows-arm64 darwin-arm64 darwin-amd64 ppc64 do chmod +x packages/$flavours/build-$flavours.sh pushd packages/$flavours diff --git a/package-lock.json b/package-lock.json index 58457ed..440675e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@cyclonedx/cdxgen-plugins-bin", - "version": "1.6.11", + "version": "1.6.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@cyclonedx/cdxgen-plugins-bin", - "version": "1.6.11", + "version": "1.6.12", "cpu": [ "x64" ], diff --git a/package.json b/package.json index 7dcb7fc..e6dbe9c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@cyclonedx/cdxgen-plugins-bin", - "version": "1.6.11", + "version": "1.6.12", "description": "Binary plugins to supercharge @cyclonedx/cdxgen npm package", "main": "index.js", "repository": { diff --git a/packages/darwin-amd64/build-darwin-amd64.sh b/packages/darwin-amd64/build-darwin-amd64.sh index bce795f..8de0658 100755 --- a/packages/darwin-amd64/build-darwin-amd64.sh +++ b/packages/darwin-amd64/build-darwin-amd64.sh @@ -9,6 +9,7 @@ rm -rf plugins/sourcekitten mkdir -p plugins/osquery plugins/dosai plugins/sourcekitten oras pull ghcr.io/cyclonedx/cdxgen-plugins-bin:darwin-amd64 -o plugins/sourcekitten/ +sha256sum plugins/sourcekitten/sourcekitten > plugins/sourcekitten/sourcekitten.sha256 curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-osx-x64 -o plugins/dosai/dosai-darwin-amd64 chmod +x plugins/dosai/dosai-darwin-amd64 diff --git a/packages/darwin-amd64/package.json b/packages/darwin-amd64/package.json index c1f2f1f..1932f3b 100644 --- a/packages/darwin-amd64/package.json +++ b/packages/darwin-amd64/package.json @@ -1,6 +1,6 @@ { "name": "@cyclonedx/cdxgen-plugins-bin-darwin-amd64", - "version": "1.6.11", + "version": "1.6.12", "description": "Arm64 binary plugins to supercharge @cyclonedx/cdxgen npm package", "main": "index.js", "repository": { diff --git a/packages/darwin-arm64/build-darwin-arm64.sh b/packages/darwin-arm64/build-darwin-arm64.sh index 235c42c..0c36723 100755 --- a/packages/darwin-arm64/build-darwin-arm64.sh +++ b/packages/darwin-arm64/build-darwin-arm64.sh @@ -10,11 +10,11 @@ mkdir -p plugins/osquery plugins/dosai plugins/sourcekitten oras pull ghcr.io/cyclonedx/cdxgen-plugins-bin:darwin-arm64 -o plugins/sourcekitten/ -wget https://github.com/osquery/osquery/releases/download/5.16.0/osquery-5.16.0_1.macos_arm64.tar.gz -tar -xf osquery-5.16.0_1.macos_arm64.tar.gz +wget https://github.com/osquery/osquery/releases/download/5.17.0/osquery-5.17.0_1.macos_arm64.tar.gz +tar -xf osquery-5.17.0_1.macos_arm64.tar.gz cp -rf opt/osquery/lib/osquery.app plugins/osquery/osqueryi-darwin-arm64.app rm -rf etc usr var opt -rm osquery-5.16.0_1.macos_arm64.tar.gz +rm osquery-5.17.0_1.macos_arm64.tar.gz curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-osx-arm64 -o plugins/dosai/dosai-darwin-arm64 chmod +x plugins/dosai/dosai-darwin-arm64 diff --git a/packages/darwin-arm64/package.json b/packages/darwin-arm64/package.json index 72ee67f..4845fcf 100644 --- a/packages/darwin-arm64/package.json +++ b/packages/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cyclonedx/cdxgen-plugins-bin-darwin-arm64", - "version": "1.6.11", + "version": "1.6.12", "description": "Arm64 binary plugins to supercharge @cyclonedx/cdxgen npm package", "main": "index.js", "repository": { diff --git a/packages/linux-amd64/build-linux-amd64.sh b/packages/linux-amd64/build-linux-amd64.sh index d489cd9..28a127a 100755 --- a/packages/linux-amd64/build-linux-amd64.sh +++ b/packages/linux-amd64/build-linux-amd64.sh @@ -8,14 +8,14 @@ mkdir -p plugins/trivy plugins/osquery plugins/sourcekitten plugins/dosai oras pull ghcr.io/cyclonedx/cdxgen-plugins-bin:linux-amd64 -o plugins/sourcekitten/ sha256sum plugins/sourcekitten/sourcekitten > plugins/sourcekitten/sourcekitten.sha256 -wget https://github.com/osquery/osquery/releases/download/5.16.0/osquery-5.16.0_1.linux_x86_64.tar.gz -tar -xf osquery-5.16.0_1.linux_x86_64.tar.gz +wget https://github.com/osquery/osquery/releases/download/5.17.0/osquery-5.17.0_1.linux_x86_64.tar.gz +tar -xf osquery-5.17.0_1.linux_x86_64.tar.gz cp opt/osquery/bin/osqueryd plugins/osquery/osqueryi-linux-amd64 upx -9 --lzma plugins/osquery/osqueryi-linux-amd64 ./plugins/osquery/osqueryi-linux-amd64 --help sha256sum plugins/osquery/osqueryi-linux-amd64 > plugins/osquery/osqueryi-linux-amd64.sha256 rm -rf etc usr var opt -rm osquery-5.16.0_1.linux_x86_64.tar.gz +rm osquery-5.17.0_1.linux_x86_64.tar.gz # Download the Dosai binary curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-linux-amd64 -o plugins/dosai/dosai-linux-amd64 diff --git a/packages/linux-amd64/package.json b/packages/linux-amd64/package.json index e0c841a..1c5c8cb 100644 --- a/packages/linux-amd64/package.json +++ b/packages/linux-amd64/package.json @@ -1,6 +1,6 @@ { "name": "@cyclonedx/cdxgen-plugins-bin-linux-amd64", - "version": "1.6.11", + "version": "1.6.12", "description": "linux amd64 binary plugins to supercharge @cyclonedx/cdxgen npm package", "main": "index.js", "repository": { diff --git a/packages/linux-arm/package.json b/packages/linux-arm/package.json index a58852c..1371e2c 100644 --- a/packages/linux-arm/package.json +++ b/packages/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@cyclonedx/cdxgen-plugins-bin-linux-arm", - "version": "1.6.11", + "version": "1.6.12", "description": "Arm binary plugins to supercharge @cyclonedx/cdxgen npm package", "main": "index.js", "repository": { diff --git a/packages/linux-arm64/build-linux-arm64.sh b/packages/linux-arm64/build-linux-arm64.sh index 97aaf7f..b29ddc2 100755 --- a/packages/linux-arm64/build-linux-arm64.sh +++ b/packages/linux-arm64/build-linux-arm64.sh @@ -8,17 +8,15 @@ rm -rf plugins/dosai rm -rf plugins/sourcekitten mkdir -p plugins/osquery plugins/dosai plugins/sourcekitten -# Get the linux version built by AppThreat -oras pull ghcr.io/appthreat/cdxgen-plugins-bin:linux-arm64 -o plugins/sourcekitten/ -sha256sum plugins/sourcekitten/sourcekitten > plugins/sourcekitten/sourcekitten.sha256 +oras pull ghcr.io/cyclonedx/cdxgen-plugins-bin:linux-arm64 -o plugins/sourcekitten/ -wget https://github.com/osquery/osquery/releases/download/5.16.0/osquery-5.16.0_1.linux_aarch64.tar.gz -tar -xf osquery-5.16.0_1.linux_aarch64.tar.gz +wget https://github.com/osquery/osquery/releases/download/5.17.0/osquery-5.17.0_1.linux_aarch64.tar.gz +tar -xf osquery-5.17.0_1.linux_aarch64.tar.gz cp opt/osquery/bin/osqueryd plugins/osquery/osqueryi-linux-arm64 upx -9 --lzma plugins/osquery/osqueryi-linux-arm64 sha256sum plugins/osquery/osqueryi-linux-arm64 > plugins/osquery/osqueryi-linux-arm64.sha256 rm -rf etc usr var opt -rm osquery-5.16.0_1.linux_aarch64.tar.gz +rm osquery-5.17.0_1.linux_aarch64.tar.gz curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-linux-arm64 -o plugins/dosai/dosai-linux-arm64 chmod +x plugins/dosai/dosai-linux-arm64 diff --git a/packages/linux-arm64/package.json b/packages/linux-arm64/package.json index 16cd434..d97812e 100644 --- a/packages/linux-arm64/package.json +++ b/packages/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cyclonedx/cdxgen-plugins-bin-linux-arm64", - "version": "1.6.11", + "version": "1.6.12", "description": "Arm64 binary plugins to supercharge @cyclonedx/cdxgen npm package", "main": "index.js", "repository": { diff --git a/packages/linux-riscv64/build-linux-riscv64.sh b/packages/linux-riscv64/build-linux-riscv64.sh new file mode 100755 index 0000000..89864b6 --- /dev/null +++ b/packages/linux-riscv64/build-linux-riscv64.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +set -e + +rm -rf plugins/trivy + +for plug in trivy +do + mkdir -p plugins/$plug + mv ../../plugins/$plug/*linux-riscv64* plugins/$plug/ + upx -9 --lzma plugins/$plug/*linux-riscv64* || true +done diff --git a/packages/linux-riscv64/index.js b/packages/linux-riscv64/index.js new file mode 100644 index 0000000..8e8a0f2 --- /dev/null +++ b/packages/linux-riscv64/index.js @@ -0,0 +1,8 @@ +// Debug mode flag +const DEBUG_MODE = + process.env.CDXGEN_DEBUG_MODE === "debug" || + process.env.NODE_ENV === "development"; + +if (DEBUG_MODE) { + console.log("cdxgen plugins check"); +} diff --git a/packages/linux-riscv64/package.json b/packages/linux-riscv64/package.json new file mode 100644 index 0000000..90d20c9 --- /dev/null +++ b/packages/linux-riscv64/package.json @@ -0,0 +1,34 @@ +{ + "name": "@cyclonedx/cdxgen-plugins-bin-linux-riscv64", + "version": "1.6.12", + "description": "RISC-V 64 binary plugins to supercharge @cyclonedx/cdxgen npm package", + "main": "index.js", + "repository": { + "type": "git", + "url": "git+https://github.com/cyclonedx/cdxgen-plugins-bin.git" + }, + "keywords": [ + "cdxgen", + "sbom", + "bom", + "plugins", + "dependency", + "appsec" + ], + "author": "Prabhu Subramanian ", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/cyclonedx/cdxgen-plugins-bin/issues" + }, + "homepage": "https://github.com/cyclonedx/cdxgen-plugins-bin#readme", + "files": [ + "*.js", + "plugins/" + ], + "os": [ + "linux" + ], + "cpu": [ + "riscv64" + ] +} diff --git a/packages/linux-riscv64/plugins/.gitignore b/packages/linux-riscv64/plugins/.gitignore new file mode 100644 index 0000000..d8c2cac --- /dev/null +++ b/packages/linux-riscv64/plugins/.gitignore @@ -0,0 +1,6 @@ +goversion/ +trivy/ +cargo-auditable/ +osquery/ +dosai/ +sourcekitten/ diff --git a/packages/linux-riscv64/plugins/.gitkeep b/packages/linux-riscv64/plugins/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/packages/linux-riscv64/plugins/.npmignore b/packages/linux-riscv64/plugins/.npmignore new file mode 100644 index 0000000..e69de29 diff --git a/packages/ppc64/package.json b/packages/ppc64/package.json index 1db0233..578df2e 100644 --- a/packages/ppc64/package.json +++ b/packages/ppc64/package.json @@ -1,6 +1,6 @@ { "name": "@cyclonedx/cdxgen-plugins-bin-linux-ppc64", - "version": "1.6.11", + "version": "1.6.12", "description": "ppc64 binary plugins to supercharge @cyclonedx/cdxgen npm package", "main": "index.js", "repository": { diff --git a/packages/windows-amd64/build-windows-amd64.sh b/packages/windows-amd64/build-windows-amd64.sh index 38fdce4..a72b103 100755 --- a/packages/windows-amd64/build-windows-amd64.sh +++ b/packages/windows-amd64/build-windows-amd64.sh @@ -7,13 +7,13 @@ rm -rf plugins/osquery rm -rf plugins/dosai mkdir -p plugins/osquery plugins/dosai -wget https://github.com/osquery/osquery/releases/download/5.16.0/osquery-5.16.0.windows_x86_64.zip -unzip osquery-5.16.0.windows_x86_64.zip -cp "osquery-5.16.0.windows_x86_64/Program Files/osquery/osqueryi.exe" plugins/osquery/osqueryi-windows-amd64.exe +wget https://github.com/osquery/osquery/releases/download/5.17.0/osquery-5.17.0.windows_x86_64.zip +unzip osquery-5.17.0.windows_x86_64.zip +cp "osquery-5.17.0.windows_x86_64/Program Files/osquery/osqueryi.exe" plugins/osquery/osqueryi-windows-amd64.exe upx -9 --lzma plugins/osquery/osqueryi-windows-amd64.exe sha256sum plugins/osquery/osqueryi-windows-amd64.exe > plugins/osquery/osqueryi-windows-amd64.exe.sha256 -rm -rf osquery-5.16.0.windows_x86_64 -rm osquery-5.16.0.windows_x86_64.zip +rm -rf osquery-5.17.0.windows_x86_64 +rm osquery-5.17.0.windows_x86_64.zip curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai.exe -o plugins/dosai/dosai-windows-amd64.exe sha256sum plugins/dosai/dosai-windows-amd64.exe > plugins/dosai/dosai-windows-amd64.exe.sha256 diff --git a/packages/windows-amd64/package.json b/packages/windows-amd64/package.json index da15fa3..ca331cf 100644 --- a/packages/windows-amd64/package.json +++ b/packages/windows-amd64/package.json @@ -1,6 +1,6 @@ { "name": "@cyclonedx/cdxgen-plugins-bin-windows-amd64", - "version": "1.6.11", + "version": "1.6.12", "description": "Windows amd64 binary plugins to supercharge @cyclonedx/cdxgen npm package", "main": "index.js", "repository": { diff --git a/packages/windows-arm64/build-windows-arm64.sh b/packages/windows-arm64/build-windows-arm64.sh index 24d013a..18bf097 100755 --- a/packages/windows-arm64/build-windows-arm64.sh +++ b/packages/windows-arm64/build-windows-arm64.sh @@ -7,12 +7,12 @@ rm -rf plugins/osquery rm -rf plugins/dosai mkdir -p plugins/osquery plugins/dosai -wget https://github.com/osquery/osquery/releases/download/5.16.0/osquery-5.16.0.windows_arm64.zip -unzip osquery-5.16.0.windows_arm64.zip -cp "osquery-5.16.0.windows_arm64/Program Files/osquery/osqueryi.exe" plugins/osquery/osqueryi-windows-arm64.exe +wget https://github.com/osquery/osquery/releases/download/5.17.0/osquery-5.17.0.windows_arm64.zip +unzip osquery-5.17.0.windows_arm64.zip +cp "osquery-5.17.0.windows_arm64/Program Files/osquery/osqueryi.exe" plugins/osquery/osqueryi-windows-arm64.exe sha256sum plugins/osquery/osqueryi-windows-arm64.exe > plugins/osquery/osqueryi-windows-arm64.exe.sha256 -rm -rf osquery-5.16.0.windows_arm64 -rm osquery-5.16.0.windows_arm64.zip +rm -rf osquery-5.17.0.windows_arm64 +rm osquery-5.17.0.windows_arm64.zip curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-windows-arm64.exe -o plugins/dosai/dosai-windows-arm64.exe sha256sum plugins/dosai/dosai-windows-arm64.exe > plugins/dosai/dosai-windows-arm64.exe.sha256 diff --git a/packages/windows-arm64/package.json b/packages/windows-arm64/package.json index 33fd72a..e254525 100644 --- a/packages/windows-arm64/package.json +++ b/packages/windows-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cyclonedx/cdxgen-plugins-bin-windows-arm64", - "version": "1.6.11", + "version": "1.6.12", "description": "Arm64 binary plugins to supercharge @cyclonedx/cdxgen npm package", "main": "index.js", "repository": { diff --git a/thirdparty/trivy/Makefile b/thirdparty/trivy/Makefile index 8a09529..ba58dff 100644 --- a/thirdparty/trivy/Makefile +++ b/thirdparty/trivy/Makefile @@ -12,7 +12,7 @@ all: windows linux darwin clean: rm -rf build/ ##### LINUX BUILDS ##### -linux: build/linux_amd64 build/linux_arm64 build/linux_arm build/linux_ppc64le +linux: build/linux_amd64 build/linux_arm64 build/linux_arm build/linux_ppc64le build/linux_riscv64 build/linux_386: $(sources) $(call build,linux,386,) @@ -34,6 +34,10 @@ build/linux_ppc64le: $(sources) $(call build,linux,ppc64le,) $(call sha,linux,ppc64le,) +build/linux_riscv64: $(sources) + $(call build,linux,riscv64,) + $(call sha,linux,riscv64,) + ##### DARWIN (MAC) BUILDS ##### darwin: build/darwin_amd64 build/darwin_arm64 From 57f2c676856ad8114613236a23b1b151ce0627ac Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Sun, 11 May 2025 20:01:28 +0100 Subject: [PATCH 2/3] Update osquery. riscv64 builds Signed-off-by: Prabhu Subramanian --- thirdparty/trivy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thirdparty/trivy/Makefile b/thirdparty/trivy/Makefile index ba58dff..fe489f8 100644 --- a/thirdparty/trivy/Makefile +++ b/thirdparty/trivy/Makefile @@ -35,8 +35,8 @@ build/linux_ppc64le: $(sources) $(call sha,linux,ppc64le,) build/linux_riscv64: $(sources) - $(call build,linux,riscv64,) - $(call sha,linux,riscv64,) + $(call build,linux,riscv64,) + $(call sha,linux,riscv64,) ##### DARWIN (MAC) BUILDS ##### darwin: build/darwin_amd64 build/darwin_arm64 From 22b06cad8907e3cf74453b386f46a2caabb1f2ad Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Sun, 11 May 2025 20:54:20 +0100 Subject: [PATCH 3/3] Update osquery. riscv64 builds Signed-off-by: Prabhu Subramanian --- packages/darwin-amd64/build-darwin-amd64.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/darwin-amd64/build-darwin-amd64.sh b/packages/darwin-amd64/build-darwin-amd64.sh index 8de0658..bce795f 100755 --- a/packages/darwin-amd64/build-darwin-amd64.sh +++ b/packages/darwin-amd64/build-darwin-amd64.sh @@ -9,7 +9,6 @@ rm -rf plugins/sourcekitten mkdir -p plugins/osquery plugins/dosai plugins/sourcekitten oras pull ghcr.io/cyclonedx/cdxgen-plugins-bin:darwin-amd64 -o plugins/sourcekitten/ -sha256sum plugins/sourcekitten/sourcekitten > plugins/sourcekitten/sourcekitten.sha256 curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-osx-x64 -o plugins/dosai/dosai-darwin-amd64 chmod +x plugins/dosai/dosai-darwin-amd64