diff --git a/syft/pkg/cataloger/binary/classifier_cataloger_test.go b/syft/pkg/cataloger/binary/classifier_cataloger_test.go index c1d0021fa..6afc4cb96 100644 --- a/syft/pkg/cataloger/binary/classifier_cataloger_test.go +++ b/syft/pkg/cataloger/binary/classifier_cataloger_test.go @@ -1217,13 +1217,13 @@ func Test_Cataloger_PositiveCases(t *testing.T) { }, }, { - logicalFixture: "qt/4.8.7/linux-amd64", + logicalFixture: "qt/4.8.6/linux-amd64", expected: pkg.Package{ Name: "qtbase", - Version: "4.8.7", + Version: "4.8.6", Type: "binary", - PURL: "pkg:generic/qtbase@4.8.7", - Locations: locations("libQtCore.so"), + PURL: "pkg:generic/qtbase@4.8.6", + Locations: locations("libQtCore.so.4.8.6"), Metadata: metadata("qt-qtbase-lib"), }, }, @@ -1234,7 +1234,7 @@ func Test_Cataloger_PositiveCases(t *testing.T) { Version: "5.15.2", Type: "binary", PURL: "pkg:generic/qtbase@5.15.2", - Locations: locations("libQt5Core.so"), + Locations: locations("libQt5Core.so.5.15.2"), Metadata: metadata("qt-qtbase-lib"), }, }, @@ -1245,7 +1245,7 @@ func Test_Cataloger_PositiveCases(t *testing.T) { Version: "6.5.0", Type: "binary", PURL: "pkg:generic/qtbase@6.5.0", - Locations: locations("libQt6Core.so"), + Locations: locations("libQt6Core.so.6.5.0"), Metadata: metadata("qt-qtbase-lib"), }, }, diff --git a/syft/pkg/cataloger/binary/test-fixtures/Makefile b/syft/pkg/cataloger/binary/test-fixtures/Makefile index fa37d43c1..3920d2397 100644 --- a/syft/pkg/cataloger/binary/test-fixtures/Makefile +++ b/syft/pkg/cataloger/binary/test-fixtures/Makefile @@ -41,4 +41,4 @@ clean-fingerprint: ## clean up all legacy fingerprint files help: @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "$(BOLD)$(CYAN)%-25s$(RESET)%s\n", $$1, $$2}' -.PHONY: default list download download-all clean clean-fingerprint add-snippet fingerprint \ No newline at end of file +.PHONY: default list download download-all clean clean-fingerprint add-snippet fingerprint diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/4.8.6/linux-amd64/libQtCore.so.4.8.6 b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/4.8.6/linux-amd64/libQtCore.so.4.8.6 new file mode 100644 index 000000000..3282baabb Binary files /dev/null and b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/4.8.6/linux-amd64/libQtCore.so.4.8.6 differ diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/4.8.7/linux-amd64/libQtCore.so b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/4.8.7/linux-amd64/libQtCore.so deleted file mode 100644 index ca19cc27e..000000000 Binary files a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/4.8.7/linux-amd64/libQtCore.so and /dev/null differ diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/5.15.2/linux-amd64/libQt5Core.so b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/5.15.2/linux-amd64/libQt5Core.so deleted file mode 100644 index 06a4ab18b..000000000 Binary files a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/5.15.2/linux-amd64/libQt5Core.so and /dev/null differ diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/5.15.2/linux-amd64/libQt5Core.so.5.15.2 b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/5.15.2/linux-amd64/libQt5Core.so.5.15.2 new file mode 100644 index 000000000..6841cbf70 Binary files /dev/null and b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/5.15.2/linux-amd64/libQt5Core.so.5.15.2 differ diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/6.5.0/linux-amd64/libQt6Core.so b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/6.5.0/linux-amd64/libQt6Core.so deleted file mode 100644 index cc70364dc..000000000 Binary files a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/6.5.0/linux-amd64/libQt6Core.so and /dev/null differ diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/6.5.0/linux-amd64/libQt6Core.so.6.5.0 b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/6.5.0/linux-amd64/libQt6Core.so.6.5.0 new file mode 100644 index 000000000..7829b7890 Binary files /dev/null and b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/qt/6.5.0/linux-amd64/libQt6Core.so.6.5.0 differ diff --git a/syft/pkg/cataloger/binary/test-fixtures/config.yaml b/syft/pkg/cataloger/binary/test-fixtures/config.yaml index a4a834f02..38aa1d02b 100644 --- a/syft/pkg/cataloger/binary/test-fixtures/config.yaml +++ b/syft/pkg/cataloger/binary/test-fixtures/config.yaml @@ -11,7 +11,7 @@ from-images: - name: busybox version: 1.36.1 - images: + images: - ref: busybox:1.36.1@sha256:058f0df5310fbbbfea7e81a3a3e2b4bf3452438ec841138d170e170adbbd27a4 platform: linux/amd64 paths: @@ -924,3 +924,28 @@ from-images: platform: linux/amd64 paths: - /usr/share/grafana/bin/grafana-server + + # Qt Framework (https://www.qt.io/) + - name: qt + version: 6.5.0 + images: + - ref: stateoftheartio/qt6:6.5-gcc-aqt@sha256:c0dfd1cd174d855f0157ce0455270b2ee49f5eea4c7a40ffe0e848d41ae4d074 + platform: linux/amd64 + paths: + - /opt/Qt/6.5.0/gcc_64/lib/libQt6Core.so.6.5.0 + + - name: qt + version: 5.15.2 + images: + - ref: rabits/qt:5.15-desktop@sha256:8dd10b4fcdece7e329dd2b9db52dafcd6590940954bc36d5018567e850d9599c + platform: linux/amd64 + paths: + - /opt/Qt/5.15.2/gcc_64/lib/libQt5Core.so.5.15.2 + + - name: qt + version: 4.8.6 + images: + - ref: uvatbc/qt:qt4@sha256:9d6f18e000df14077f4c96e487fc84e02f1cef19c27f2a8f66f161b8a1ef6b06 + platform: linux/amd64 + paths: + - /usr/lib/x86_64-linux-gnu/libQtCore.so.4.8.6