Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: improved CPE-generation for several more APK packages #1631

Merged
merged 10 commits into from
Mar 1, 2023
Merged

fix: improved CPE-generation for several more APK packages #1631

merged 10 commits into from
Mar 1, 2023

Conversation

westonsteimel
Copy link
Contributor

No description provided.

@westonsteimel
fix: correct vendor for musl
b5600b7 
Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@westonsteimel
fix: correct vendor for firefox and thunderbird
4991f2a 
Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@westonsteimel
fix: correct vendor/product for chromium
6e03189 
Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@westonsteimel
fix: correct product for apache http server
8fd3735 
Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@westonsteimel
fix: correct product for tiff
1b1a9d5 
Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@westonsteimel
fix: correct vendor for ghostscript
89dc40c 
Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@westonsteimel
fix: correct vendor for openjpeg
bbbc912 
Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@westonsteimel
fix: correct vendor/product for xorg-server
2a7975a 
Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@westonsteimel
fix: correct vendor for podofo
5d1c1ec 
Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@westonsteimel
fix: correct vendor for wpa_supplicant
14fae59 
Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@github-actions
Copy link

Benchmark Test Results

Benchmark results from the latest changes vs base branch 
goos: linux
goarch: amd64
pkg: github.com/anchore/syft/test/integration
cpu: Intel(R) Xeon(R) Platinum 8272CL CPU @ 2.60GHz
                                                          │ ./.tmp/benchmark-1f8c8e0.txt │
                                                          │            sec/op            │
ImagePackageCatalogers/alpmdb-cataloger-2                                   10.87m ± 23%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                             807.4µ ±  4%
ImagePackageCatalogers/python-package-cataloger-2                           2.879m ±  9%
ImagePackageCatalogers/php-composer-installed-cataloger-2                   711.2µ ±  8%
ImagePackageCatalogers/javascript-package-cataloger-2                       350.9µ ±  3%
ImagePackageCatalogers/dpkgdb-cataloger-2                                   497.5µ ±  3%
ImagePackageCatalogers/rpm-db-cataloger-2                                   474.3µ ±  5%
ImagePackageCatalogers/java-cataloger-2                                     10.87m ±  5%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                     8.062µ ±  6%
ImagePackageCatalogers/apkdb-cataloger-2                                    911.5µ ±  3%
ImagePackageCatalogers/go-module-binary-cataloger-2                         18.20µ ±  2%
ImagePackageCatalogers/dotnet-deps-cataloger-2                              992.7µ ±  2%
ImagePackageCatalogers/portage-cataloger-2                                  302.6µ ±  4%
ImagePackageCatalogers/sbom-cataloger-2                                     100.8µ ±  4%
ImagePackageCatalogers/binary-cataloger-2                                   136.3µ ±  9%
geomean                                                                     460.7µ

                                                          │ ./.tmp/benchmark-1f8c8e0.txt │
                                                          │             B/op             │
ImagePackageCatalogers/alpmdb-cataloger-2                                   5.060Mi ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                             141.8Ki ± 0%
ImagePackageCatalogers/python-package-cataloger-2                           946.9Ki ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2                   155.8Ki ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2                       95.55Ki ± 0%
ImagePackageCatalogers/dpkgdb-cataloger-2                                   144.7Ki ± 0%
ImagePackageCatalogers/rpm-db-cataloger-2                                   170.3Ki ± 0%
ImagePackageCatalogers/java-cataloger-2                                     2.721Mi ± 0%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                     1.523Ki ± 0%
ImagePackageCatalogers/apkdb-cataloger-2                                    232.2Ki ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2                         3.102Ki ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2                              314.5Ki ± 0%
ImagePackageCatalogers/portage-cataloger-2                                  75.39Ki ± 0%
ImagePackageCatalogers/sbom-cataloger-2                                     13.03Ki ± 0%
ImagePackageCatalogers/binary-cataloger-2                                   21.16Ki ± 0%
geomean                                                                     111.5Ki

                                                          │ ./.tmp/benchmark-1f8c8e0.txt │
                                                          │          allocs/op           │
ImagePackageCatalogers/alpmdb-cataloger-2                                    86.71k ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                              2.159k ± 0%
ImagePackageCatalogers/python-package-cataloger-2                            15.49k ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2                    3.457k ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2                        1.252k ± 0%
ImagePackageCatalogers/dpkgdb-cataloger-2                                    2.646k ± 0%
ImagePackageCatalogers/rpm-db-cataloger-2                                    3.759k ± 0%
ImagePackageCatalogers/java-cataloger-2                                      38.26k ± 0%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                       40.00 ± 0%
ImagePackageCatalogers/apkdb-cataloger-2                                     5.574k ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2                           101.0 ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2                               5.011k ± 0%
ImagePackageCatalogers/portage-cataloger-2                                   1.487k ± 0%
ImagePackageCatalogers/sbom-cataloger-2                                       392.0 ± 0%
ImagePackageCatalogers/binary-cataloger-2                                     649.0 ± 0%
geomean                                                                      2.259k

@westonsteimel westonsteimel requested a review from a team February 28, 2023 13:40
@westonsteimel westonsteimel enabled auto-merge (squash) February 28, 2023 13:40
@westonsteimel westonsteimel merged commit f1169e5 into main Mar 1, 2023
@westonsteimel westonsteimel deleted the more-apk-cpe-updates branch March 1, 2023 13:55
@kzantow kzantow added the bug Something isn't working label Mar 2, 2023
This was referenced Mar 2, 2023
Closed
Closed
Closed
Closed
Merged
Merged
Closed
Closed
Open
Open
Open
Open
Open
This was referenced Mar 10, 2023
Open
Closed
Closed
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
@westonsteimel
fix: improved CPE-generation for several more APK packages (anchore#1631
2566a7c 
)

* fix: correct vendor for musl

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>

* fix: correct vendor for firefox and thunderbird

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>

* fix: correct vendor/product for chromium

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>

* fix: correct product for apache http server

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>

* fix: correct product for tiff

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>

* fix: correct vendor for ghostscript

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>

* fix: correct vendor for openjpeg

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>

* fix: correct vendor/product for xorg-server

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>

* fix: correct vendor for podofo

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>

* fix: correct vendor for wpa_supplicant

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>

---------

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wagoodman wagoodman wagoodman approved these changes

Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@westonsteimel @wagoodman @kzantow