From 8797c9fb2af8f73e1663178afa61444d4f6f4a1d Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Wed, 8 May 2024 18:15:18 +0530 Subject: [PATCH] Update default package type for alpine apk packages Reference: https://github.com/nexB/scancode-toolkit/issues/3726 Reference: https://github.com/package-url/purl-spec/pull/171 Reference: https://github.com/package-url/purl-spec/issues/159 Signed-off-by: Ayan Sinha Mahapatra --- src/packagedcode/alpine.py | 6 +- ...r-layer.tar.xz-get-installed-expected.json | 234 +++++++------- ...-container-layer.tar.xz-scan-expected.json | 300 +++++++++--------- .../bluedevil/APKBUILD-expected.json | 4 +- .../breeze-grub/APKBUILD-expected.json | 16 +- .../breeze-gtk/APKBUILD-expected.json | 16 +- .../breeze-plymouth/APKBUILD-expected.json | 16 +- .../community/breeze/APKBUILD-expected.json | 16 +- .../community/discover/APKBUILD-expected.json | 4 +- .../community/drkonqi/APKBUILD-expected.json | 16 +- .../jool-modules-lts/APKBUILD-expected.json | 16 +- .../jool-modules-rpi/APKBUILD-expected.json | 16 +- .../kactivitymanagerd/APKBUILD-expected.json | 4 +- .../kde-cli-tools/APKBUILD-expected.json | 4 +- .../kde-gtk-config/APKBUILD-expected.json | 4 +- .../kdecoration/APKBUILD-expected.json | 4 +- .../kdeplasma-addons/APKBUILD-expected.json | 4 +- .../community/kgamma5/APKBUILD-expected.json | 16 +- .../community/khotkeys/APKBUILD-expected.json | 4 +- .../kinfocenter/APKBUILD-expected.json | 4 +- .../kmenuedit/APKBUILD-expected.json | 16 +- .../community/kscreen/APKBUILD-expected.json | 4 +- .../kscreenlocker/APKBUILD-expected.json | 4 +- .../ksshaskpass/APKBUILD-expected.json | 16 +- .../kwallet-pam/APKBUILD-expected.json | 16 +- .../APKBUILD-expected.json | 4 +- .../kwayland-server/APKBUILD-expected.json | 4 +- .../community/kwin/APKBUILD-expected.json | 4 +- .../community/kwrited/APKBUILD-expected.json | 16 +- .../layer-shell-qt/APKBUILD-expected.json | 4 +- .../libkscreen/APKBUILD-expected.json | 4 +- .../libksysguard/APKBUILD-expected.json | 4 +- .../libreoffice/APKBUILD-expected.json | 16 +- .../community/milou/APKBUILD-expected.json | 4 +- .../community/mpd/APKBUILD-expected.json | 16 +- .../community/oxygen/APKBUILD-expected.json | 16 +- .../community/parole/APKBUILD-expected.json | 16 +- .../APKBUILD-expected.json | 16 +- .../plasma-desktop/APKBUILD-expected.json | 4 +- .../plasma-disks/APKBUILD-expected.json | 16 +- .../plasma-firewall/APKBUILD-expected.json | 16 +- .../plasma-integration/APKBUILD-expected.json | 4 +- .../plasma-nano/APKBUILD-expected.json | 4 +- .../plasma-nm/APKBUILD-expected.json | 4 +- .../plasma-pa/APKBUILD-expected.json | 4 +- .../APKBUILD-expected.json | 4 +- .../plasma-sdk/APKBUILD-expected.json | 16 +- .../APKBUILD-expected.json | 4 +- .../plasma-thunderbolt/APKBUILD-expected.json | 4 +- .../plasma-vault/APKBUILD-expected.json | 4 +- .../APKBUILD-expected.json | 16 +- .../plasma-workspace/APKBUILD-expected.json | 4 +- .../plymouth-kcm/APKBUILD-expected.json | 16 +- .../polkit-kde-agent-1/APKBUILD-expected.json | 16 +- .../powerdevil/APKBUILD-expected.json | 4 +- .../qqc2-breeze-style/APKBUILD-expected.json | 4 +- .../qt6-qtbase/APKBUILD-expected.json | 4 +- .../rtpengine-lts/APKBUILD-expected.json | 16 +- .../community/sddm-kcm/APKBUILD-expected.json | 4 +- .../systemsettings/APKBUILD-expected.json | 16 +- .../community/ufw/APKBUILD-expected.json | 16 +- .../APKBUILD-expected.json | 16 +- .../main/cmake/APKBUILD-expected.json | 16 +- .../main/kamailio/APKBUILD-expected.json | 16 +- .../main/libburn/APKBUILD-expected.json | 16 +- .../main/linux-lts/APKBUILD-expected.json | 16 +- .../main/linux-rpi/APKBUILD-expected.json | 16 +- .../main/lua-unit/APKBUILD-expected.json | 16 +- .../main/sqlite-tcl/APKBUILD-expected.json | 4 +- .../main/sqlite/APKBUILD-expected.json | 4 +- .../alpine14/main/sqsh/APKBUILD-expected.json | 16 +- .../alpine14/main/sudo/APKBUILD-expected.json | 4 +- .../main/util-linux/APKBUILD-expected.json | 4 +- .../testing/linux-edge/APKBUILD-expected.json | 16 +- .../testing/linux-elm/APKBUILD-expected.json | 16 +- .../testing/linux-gru/APKBUILD-expected.json | 16 +- .../community/abook/APKBUILD-expected.json | 16 +- .../darktable/APKBUILD-expected.json | 16 +- .../community/haxe/APKBUILD-expected.json | 4 +- .../linux-firmware/APKBUILD-expected.json | 4 +- .../community/2bwm/APKBUILD-expected.json | 16 +- .../community/acccheck/APKBUILD-expected.json | 16 +- .../accerciser/APKBUILD-expected.json | 16 +- .../community/alpine/APKBUILD-expected.json | 16 +- .../audacious-plugins/APKBUILD-expected.json | 4 +- .../boost-build/APKBUILD-expected.json | 16 +- .../dircproxy/APKBUILD-expected.json | 16 +- .../community/faac/APKBUILD-expected.json | 16 +- .../APKBUILD-expected.json | 16 +- .../community/gcc6/APKBUILD-expected.json | 4 +- .../hunspell-de-de/APKBUILD-expected.json | 16 +- .../imagemagick/APKBUILD-expected.json | 16 +- .../imagemagick6/APKBUILD-expected.json | 16 +- .../community/libluv/APKBUILD-expected.json | 16 +- .../nymphcast-client/APKBUILD-expected.json | 16 +- .../openjdk10/APKBUILD-expected.json | 16 +- .../py3-cairosvg/APKBUILD-expected.json | 16 +- .../community/qt6-qt3d/APKBUILD-expected.json | 4 +- .../ruby-rspec/APKBUILD-expected.json | 16 +- .../APKBUILD-expected.json | 16 +- .../community/vtk/APKBUILD-expected.json | 16 +- .../community/zsnes/APKBUILD-expected.json | 16 +- .../alpine14/main/gcc/APKBUILD-expected.json | 4 +- .../alpine14/main/icu/APKBUILD-expected.json | 4 +- .../alpine14/main/ruby/APKBUILD-expected.json | 4 +- .../APKBUILD-expected.json | 16 +- .../APKBUILD-expected.json | 4 +- .../APKBUILD-expected.json | 16 +- .../APKBUILD-expected.json | 4 +- .../APKBUILD-expected.json | 16 +- .../APKBUILD-expected.json | 16 +- .../gitlab-release-cli/APKBUILD-expected.json | 16 +- .../gtksourceviewmm3/APKBUILD-expected.json | 16 +- .../testing/pnmixer/APKBUILD-expected.json | 16 +- .../APKBUILD-expected.json | 16 +- .../buildbot/APKBUILD-expected.json | 16 +- .../full-installed/installed-expected.json | 56 ++-- .../rootfs/alpine-rootfs.tar.xz-expected.json | 296 ++++++++--------- .../single-installed/installed-expected.json | 16 +- .../small-installed/installed-expected.json | 56 ++-- tests/packagedcode/test_alpine.py | 6 +- 121 files changed, 1113 insertions(+), 1113 deletions(-) diff --git a/src/packagedcode/alpine.py b/src/packagedcode/alpine.py index e0ae10d020a..ae04c7c8a98 100644 --- a/src/packagedcode/alpine.py +++ b/src/packagedcode/alpine.py @@ -36,7 +36,7 @@ class AlpineApkArchiveHandler(models.DatafileHandler): datasource_id = 'alpine_apk_archive' path_patterns = ('*.apk',) filetypes = ('gzip compressed data',) - default_package_type = 'alpine' + default_package_type = 'apk' description = 'Alpine Linux .apk package archive' documentation_url = 'https://wiki.alpinelinux.org/wiki/Alpine_package_format' @@ -59,7 +59,7 @@ def get_license_detections_and_expression(package): class AlpineInstalledDatabaseHandler(models.DatafileHandler): datasource_id = 'alpine_installed_db' path_patterns = ('*lib/apk/db/installed',) - default_package_type = 'alpine' + default_package_type = 'apk' description = 'Alpine Linux installed package database' @classmethod @@ -130,7 +130,7 @@ def assemble(cls, package_data, resource, codebase, package_adder): class AlpineApkbuildHandler(models.DatafileHandler): datasource_id = 'alpine_apkbuild' path_patterns = ('*APKBUILD',) - default_package_type = 'alpine' + default_package_type = 'apk' description = 'Alpine Linux APKBUILD package script' documentation_url = 'https://wiki.alpinelinux.org/wiki/APKBUILD_Reference' diff --git a/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-get-installed-expected.json b/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-get-installed-expected.json index 1efd8a0ad44..9a4dfab9e9d 100644 --- a/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-get-installed-expected.json +++ b/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-get-installed-expected.json @@ -1,6 +1,6 @@ [ { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "alpine-baselayout-data", "version": "3.2.0-r22", @@ -83,7 +83,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -96,7 +96,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -105,7 +105,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -114,7 +114,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -123,7 +123,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -132,7 +132,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -141,7 +141,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -150,7 +150,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -159,7 +159,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -168,7 +168,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -177,7 +177,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -186,7 +186,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -195,7 +195,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -204,15 +204,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64" + "purl": "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "musl", "version": "1.2.3-r0", @@ -295,7 +295,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/musl@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/musl@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -308,15 +308,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/musl@1.2.3-r0?arch=x86_64" + "purl": "pkg:apk/alpine/musl@1.2.3-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "busybox", "version": "1.35.0-r15", @@ -399,7 +399,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -412,7 +412,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -421,7 +421,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -430,7 +430,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -439,7 +439,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -448,7 +448,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -457,15 +457,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64" + "purl": "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "alpine-baselayout", "version": "3.2.0-r22", @@ -566,7 +566,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -579,7 +579,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -588,7 +588,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -597,7 +597,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -606,7 +606,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -615,7 +615,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -624,7 +624,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -633,7 +633,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -642,7 +642,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -651,7 +651,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -660,7 +660,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -669,15 +669,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64" + "purl": "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "alpine-keys", "version": "2.4-r1", @@ -922,7 +922,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -935,7 +935,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -944,7 +944,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -953,7 +953,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -962,7 +962,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -971,7 +971,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -980,7 +980,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -989,7 +989,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -998,7 +998,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1007,7 +1007,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1016,7 +1016,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1025,7 +1025,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1034,7 +1034,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1043,7 +1043,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1052,7 +1052,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1061,7 +1061,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1070,7 +1070,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1079,7 +1079,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1088,7 +1088,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1097,7 +1097,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1106,7 +1106,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1115,7 +1115,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1124,15 +1124,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64" + "purl": "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "ca-certificates-bundle", "version": "20211220-r0", @@ -1215,7 +1215,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -1228,15 +1228,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64" + "purl": "pkg:apk/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "libcrypto1.1", "version": "1.1.1q-r0", @@ -1328,7 +1328,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -1341,7 +1341,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1350,7 +1350,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1359,7 +1359,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1368,7 +1368,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1377,7 +1377,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1386,7 +1386,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1395,7 +1395,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1404,7 +1404,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1413,7 +1413,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1422,15 +1422,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64" + "purl": "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "libssl1.1", "version": "1.1.1q-r0", @@ -1513,7 +1513,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/libssl1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/libssl1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -1526,15 +1526,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libssl1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libssl1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/libssl1.1@1.1.1q-r0?arch=x86_64" + "purl": "pkg:apk/alpine/libssl1.1@1.1.1q-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "ssl_client", "version": "1.35.0-r15", @@ -1605,7 +1605,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/ssl_client@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/ssl_client@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -1618,15 +1618,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/ssl_client@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/ssl_client@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/ssl_client@1.35.0-r15?arch=x86_64" + "purl": "pkg:apk/alpine/ssl_client@1.35.0-r15?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "zlib", "version": "1.2.12-r1", @@ -1709,7 +1709,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/zlib@1.2.12-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/zlib@1.2.12-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -1722,15 +1722,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/zlib@1.2.12-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/zlib@1.2.12-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/zlib@1.2.12-r1?arch=x86_64" + "purl": "pkg:apk/alpine/zlib@1.2.12-r1?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "apk-tools", "version": "2.12.9-r3", @@ -1801,7 +1801,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -1814,7 +1814,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1823,15 +1823,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/apk-tools@2.12.9-r3?arch=x86_64" + "purl": "pkg:apk/alpine/apk-tools@2.12.9-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "scanelf", "version": "1.3.4-r0", @@ -1902,7 +1902,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/scanelf@1.3.4-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/scanelf@1.3.4-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -1915,15 +1915,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/scanelf@1.3.4-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/scanelf@1.3.4-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/scanelf@1.3.4-r0?arch=x86_64" + "purl": "pkg:apk/alpine/scanelf@1.3.4-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "musl-utils", "version": "1.2.3-r0", @@ -1994,7 +1994,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -2007,7 +2007,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2016,7 +2016,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2025,7 +2025,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2034,7 +2034,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2043,15 +2043,15 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] } ], - "purl": "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64" + "purl": "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "libc-utils", "version": "0.7.2-r3", @@ -2122,7 +2122,7 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/libc-utils@0.7.2-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/libc-utils@0.7.2-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], @@ -2130,6 +2130,6 @@ "alpine_installed_db" ], "resources": [], - "purl": "pkg:alpine/alpine/libc-utils@0.7.2-r3?arch=x86_64" + "purl": "pkg:apk/alpine/libc-utils@0.7.2-r3?arch=x86_64" } ] \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-scan-expected.json b/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-scan-expected.json index b8cc210403a..5f3054d0644 100644 --- a/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-scan-expected.json +++ b/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-scan-expected.json @@ -1,7 +1,7 @@ { "packages": [ { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "alpine-baselayout-data", "version": "3.2.0-r22", @@ -84,17 +84,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64" + "purl": "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "musl", "version": "1.2.3-r0", @@ -177,17 +177,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/musl@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/musl@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/musl@1.2.3-r0?arch=x86_64" + "purl": "pkg:apk/alpine/musl@1.2.3-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "busybox", "version": "1.35.0-r15", @@ -270,17 +270,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64" + "purl": "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "alpine-baselayout", "version": "3.2.0-r22", @@ -381,17 +381,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64" + "purl": "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "alpine-keys", "version": "2.4-r1", @@ -636,17 +636,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64" + "purl": "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "ca-certificates-bundle", "version": "20211220-r0", @@ -729,17 +729,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64" + "purl": "pkg:apk/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "libcrypto1.1", "version": "1.1.1q-r0", @@ -831,17 +831,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64" + "purl": "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "libssl1.1", "version": "1.1.1q-r0", @@ -924,17 +924,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/libssl1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/libssl1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/libssl1.1@1.1.1q-r0?arch=x86_64" + "purl": "pkg:apk/alpine/libssl1.1@1.1.1q-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "ssl_client", "version": "1.35.0-r15", @@ -1005,17 +1005,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/ssl_client@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/ssl_client@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/ssl_client@1.35.0-r15?arch=x86_64" + "purl": "pkg:apk/alpine/ssl_client@1.35.0-r15?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "zlib", "version": "1.2.12-r1", @@ -1098,17 +1098,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/zlib@1.2.12-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/zlib@1.2.12-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/zlib@1.2.12-r1?arch=x86_64" + "purl": "pkg:apk/alpine/zlib@1.2.12-r1?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "apk-tools", "version": "2.12.9-r3", @@ -1179,17 +1179,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/apk-tools@2.12.9-r3?arch=x86_64" + "purl": "pkg:apk/alpine/apk-tools@2.12.9-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "scanelf", "version": "1.3.4-r0", @@ -1260,17 +1260,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/scanelf@1.3.4-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/scanelf@1.3.4-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/scanelf@1.3.4-r0?arch=x86_64" + "purl": "pkg:apk/alpine/scanelf@1.3.4-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "musl-utils", "version": "1.2.3-r0", @@ -1341,17 +1341,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64" + "purl": "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "libc-utils", "version": "0.7.2-r3", @@ -1422,14 +1422,14 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/libc-utils@0.7.2-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/libc-utils@0.7.2-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-container-layer.tar.xz/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/libc-utils@0.7.2-r3?arch=x86_64" + "purl": "pkg:apk/alpine/libc-utils@0.7.2-r3?arch=x86_64" } ], "dependencies": [ @@ -1443,7 +1443,7 @@ "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "alpine-container-layer.tar.xz/lib/apk/db/installed", "datasource_id": "alpine_installed_db" }, @@ -1457,7 +1457,7 @@ "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:alpine/alpine/musl?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:alpine/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:apk/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "alpine-container-layer.tar.xz/lib/apk/db/installed", "datasource_id": "alpine_installed_db" }, @@ -1471,7 +1471,7 @@ "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:alpine/alpine/ca-certificates-bundle?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:alpine/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:apk/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "alpine-container-layer.tar.xz/lib/apk/db/installed", "datasource_id": "alpine_installed_db" }, @@ -1485,7 +1485,7 @@ "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:alpine/alpine/scanelf?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "alpine-container-layer.tar.xz/lib/apk/db/installed", "datasource_id": "alpine_installed_db" }, @@ -1499,7 +1499,7 @@ "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:alpine/alpine/musl-utils?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:alpine/alpine/libc-utils@0.7.2-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:apk/alpine/libc-utils@0.7.2-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "alpine-container-layer.tar.xz/lib/apk/db/installed", "datasource_id": "alpine_installed_db" } @@ -1524,7 +1524,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1575,7 +1575,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1584,7 +1584,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1593,7 +1593,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1602,7 +1602,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1611,7 +1611,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1655,7 +1655,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1664,7 +1664,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1673,7 +1673,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1682,7 +1682,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1691,7 +1691,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1707,7 +1707,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1730,7 +1730,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1746,7 +1746,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1755,7 +1755,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1764,7 +1764,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1773,7 +1773,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1782,7 +1782,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1798,7 +1798,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1856,7 +1856,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1922,7 +1922,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1973,7 +1973,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1989,7 +1989,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1998,7 +1998,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2007,7 +2007,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2016,7 +2016,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2039,7 +2039,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2048,7 +2048,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2057,7 +2057,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2066,7 +2066,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2089,7 +2089,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2098,7 +2098,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2107,7 +2107,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2123,7 +2123,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2132,7 +2132,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2141,7 +2141,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2150,7 +2150,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2166,7 +2166,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2182,7 +2182,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2219,7 +2219,7 @@ "type": "file", "package_data": [ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "alpine-baselayout-data", "version": "3.2.0-r22", @@ -2420,10 +2420,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/alpine-baselayout-data@3.2.0-r22?arch=x86_64" + "purl": "pkg:apk/alpine-baselayout-data@3.2.0-r22?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "musl", "version": "1.2.3-r0", @@ -2516,10 +2516,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/musl@1.2.3-r0?arch=x86_64" + "purl": "pkg:apk/musl@1.2.3-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "busybox", "version": "1.35.0-r15", @@ -2657,10 +2657,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/busybox@1.35.0-r15?arch=x86_64" + "purl": "pkg:apk/busybox@1.35.0-r15?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "alpine-baselayout", "version": "3.2.0-r22", @@ -2872,10 +2872,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/alpine-baselayout@3.2.0-r22?arch=x86_64" + "purl": "pkg:apk/alpine-baselayout@3.2.0-r22?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "alpine-keys", "version": "2.4-r1", @@ -3319,10 +3319,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/alpine-keys@2.4-r1?arch=x86_64" + "purl": "pkg:apk/alpine-keys@2.4-r1?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ca-certificates-bundle", "version": "20211220-r0", @@ -3415,10 +3415,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/ca-certificates-bundle@20211220-r0?arch=x86_64" + "purl": "pkg:apk/ca-certificates-bundle@20211220-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libcrypto1.1", "version": "1.1.1q-r0", @@ -3601,10 +3601,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64" + "purl": "pkg:apk/libcrypto1.1@1.1.1q-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libssl1.1", "version": "1.1.1q-r0", @@ -3697,10 +3697,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libssl1.1@1.1.1q-r0?arch=x86_64" + "purl": "pkg:apk/libssl1.1@1.1.1q-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ssl_client", "version": "1.35.0-r15", @@ -3784,10 +3784,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/ssl_client@1.35.0-r15?arch=x86_64" + "purl": "pkg:apk/ssl_client@1.35.0-r15?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "zlib", "version": "1.2.12-r1", @@ -3880,10 +3880,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/zlib@1.2.12-r1?arch=x86_64" + "purl": "pkg:apk/zlib@1.2.12-r1?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "apk-tools", "version": "2.12.9-r3", @@ -3997,10 +3997,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/apk-tools@2.12.9-r3?arch=x86_64" + "purl": "pkg:apk/apk-tools@2.12.9-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "scanelf", "version": "1.3.4-r0", @@ -4084,10 +4084,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/scanelf@1.3.4-r0?arch=x86_64" + "purl": "pkg:apk/scanelf@1.3.4-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "musl-utils", "version": "1.2.3-r0", @@ -4218,10 +4218,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/musl-utils@1.2.3-r0?arch=x86_64" + "purl": "pkg:apk/musl-utils@1.2.3-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libc-utils", "version": "0.7.2-r3", @@ -4306,7 +4306,7 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libc-utils@0.7.2-r3?arch=x86_64" + "purl": "pkg:apk/libc-utils@0.7.2-r3?arch=x86_64" } ], "for_packages": [], @@ -4345,7 +4345,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4354,7 +4354,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4363,7 +4363,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4372,7 +4372,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libssl1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libssl1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4381,7 +4381,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/zlib@1.2.12-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/zlib@1.2.12-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4411,7 +4411,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4490,7 +4490,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/apk-tools@2.12.9-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4499,7 +4499,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4508,7 +4508,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r22?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4552,7 +4552,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4561,7 +4561,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4570,7 +4570,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4579,7 +4579,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4588,7 +4588,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/scanelf@1.3.4-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/scanelf@1.3.4-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4597,7 +4597,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/ssl_client@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/ssl_client@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4620,7 +4620,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4629,7 +4629,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4638,7 +4638,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1q-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4717,7 +4717,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4726,7 +4726,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4735,7 +4735,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4744,7 +4744,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4753,7 +4753,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4762,7 +4762,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4771,7 +4771,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4780,7 +4780,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4789,7 +4789,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4798,7 +4798,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4807,7 +4807,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4816,7 +4816,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4825,7 +4825,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4834,7 +4834,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4843,7 +4843,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4852,7 +4852,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4861,7 +4861,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4947,7 +4947,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.35.0-r15?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/bluedevil/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/bluedevil/APKBUILD-expected.json index 3f959e7e5c2..9e777d0dbea 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/bluedevil/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/bluedevil/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "bluedevil", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/bluedevil@5.22.0-r0" + "purl": "pkg:apk/bluedevil@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-grub/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-grub/APKBUILD-expected.json index df77305970e..deadeba5ec0 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-grub/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-grub/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "breeze-grub", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-3.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-3.0-plus", + "spdx_license_expression": "GPL-3.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", - "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "matched_text": "gpl-3.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/breeze-grub@5.22.0-r0" + "purl": "pkg:apk/breeze-grub@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-gtk/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-gtk/APKBUILD-expected.json index e9ea90dc986..4f662b581e0 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-gtk/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-gtk/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "breeze-gtk", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "LGPL-2.1-only", "matches": [ { - "score": 50.0, + "license_expression": "lgpl-2.1", + "spdx_license_expression": "LGPL-2.1-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 4, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", - "rule_identifier": "spdx_license_id_lgpl-2.1-only_for_lgpl-2.1.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_lgpl-2.1-only_for_lgpl-2.1.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.1-only_for_lgpl-2.1.RULE", "matched_text": "lgpl-2.1-only" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/breeze-gtk@5.22.0-r0" + "purl": "pkg:apk/breeze-gtk@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-plymouth/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-plymouth/APKBUILD-expected.json index 2a8b5c49cf3..84395ea97e1 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-plymouth/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-plymouth/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "breeze-plymouth", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/breeze-plymouth@5.22.0-r0" + "purl": "pkg:apk/breeze-plymouth@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze/APKBUILD-expected.json index d61e833d4f9..b971ac99617 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "breeze", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/breeze@5.22.0-r0" + "purl": "pkg:apk/breeze@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/discover/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/discover/APKBUILD-expected.json index fa31963e042..50c76ba86e8 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/discover/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/discover/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "discover", "version": "5.22.0-r0", @@ -98,5 +98,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/discover@5.22.0-r0" + "purl": "pkg:apk/discover@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/drkonqi/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/drkonqi/APKBUILD-expected.json index aa0685676b7..14a572230ae 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/drkonqi/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/drkonqi/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "drkonqi", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/drkonqi@5.22.0-r0" + "purl": "pkg:apk/drkonqi@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-lts/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-lts/APKBUILD-expected.json index c160712d3ef..af2a4e3c44c 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-lts/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-lts/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "jool-modules-lts", "version": "5.10.43-r$((", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/jool-modules-lts@5.10.43-r%24%28%28" + "purl": "pkg:apk/jool-modules-lts@5.10.43-r%24%28%28" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-rpi/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-rpi/APKBUILD-expected.json index c160712d3ef..af2a4e3c44c 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-rpi/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-rpi/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "jool-modules-lts", "version": "5.10.43-r$((", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/jool-modules-lts@5.10.43-r%24%28%28" + "purl": "pkg:apk/jool-modules-lts@5.10.43-r%24%28%28" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kactivitymanagerd/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kactivitymanagerd/APKBUILD-expected.json index fcbcbbb9836..5967bcb35dd 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kactivitymanagerd/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kactivitymanagerd/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kactivitymanagerd", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kactivitymanagerd@5.22.0-r0" + "purl": "pkg:apk/kactivitymanagerd@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-cli-tools/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-cli-tools/APKBUILD-expected.json index fbdd389c365..eb5c31861a1 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-cli-tools/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-cli-tools/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kde-cli-tools", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kde-cli-tools@5.22.0-r0" + "purl": "pkg:apk/kde-cli-tools@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-gtk-config/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-gtk-config/APKBUILD-expected.json index 4d99fab15ba..555d2f732fb 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-gtk-config/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-gtk-config/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kde-gtk-config", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kde-gtk-config@5.22.0-r0" + "purl": "pkg:apk/kde-gtk-config@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdecoration/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdecoration/APKBUILD-expected.json index afaa90fd6f7..255365fea0e 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdecoration/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdecoration/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kdecoration", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kdecoration@5.22.0-r0" + "purl": "pkg:apk/kdecoration@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdeplasma-addons/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdeplasma-addons/APKBUILD-expected.json index ff5e4b00053..e96905150f3 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdeplasma-addons/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdeplasma-addons/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kdeplasma-addons", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kdeplasma-addons@5.22.0-r0" + "purl": "pkg:apk/kdeplasma-addons@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kgamma5/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kgamma5/APKBUILD-expected.json index 1c4bb9ab5d0..62e3736bf7d 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kgamma5/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kgamma5/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kgamma5", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kgamma5@5.22.0-r0" + "purl": "pkg:apk/kgamma5@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/khotkeys/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/khotkeys/APKBUILD-expected.json index 1ab837d84ca..6635779fd5a 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/khotkeys/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/khotkeys/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "khotkeys", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/khotkeys@5.22.0-r0" + "purl": "pkg:apk/khotkeys@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kinfocenter/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kinfocenter/APKBUILD-expected.json index 511b70e22bf..cad327d58f3 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kinfocenter/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kinfocenter/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kinfocenter", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kinfocenter@5.22.0-r0" + "purl": "pkg:apk/kinfocenter@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kmenuedit/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kmenuedit/APKBUILD-expected.json index 7e2454270bf..4d379201dfd 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kmenuedit/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kmenuedit/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kmenuedit", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kmenuedit@5.22.0-r0" + "purl": "pkg:apk/kmenuedit@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreen/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreen/APKBUILD-expected.json index f661be157ec..da14645deda 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreen/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreen/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kscreen", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kscreen@5.22.0-r0" + "purl": "pkg:apk/kscreen@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreenlocker/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreenlocker/APKBUILD-expected.json index 2f6e798b294..1ed72d29967 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreenlocker/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreenlocker/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kscreenlocker", "version": "5.22.0-r0", @@ -90,5 +90,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kscreenlocker@5.22.0-r0" + "purl": "pkg:apk/kscreenlocker@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ksshaskpass/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ksshaskpass/APKBUILD-expected.json index bb9843750c4..23dc9456601 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ksshaskpass/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ksshaskpass/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ksshaskpass", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/ksshaskpass@5.22.0-r0" + "purl": "pkg:apk/ksshaskpass@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwallet-pam/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwallet-pam/APKBUILD-expected.json index a8a6b8eda24..917299c8290 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwallet-pam/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwallet-pam/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kwallet-pam", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "LGPL-2.1-or-later", "matches": [ { - "score": 50.0, + "license_expression": "lgpl-2.1-plus", + "spdx_license_expression": "LGPL-2.1-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", - "rule_identifier": "spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE", "matched_text": "lgpl-2.1-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kwallet-pam@5.22.0-r0" + "purl": "pkg:apk/kwallet-pam@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-integration/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-integration/APKBUILD-expected.json index 1f69989c255..9a9ea67ebec 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-integration/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-integration/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kwayland-integration", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kwayland-integration@5.22.0-r0" + "purl": "pkg:apk/kwayland-integration@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-server/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-server/APKBUILD-expected.json index c535bfe0e5b..963d742cc63 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-server/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-server/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kwayland-server", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kwayland-server@5.22.0-r0" + "purl": "pkg:apk/kwayland-server@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwin/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwin/APKBUILD-expected.json index cf80f9d2f3e..282f4e3b788 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwin/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwin/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kwin", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kwin@5.22.0-r0" + "purl": "pkg:apk/kwin@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwrited/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwrited/APKBUILD-expected.json index 66546879e0f..0d771ab9351 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwrited/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwrited/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kwrited", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kwrited@5.22.0-r0" + "purl": "pkg:apk/kwrited@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/layer-shell-qt/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/layer-shell-qt/APKBUILD-expected.json index 0d4e95517a9..78a582fd6dd 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/layer-shell-qt/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/layer-shell-qt/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "layer-shell-qt", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/layer-shell-qt@5.22.0-r0" + "purl": "pkg:apk/layer-shell-qt@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libkscreen/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libkscreen/APKBUILD-expected.json index 35898eb82d4..30203d20fe8 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libkscreen/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libkscreen/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libkscreen", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/libkscreen@5.22.0-r0" + "purl": "pkg:apk/libkscreen@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libksysguard/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libksysguard/APKBUILD-expected.json index f9004df6f97..439b43df315 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libksysguard/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libksysguard/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libksysguard", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/libksysguard@5.22.0-r0" + "purl": "pkg:apk/libksysguard@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libreoffice/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libreoffice/APKBUILD-expected.json index 11de8288d91..92ad1d8156a 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libreoffice/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libreoffice/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libreoffice", "version": "6.4.6.2-r11", @@ -30,17 +30,17 @@ "license_expression_spdx": "MPL-2.0", "matches": [ { - "score": 50.0, + "license_expression": "mpl-2.0", + "spdx_license_expression": "MPL-2.0", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", - "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_mpl-2.0_for_mpl-2.0.RULE", "matched_text": "mpl-2.0" } @@ -306,5 +306,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/libreoffice@6.4.6.2-r11" + "purl": "pkg:apk/libreoffice@6.4.6.2-r11" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/milou/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/milou/APKBUILD-expected.json index 6c37d66d102..2c75061f15f 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/milou/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/milou/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "milou", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/milou@5.22.0-r0" + "purl": "pkg:apk/milou@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/mpd/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/mpd/APKBUILD-expected.json index 6a91488fc13..a9aae8c79e8 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/mpd/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/mpd/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "mpd", "version": "0.22.8-r2", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -122,5 +122,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/mpd@0.22.8-r2" + "purl": "pkg:apk/mpd@0.22.8-r2" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/oxygen/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/oxygen/APKBUILD-expected.json index 5538c00a638..a542561ae85 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/oxygen/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/oxygen/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "oxygen", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "LGPL-2.1-or-later", "matches": [ { - "score": 50.0, + "license_expression": "lgpl-2.1-plus", + "spdx_license_expression": "LGPL-2.1-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", - "rule_identifier": "spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE", "matched_text": "lgpl-2.1-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/oxygen@5.22.0-r0" + "purl": "pkg:apk/oxygen@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/parole/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/parole/APKBUILD-expected.json index dabb9faead6..2f15ec33160 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/parole/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/parole/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "parole", "version": "1.0.5-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/parole@1.0.5-r0" + "purl": "pkg:apk/parole@1.0.5-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-browser-integration/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-browser-integration/APKBUILD-expected.json index 36940b793bf..44185ba15f2 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-browser-integration/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-browser-integration/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-browser-integration", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-3.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-3.0-plus", + "spdx_license_expression": "GPL-3.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", - "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "matched_text": "gpl-3.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-browser-integration@5.22.0-r0" + "purl": "pkg:apk/plasma-browser-integration@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-desktop/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-desktop/APKBUILD-expected.json index d65e8b9bcb9..0697beb451b 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-desktop/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-desktop/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-desktop", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-desktop@5.22.0-r0" + "purl": "pkg:apk/plasma-desktop@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-disks/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-disks/APKBUILD-expected.json index f97f47e514a..88a807a8bc9 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-disks/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-disks/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-disks", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-disks@5.22.0-r0" + "purl": "pkg:apk/plasma-disks@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-firewall/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-firewall/APKBUILD-expected.json index bed393ad7e0..5090aa99441 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-firewall/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-firewall/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-firewall", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-firewall@5.22.0-r0" + "purl": "pkg:apk/plasma-firewall@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-integration/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-integration/APKBUILD-expected.json index b8599062add..c7dec53258f 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-integration/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-integration/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-integration", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-integration@5.22.0-r0" + "purl": "pkg:apk/plasma-integration@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nano/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nano/APKBUILD-expected.json index b714c155144..65887c1c82c 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nano/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nano/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-nano", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-nano@5.22.0-r0" + "purl": "pkg:apk/plasma-nano@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nm/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nm/APKBUILD-expected.json index ef7d5de792b..5819ed0f457 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nm/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nm/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-nm", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-nm@5.22.0-r0" + "purl": "pkg:apk/plasma-nm@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-pa/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-pa/APKBUILD-expected.json index 28560628d4d..db652c13b71 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-pa/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-pa/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-pa", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-pa@5.22.0-r0" + "purl": "pkg:apk/plasma-pa@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-phone-components/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-phone-components/APKBUILD-expected.json index 62706cfe121..82b802e3679 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-phone-components/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-phone-components/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-phone-components", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-phone-components@5.22.0-r0" + "purl": "pkg:apk/plasma-phone-components@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-sdk/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-sdk/APKBUILD-expected.json index 9edab3a014b..0d188ffed01 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-sdk/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-sdk/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-sdk", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-sdk@5.22.0-r0" + "purl": "pkg:apk/plasma-sdk@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-systemmonitor/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-systemmonitor/APKBUILD-expected.json index 3f931b950f7..7ed7f609520 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-systemmonitor/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-systemmonitor/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-systemmonitor", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-systemmonitor@5.22.0-r0" + "purl": "pkg:apk/plasma-systemmonitor@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-thunderbolt/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-thunderbolt/APKBUILD-expected.json index 8a7ad53b596..4ab72fd508a 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-thunderbolt/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-thunderbolt/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-thunderbolt", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-thunderbolt@5.22.0-r0" + "purl": "pkg:apk/plasma-thunderbolt@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-vault/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-vault/APKBUILD-expected.json index cce09c3ff54..ba22ba7ac42 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-vault/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-vault/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-vault", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-vault@5.22.0-r0" + "purl": "pkg:apk/plasma-vault@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace-wallpapers/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace-wallpapers/APKBUILD-expected.json index 07affdea67c..382f6baa4b4 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace-wallpapers/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace-wallpapers/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-workspace-wallpapers", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-workspace-wallpapers@5.22.0-r0" + "purl": "pkg:apk/plasma-workspace-wallpapers@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace/APKBUILD-expected.json index 7938b813a92..68ce66d4cd5 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plasma-workspace", "version": "5.22.0-r2", @@ -82,5 +82,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plasma-workspace@5.22.0-r2" + "purl": "pkg:apk/plasma-workspace@5.22.0-r2" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plymouth-kcm/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plymouth-kcm/APKBUILD-expected.json index e7c703db621..3cbad324314 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plymouth-kcm/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plymouth-kcm/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "plymouth-kcm", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/plymouth-kcm@5.22.0-r0" + "purl": "pkg:apk/plymouth-kcm@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/polkit-kde-agent-1/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/polkit-kde-agent-1/APKBUILD-expected.json index 61cefd7c6ac..4fe5aaef96c 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/polkit-kde-agent-1/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/polkit-kde-agent-1/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "polkit-kde-agent-1", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/polkit-kde-agent-1@5.22.0-r0" + "purl": "pkg:apk/polkit-kde-agent-1@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/powerdevil/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/powerdevil/APKBUILD-expected.json index e111ee9240e..0a6a9568293 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/powerdevil/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/powerdevil/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "powerdevil", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/powerdevil@5.22.0-r0" + "purl": "pkg:apk/powerdevil@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qqc2-breeze-style/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qqc2-breeze-style/APKBUILD-expected.json index a49177eb6a0..4b74e231a8a 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qqc2-breeze-style/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qqc2-breeze-style/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "qqc2-breeze-style", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/qqc2-breeze-style@5.22.0-r0" + "purl": "pkg:apk/qqc2-breeze-style@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qt6-qtbase/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qt6-qtbase/APKBUILD-expected.json index 891f84336bc..2f4c3d6fc7b 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qt6-qtbase/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qt6-qtbase/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "qt6-qtbase", "version": "6.1.1-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/qt6-qtbase@6.1.1-r0" + "purl": "pkg:apk/qt6-qtbase@6.1.1-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/rtpengine-lts/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/rtpengine-lts/APKBUILD-expected.json index 49d35829d0e..73045a5d230 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/rtpengine-lts/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/rtpengine-lts/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "rtpengine-lts", "version": "5.10.43-r$((0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-3.0-only", "matches": [ { - "score": 50.0, + "license_expression": "gpl-3.0", + "spdx_license_expression": "GPL-3.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 4, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", - "rule_identifier": "spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE", "matched_text": "gpl-3.0-only" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/rtpengine-lts@5.10.43-r%24%28%280" + "purl": "pkg:apk/rtpengine-lts@5.10.43-r%24%28%280" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/sddm-kcm/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/sddm-kcm/APKBUILD-expected.json index ef1aa01bb13..9190da7bbb8 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/sddm-kcm/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/sddm-kcm/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "sddm-kcm", "version": "5.22.0-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/sddm-kcm@5.22.0-r0" + "purl": "pkg:apk/sddm-kcm@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/systemsettings/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/systemsettings/APKBUILD-expected.json index 79a4dc9a3ff..742b392b619 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/systemsettings/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/systemsettings/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "systemsettings", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/systemsettings@5.22.0-r0" + "purl": "pkg:apk/systemsettings@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ufw/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ufw/APKBUILD-expected.json index 1b950bd84e3..b240b9f6352 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ufw/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ufw/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ufw", "version": "0.36-r4", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-3.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-3.0-plus", + "spdx_license_expression": "GPL-3.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", - "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "matched_text": "gpl-3.0-or-later" } @@ -90,5 +90,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/ufw@0.36-r4" + "purl": "pkg:apk/ufw@0.36-r4" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/xdg-desktop-portal-kde/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/xdg-desktop-portal-kde/APKBUILD-expected.json index 572ff7046c4..885e0ce355d 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/xdg-desktop-portal-kde/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/xdg-desktop-portal-kde/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "xdg-desktop-portal-kde", "version": "5.22.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "LGPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "lgpl-2.0-plus", + "spdx_license_expression": "LGPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", - "rule_identifier": "spdx_license_id_lgpl-2.0-or-later_for_lgpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_lgpl-2.0-or-later_for_lgpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.0-or-later_for_lgpl-2.0-plus.RULE", "matched_text": "lgpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/xdg-desktop-portal-kde@5.22.0-r0" + "purl": "pkg:apk/xdg-desktop-portal-kde@5.22.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/cmake/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/cmake/APKBUILD-expected.json index f2272866281..9e2a306d87b 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/cmake/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/cmake/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "cmake", "version": "3.20.3-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "BSD-3-Clause", "matches": [ { - "score": 100.0, + "license_expression": "bsd-new", + "spdx_license_expression": "BSD-3-Clause", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", - "rule_identifier": "bsd-new_10.RULE", "rule_relevance": 100, + "rule_identifier": "bsd-new_10.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE", "matched_text": "bsd-3-clause" } @@ -82,5 +82,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/cmake@3.20.3-r0" + "purl": "pkg:apk/cmake@3.20.3-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/kamailio/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/kamailio/APKBUILD-expected.json index 99bc1265341..351c6aa8341 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/kamailio/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/kamailio/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "kamailio", "version": "5.4.5-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -82,5 +82,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/kamailio@5.4.5-r0" + "purl": "pkg:apk/kamailio@5.4.5-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/libburn/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/libburn/APKBUILD-expected.json index 1e8cf2fc1d9..584bb16a449 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/libburn/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/libburn/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libburn", "version": "1.5.4-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/libburn@1.5.4-r0" + "purl": "pkg:apk/libburn@1.5.4-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-lts/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-lts/APKBUILD-expected.json index 5516e225b6a..3f08b1555a8 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-lts/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-lts/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "linux-lts", "version": "5.10.43-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-only", "matches": [ { - "score": 100.0, + "license_expression": "gpl-2.0", + "spdx_license_expression": "GPL-2.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", - "rule_identifier": "gpl-2.0_52.RULE", "rule_relevance": 100, + "rule_identifier": "gpl-2.0_52.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE", "matched_text": "gpl-2.0" } @@ -206,5 +206,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/linux-lts@5.10.43-r0" + "purl": "pkg:apk/linux-lts@5.10.43-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-rpi/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-rpi/APKBUILD-expected.json index 77d6ffd871a..432d770e8c2 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-rpi/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-rpi/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "linux-rpi", "version": "5.10.43-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-only", "matches": [ { - "score": 100.0, + "license_expression": "gpl-2.0", + "spdx_license_expression": "GPL-2.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", - "rule_identifier": "gpl-2.0_52.RULE", "rule_relevance": 100, + "rule_identifier": "gpl-2.0_52.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE", "matched_text": "gpl-2.0" } @@ -146,5 +146,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/linux-rpi@5.10.43-r0" + "purl": "pkg:apk/linux-rpi@5.10.43-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/lua-unit/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/lua-unit/APKBUILD-expected.json index 25cc70c8554..c77cdfa2106 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/lua-unit/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/lua-unit/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "lua-unit", "version": "3.3-r2", @@ -30,17 +30,17 @@ "license_expression_spdx": "BSD-2-Clause", "matches": [ { - "score": 100.0, + "license_expression": "bsd-simplified", + "spdx_license_expression": "BSD-2-Clause", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "bsd-simplified", - "spdx_license_expression": "BSD-2-Clause", - "rule_identifier": "spdx_license_id_bsd-2-clause_for_bsd-simplified.RULE", "rule_relevance": 100, + "rule_identifier": "spdx_license_id_bsd-2-clause_for_bsd-simplified.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-2-clause_for_bsd-simplified.RULE", "matched_text": "bsd-2-clause" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/lua-unit@3.3-r2" + "purl": "pkg:apk/lua-unit@3.3-r2" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite-tcl/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite-tcl/APKBUILD-expected.json index e2fb61ba016..f8e63a8a180 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite-tcl/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite-tcl/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "sqlite-tcl", "version": "3.35.5-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/sqlite-tcl@3.35.5-r0" + "purl": "pkg:apk/sqlite-tcl@3.35.5-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite/APKBUILD-expected.json index a5cbd8ee88e..4db0d9e390b 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "sqlite", "version": "3.35.5-r0", @@ -82,5 +82,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/sqlite@3.35.5-r0" + "purl": "pkg:apk/sqlite@3.35.5-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqsh/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqsh/APKBUILD-expected.json index 1425348a540..e54ae3de347 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqsh/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqsh/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "sqsh", "version": "2.5.16.1-r4", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-1.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-1.0-plus", + "spdx_license_expression": "GPL-1.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", - "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE", "matched_text": "gpl-1.0-or-later" } @@ -90,5 +90,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/sqsh@2.5.16.1-r4" + "purl": "pkg:apk/sqsh@2.5.16.1-r4" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sudo/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sudo/APKBUILD-expected.json index 311afeb1f2d..96767363a99 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sudo/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sudo/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "sudo", "version": "1.9.6_p1-r1", @@ -90,5 +90,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/sudo@1.9.6_p1-r1" + "purl": "pkg:apk/sudo@1.9.6_p1-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/util-linux/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/util-linux/APKBUILD-expected.json index 1f2994a3869..d3aa0167f26 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/util-linux/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/util-linux/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "util-linux", "version": "2.37-r0", @@ -98,5 +98,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/util-linux@2.37-r0" + "purl": "pkg:apk/util-linux@2.37-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-edge/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-edge/APKBUILD-expected.json index 744116bd9b1..d6f7fcb3e4c 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-edge/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-edge/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "linux-edge", "version": "5.12.10-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-only", "matches": [ { - "score": 100.0, + "license_expression": "gpl-2.0", + "spdx_license_expression": "GPL-2.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", - "rule_identifier": "gpl-2.0_52.RULE", "rule_relevance": 100, + "rule_identifier": "gpl-2.0_52.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE", "matched_text": "gpl-2.0" } @@ -102,5 +102,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/linux-edge@5.12.10-r0" + "purl": "pkg:apk/linux-edge@5.12.10-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-elm/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-elm/APKBUILD-expected.json index a8b4382de51..c7a246fb09e 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-elm/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-elm/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "linux-elm", "version": "5.12.10-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-only", "matches": [ { - "score": 100.0, + "license_expression": "gpl-2.0", + "spdx_license_expression": "GPL-2.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", - "rule_identifier": "gpl-2.0_52.RULE", "rule_relevance": 100, + "rule_identifier": "gpl-2.0_52.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE", "matched_text": "gpl-2.0" } @@ -98,5 +98,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/linux-elm@5.12.10-r0" + "purl": "pkg:apk/linux-elm@5.12.10-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-gru/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-gru/APKBUILD-expected.json index 591e7f1d67b..506f763abf7 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-gru/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-gru/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "linux-gru", "version": "5.12.10-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-only", "matches": [ { - "score": 100.0, + "license_expression": "gpl-2.0", + "spdx_license_expression": "GPL-2.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", - "rule_identifier": "gpl-2.0_52.RULE", "rule_relevance": 100, + "rule_identifier": "gpl-2.0_52.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE", "matched_text": "gpl-2.0" } @@ -94,5 +94,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/linux-gru@5.12.10-r0" + "purl": "pkg:apk/linux-gru@5.12.10-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/abook/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/abook/APKBUILD-expected.json index 00eb86cdf44..50fdb3152a6 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/abook/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/abook/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "abook", "version": "0.6.1-r5", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -82,5 +82,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/abook@0.6.1-r5" + "purl": "pkg:apk/abook@0.6.1-r5" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/darktable/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/darktable/APKBUILD-expected.json index 966f1077fb8..64badf9d2fb 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/darktable/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/darktable/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "darktable", "version": "3.4.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-3.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-3.0-plus", + "spdx_license_expression": "GPL-3.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", - "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "matched_text": "gpl-3.0-or-later" } @@ -98,5 +98,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/darktable@3.4.0-r0" + "purl": "pkg:apk/darktable@3.4.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/haxe/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/haxe/APKBUILD-expected.json index 0ad3a3a7322..621bd4359a3 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/haxe/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/haxe/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "haxe", "version": "3.4.7-r1", @@ -98,5 +98,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/haxe@3.4.7-r1" + "purl": "pkg:apk/haxe@3.4.7-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine13/main/linux-firmware/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine13/main/linux-firmware/APKBUILD-expected.json index 9274cb21757..f8c06ade7de 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine13/main/linux-firmware/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine13/main/linux-firmware/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "linux-firmware", "version": "20201218-r0", @@ -90,5 +90,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/linux-firmware@20201218-r0" + "purl": "pkg:apk/linux-firmware@20201218-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/2bwm/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/2bwm/APKBUILD-expected.json index e4f6a8da663..cb74dfc04a5 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/2bwm/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/2bwm/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "2bwm", "version": "0.3-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "ISC", "matches": [ { - "score": 100.0, + "license_expression": "isc", + "spdx_license_expression": "ISC", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-spdx-id", + "score": 100.0, "matched_length": 1, "match_coverage": 100.0, - "matcher": "1-spdx-id", - "license_expression": "isc", - "spdx_license_expression": "ISC", - "rule_identifier": "spdx-license-identifier-isc-fd23252ced2c9184cff91208f30a380cf105f995", "rule_relevance": 100, + "rule_identifier": "spdx-license-identifier-isc-fd23252ced2c9184cff91208f30a380cf105f995", "rule_url": null, "matched_text": "isc" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/2bwm@0.3-r0" + "purl": "pkg:apk/2bwm@0.3-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/acccheck/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/acccheck/APKBUILD-expected.json index 062f591a81a..255233f71ca 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/acccheck/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/acccheck/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "acccheck", "version": "0.2.1-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-only", "matches": [ { - "score": 100.0, + "license_expression": "gpl-2.0", + "spdx_license_expression": "GPL-2.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", - "rule_identifier": "gpl-2.0_52.RULE", "rule_relevance": 100, + "rule_identifier": "gpl-2.0_52.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE", "matched_text": "gpl-2.0" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/acccheck@0.2.1-r1" + "purl": "pkg:apk/acccheck@0.2.1-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/accerciser/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/accerciser/APKBUILD-expected.json index f6879798083..af851a5b805 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/accerciser/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/accerciser/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "accerciser", "version": "3.38.0-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "BSD-3-Clause", "matches": [ { - "score": 100.0, + "license_expression": "bsd-new", + "spdx_license_expression": "BSD-3-Clause", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", - "rule_identifier": "bsd-new_10.RULE", "rule_relevance": 100, + "rule_identifier": "bsd-new_10.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE", "matched_text": "bsd-3-clause" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/accerciser@3.38.0-r1" + "purl": "pkg:apk/accerciser@3.38.0-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/alpine/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/alpine/APKBUILD-expected.json index 34226abf52f..0b30e68fa10 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/alpine/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/alpine/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "alpine", "version": "2.24-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "Apache-2.0", "matches": [ { - "score": 100.0, + "license_expression": "apache-2.0", + "spdx_license_expression": "Apache-2.0", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", - "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE", "rule_relevance": 100, + "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE", "matched_text": "apache-2.0" } @@ -82,5 +82,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/alpine@2.24-r0" + "purl": "pkg:apk/alpine@2.24-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/audacious-plugins/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/audacious-plugins/APKBUILD-expected.json index fa3c3842c0b..95244fe7c72 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/audacious-plugins/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/audacious-plugins/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "audacious-plugins", "version": "4.0.5-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/audacious-plugins@4.0.5-r0" + "purl": "pkg:apk/audacious-plugins@4.0.5-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/boost-build/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/boost-build/APKBUILD-expected.json index 15c463be0e3..70fc22720d7 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/boost-build/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/boost-build/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "boost-build", "version": "1.76.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "BSL-1.0", "matches": [ { - "score": 50.0, + "license_expression": "boost-1.0", + "spdx_license_expression": "BSL-1.0", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", - "rule_identifier": "boost-1.0_48.RULE", "rule_relevance": 50, + "rule_identifier": "boost-1.0_48.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_48.RULE", "matched_text": "bsl-1.0" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/boost-build@1.76.0-r0" + "purl": "pkg:apk/boost-build@1.76.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/dircproxy/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/dircproxy/APKBUILD-expected.json index d573365c106..c4fc77463c9 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/dircproxy/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/dircproxy/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "dircproxy", "version": "1.2.0_rc-r2", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-2.0-plus", + "spdx_license_expression": "GPL-2.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", - "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE", "matched_text": "gpl-2.0-or-later" } @@ -106,5 +106,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/dircproxy@1.2.0_rc-r2" + "purl": "pkg:apk/dircproxy@1.2.0_rc-r2" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/faac/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/faac/APKBUILD-expected.json index e0bfb283ec3..d2f7eca0f79 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/faac/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/faac/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "faac", "version": "1.30-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-3.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-3.0-plus", + "spdx_license_expression": "GPL-3.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", - "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "matched_text": "gpl-3.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/faac@1.30-r1" + "purl": "pkg:apk/faac@1.30-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/feedbackd-device-themes/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/feedbackd-device-themes/APKBUILD-expected.json index 4fc0b8ccb74..11d7b3fe466 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/feedbackd-device-themes/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/feedbackd-device-themes/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "feedbackd-device-themes", "version": "0_git20210126-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-3.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-3.0-plus", + "spdx_license_expression": "GPL-3.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", - "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE", "matched_text": "gpl-3.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/feedbackd-device-themes@0_git20210126-r0" + "purl": "pkg:apk/feedbackd-device-themes@0_git20210126-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/gcc6/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/gcc6/APKBUILD-expected.json index 2762ec76ed9..3621f05f4dc 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/gcc6/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/gcc6/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "gcc6", "version": "6.4.0-r12", @@ -386,5 +386,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/gcc6@6.4.0-r12" + "purl": "pkg:apk/gcc6@6.4.0-r12" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/hunspell-de-de/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/hunspell-de-de/APKBUILD-expected.json index 09dc27c77f0..a4b536fa789 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/hunspell-de-de/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/hunspell-de-de/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "hunspell-de-de", "version": "20170112-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-3.0-only", "matches": [ { - "score": 50.0, + "license_expression": "gpl-3.0", + "spdx_license_expression": "GPL-3.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 4, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", - "rule_identifier": "spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE", "matched_text": "gpl-3.0-only" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/hunspell-de-de@20170112-r0" + "purl": "pkg:apk/hunspell-de-de@20170112-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick/APKBUILD-expected.json index c74c1616022..9b8e8bc44d3 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "imagemagick", "version": "7.0.11.13-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "ImageMagick", "matches": [ { - "score": 100.0, + "license_expression": "imagemagick", + "spdx_license_expression": "ImageMagick", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-spdx-id", + "score": 100.0, "matched_length": 1, "match_coverage": 100.0, - "matcher": "1-spdx-id", - "license_expression": "imagemagick", - "spdx_license_expression": "ImageMagick", - "rule_identifier": "spdx-license-identifier-imagemagick-0dd8f5c123a82d3e8b7c6d577c371911a89076bb", "rule_relevance": 100, + "rule_identifier": "spdx-license-identifier-imagemagick-0dd8f5c123a82d3e8b7c6d577c371911a89076bb", "rule_url": null, "matched_text": "imagemagick" } @@ -82,5 +82,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/imagemagick@7.0.11.13-r0" + "purl": "pkg:apk/imagemagick@7.0.11.13-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick6/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick6/APKBUILD-expected.json index bfad352408a..93e0e676ad4 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick6/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick6/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "imagemagick6", "version": "6.9.11.55-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "Apache-2.0", "matches": [ { - "score": 100.0, + "license_expression": "apache-2.0", + "spdx_license_expression": "Apache-2.0", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", - "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE", "rule_relevance": 100, + "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE", "matched_text": "apache-2.0" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/imagemagick6@6.9.11.55-r0" + "purl": "pkg:apk/imagemagick6@6.9.11.55-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/libluv/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/libluv/APKBUILD-expected.json index 57b27ff9395..cb7a4769758 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/libluv/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/libluv/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libluv", "version": "1.36.0.0-r2", @@ -30,17 +30,17 @@ "license_expression_spdx": "Apache-2.0", "matches": [ { - "score": 100.0, + "license_expression": "apache-2.0", + "spdx_license_expression": "Apache-2.0", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", - "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE", "rule_relevance": 100, + "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE", "matched_text": "apache-2.0" } @@ -90,5 +90,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/libluv@1.36.0.0-r2" + "purl": "pkg:apk/libluv@1.36.0.0-r2" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/nymphcast-client/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/nymphcast-client/APKBUILD-expected.json index 32012d0ef54..4b68f1a6129 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/nymphcast-client/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/nymphcast-client/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "nymphcast-client", "version": "0.1_alpha4-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "BSD-3-Clause", "matches": [ { - "score": 100.0, + "license_expression": "bsd-new", + "spdx_license_expression": "BSD-3-Clause", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", - "rule_identifier": "bsd-new_10.RULE", "rule_relevance": 100, + "rule_identifier": "bsd-new_10.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE", "matched_text": "bsd-3-clause" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/nymphcast-client@0.1_alpha4-r0" + "purl": "pkg:apk/nymphcast-client@0.1_alpha4-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/openjdk10/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/openjdk10/APKBUILD-expected.json index 6a091b1c7c6..748fe8006fc 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/openjdk10/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/openjdk10/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "openjdk10", "version": "10.0.2_p13-r3", @@ -30,17 +30,17 @@ "license_expression_spdx": "Classpath-exception-2.0", "matches": [ { - "score": 100.0, + "license_expression": "classpath-exception-2.0", + "spdx_license_expression": "Classpath-exception-2.0", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 6, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "classpath-exception-2.0", - "spdx_license_expression": "Classpath-exception-2.0", - "rule_identifier": "classpath-exception-2.0_6.RULE", "rule_relevance": 100, + "rule_identifier": "classpath-exception-2.0_6.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/classpath-exception-2.0_6.RULE", "matched_text": "gpl-2.0-with-classpath-exception" } @@ -170,5 +170,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/openjdk10@10.0.2_p13-r3" + "purl": "pkg:apk/openjdk10@10.0.2_p13-r3" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/py3-cairosvg/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/py3-cairosvg/APKBUILD-expected.json index b36cef29ea7..6f8a4a83180 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/py3-cairosvg/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/py3-cairosvg/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "py3-cairosvg", "version": "2.5.2-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "LGPL-3.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "lgpl-3.0-plus", + "spdx_license_expression": "LGPL-3.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", - "rule_identifier": "spdx_license_id_lgpl-3.0-or-later_for_lgpl-3.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_lgpl-3.0-or-later_for_lgpl-3.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-3.0-or-later_for_lgpl-3.0-plus.RULE", "matched_text": "lgpl-3.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/py3-cairosvg@2.5.2-r1" + "purl": "pkg:apk/py3-cairosvg@2.5.2-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/qt6-qt3d/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/qt6-qt3d/APKBUILD-expected.json index d231e218466..c787d914038 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/qt6-qt3d/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/qt6-qt3d/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "qt6-qt3d", "version": "6.1.1-r0", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/qt6-qt3d@6.1.1-r0" + "purl": "pkg:apk/qt6-qt3d@6.1.1-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/ruby-rspec/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/ruby-rspec/APKBUILD-expected.json index 2957134f73b..931ab2533e0 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/ruby-rspec/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/ruby-rspec/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ruby-rspec", "version": "3.10.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "MIT", "matches": [ { - "score": 100.0, + "license_expression": "mit", + "spdx_license_expression": "MIT", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-spdx-id", + "score": 100.0, "matched_length": 1, "match_coverage": 100.0, - "matcher": "1-spdx-id", - "license_expression": "mit", - "spdx_license_expression": "MIT", - "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff", "rule_relevance": 100, + "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff", "rule_url": null, "matched_text": "mit" } @@ -82,5 +82,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/ruby-rspec@3.10.0-r0" + "purl": "pkg:apk/ruby-rspec@3.10.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/unicode-character-database/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/unicode-character-database/APKBUILD-expected.json index 685da43b908..07376177256 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/unicode-character-database/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/unicode-character-database/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "unicode-character-database", "version": "13.0.0-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "Unicode-DFS-2015", "matches": [ { - "score": 50.0, + "license_expression": "unicode-dfs-2015", + "spdx_license_expression": "Unicode-DFS-2015", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "unicode-dfs-2015", - "spdx_license_expression": "Unicode-DFS-2015", - "rule_identifier": "spdx_license_id_unicode-dfs-2015_for_unicode-dfs-2015.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_unicode-dfs-2015_for_unicode-dfs-2015.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_unicode-dfs-2015_for_unicode-dfs-2015.RULE", "matched_text": "unicode-dfs-2015" } @@ -106,5 +106,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/unicode-character-database@13.0.0-r1" + "purl": "pkg:apk/unicode-character-database@13.0.0-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/vtk/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/vtk/APKBUILD-expected.json index 5b847bdc162..1eaf5d79131 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/vtk/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/vtk/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "vtk", "version": "9.0.1-r5", @@ -30,17 +30,17 @@ "license_expression_spdx": "BSD-3-Clause", "matches": [ { - "score": 100.0, + "license_expression": "bsd-new", + "spdx_license_expression": "BSD-3-Clause", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", - "rule_identifier": "bsd-new_10.RULE", "rule_relevance": 100, + "rule_identifier": "bsd-new_10.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE", "matched_text": "bsd-3-clause" } @@ -98,5 +98,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/vtk@9.0.1-r5" + "purl": "pkg:apk/vtk@9.0.1-r5" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/zsnes/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/zsnes/APKBUILD-expected.json index c6218d4d5c7..d4fc33d372f 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/zsnes/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/zsnes/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "zsnes", "version": "1.51-r11", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-only", "matches": [ { - "score": 100.0, + "license_expression": "gpl-2.0", + "spdx_license_expression": "GPL-2.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", - "rule_identifier": "gpl-2.0_52.RULE", "rule_relevance": 100, + "rule_identifier": "gpl-2.0_52.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE", "matched_text": "gpl-2.0" } @@ -130,5 +130,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/zsnes@1.51-r11" + "purl": "pkg:apk/zsnes@1.51-r11" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/gcc/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/gcc/APKBUILD-expected.json index 1d0abb6963c..a511f676660 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/gcc/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/gcc/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "gcc", "version": "10.3.1_git20210424-r1", @@ -402,5 +402,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/gcc@10.3.1_git20210424-r1" + "purl": "pkg:apk/gcc@10.3.1_git20210424-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/icu/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/icu/APKBUILD-expected.json index 765d1e7977f..5e5f5070eca 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/icu/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/icu/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "icu", "version": "67.1-r2", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/icu@67.1-r2" + "purl": "pkg:apk/icu@67.1-r2" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/ruby/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/ruby/APKBUILD-expected.json index b6b5c7f659e..4fac45f5cce 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/ruby/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/ruby/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ruby", "version": "2.7.3-r1", @@ -106,5 +106,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/ruby@2.7.3-r1" + "purl": "pkg:apk/ruby@2.7.3-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-dcontainers/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-dcontainers/APKBUILD-expected.json index 4a085574a4d..7bf1c077e58 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-dcontainers/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-dcontainers/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "dcontainers", "version": "0.8.0_alpha19-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "BSL-1.0", "matches": [ { - "score": 50.0, + "license_expression": "boost-1.0", + "spdx_license_expression": "BSL-1.0", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", - "rule_identifier": "boost-1.0_48.RULE", "rule_relevance": 50, + "rule_identifier": "boost-1.0_48.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_48.RULE", "matched_text": "bsl-1.0" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/dcontainers@0.8.0_alpha19-r1" + "purl": "pkg:apk/dcontainers@0.8.0_alpha19-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-linux-firmware/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-linux-firmware/APKBUILD-expected.json index 65f59643913..5a5a4f992fe 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-linux-firmware/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-linux-firmware/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "linux-firmware", "version": "20210511-r0", @@ -106,5 +106,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/linux-firmware@20210511-r0" + "purl": "pkg:apk/linux-firmware@20210511-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-lua-lustache/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-lua-lustache/APKBUILD-expected.json index 7da9b3aa53d..0eb74f08a60 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-lua-lustache/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-lua-lustache/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "lua-lustache", "version": "1.3.1-r3", @@ -30,17 +30,17 @@ "license_expression_spdx": "MIT", "matches": [ { - "score": 100.0, + "license_expression": "mit", + "spdx_license_expression": "MIT", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-spdx-id", + "score": 100.0, "matched_length": 1, "match_coverage": 100.0, - "matcher": "1-spdx-id", - "license_expression": "mit", - "spdx_license_expression": "MIT", - "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff", "rule_relevance": 100, + "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff", "rule_url": null, "matched_text": "mit" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/lua-lustache@1.3.1-r3" + "purl": "pkg:apk/lua-lustache@1.3.1-r3" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-perl-socket-getaddrinfo/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-perl-socket-getaddrinfo/APKBUILD-expected.json index e24105a0505..fe26501a34b 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-perl-socket-getaddrinfo/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-perl-socket-getaddrinfo/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "perl-socket-getaddrinfo", "version": "0.22-r3", @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/perl-socket-getaddrinfo@0.22-r3" + "purl": "pkg:apk/perl-socket-getaddrinfo@0.22-r3" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-stdx-allocator/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-stdx-allocator/APKBUILD-expected.json index f766c13f4cd..29937186ad0 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-stdx-allocator/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-stdx-allocator/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "stdx-allocator", "version": "3.1.0_beta2-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "BSL-1.0", "matches": [ { - "score": 50.0, + "license_expression": "boost-1.0", + "spdx_license_expression": "BSL-1.0", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", - "rule_identifier": "boost-1.0_48.RULE", "rule_relevance": 50, + "rule_identifier": "boost-1.0_48.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_48.RULE", "matched_text": "bsl-1.0" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/stdx-allocator@3.1.0_beta2-r1" + "purl": "pkg:apk/stdx-allocator@3.1.0_beta2-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand_in_python-py3-cssselect2/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand_in_python-py3-cssselect2/APKBUILD-expected.json index 7a9bb4c4651..d1f1cc83a90 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand_in_python-py3-cssselect2/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand_in_python-py3-cssselect2/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "py3-cssselect2", "version": "0.4.1-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "BSD-3-Clause", "matches": [ { - "score": 100.0, + "license_expression": "bsd-new", + "spdx_license_expression": "BSD-3-Clause", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", - "rule_identifier": "bsd-new_10.RULE", "rule_relevance": 100, + "rule_identifier": "bsd-new_10.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE", "matched_text": "bsd-3-clause" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/py3-cssselect2@0.4.1-r1" + "purl": "pkg:apk/py3-cssselect2@0.4.1-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gitlab-release-cli/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gitlab-release-cli/APKBUILD-expected.json index d477574248d..f175231f7df 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gitlab-release-cli/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gitlab-release-cli/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "gitlab-release-cli", "version": "0.3.0-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "MIT", "matches": [ { - "score": 100.0, + "license_expression": "mit", + "spdx_license_expression": "MIT", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-spdx-id", + "score": 100.0, "matched_length": 1, "match_coverage": 100.0, - "matcher": "1-spdx-id", - "license_expression": "mit", - "spdx_license_expression": "MIT", - "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff", "rule_relevance": 100, + "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff", "rule_url": null, "matched_text": "mit" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/gitlab-release-cli@0.3.0-r1" + "purl": "pkg:apk/gitlab-release-cli@0.3.0-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gtksourceviewmm3/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gtksourceviewmm3/APKBUILD-expected.json index f6d2d9c0ed7..cd2da864474 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gtksourceviewmm3/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gtksourceviewmm3/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "gtksourceviewmm3", "version": "3.21.3-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "LGPL-2.1-or-later", "matches": [ { - "score": 50.0, + "license_expression": "lgpl-2.1-plus", + "spdx_license_expression": "LGPL-2.1-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", - "rule_identifier": "spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE", "matched_text": "lgpl-2.1-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/gtksourceviewmm3@3.21.3-r0" + "purl": "pkg:apk/gtksourceviewmm3@3.21.3-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/pnmixer/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/pnmixer/APKBUILD-expected.json index bf10a282285..7d0376a11a8 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/pnmixer/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/pnmixer/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "pnmixer", "version": "0.7.2-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-1.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-1.0-plus", + "spdx_license_expression": "GPL-1.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", - "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE", "matched_text": "gpl-1.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/pnmixer@0.7.2-r1" + "purl": "pkg:apk/pnmixer@0.7.2-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/ubuntu-archive-keyring/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/ubuntu-archive-keyring/APKBUILD-expected.json index a83c0cd7a40..5019845195a 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/ubuntu-archive-keyring/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/ubuntu-archive-keyring/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ubuntu-archive-keyring", "version": "2016.05.13.1-r1", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-1.0-or-later", "matches": [ { - "score": 50.0, + "license_expression": "gpl-1.0-plus", + "spdx_license_expression": "GPL-1.0-or-later", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 50.0, "matched_length": 5, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", - "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE", "rule_relevance": 50, + "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE", "matched_text": "gpl-1.0-or-later" } @@ -74,5 +74,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/ubuntu-archive-keyring@2016.05.13.1-r1" + "purl": "pkg:apk/ubuntu-archive-keyring@2016.05.13.1-r1" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/unmaintained/buildbot/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/unmaintained/buildbot/APKBUILD-expected.json index 115c8a8e56a..f5a0198a7c6 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/unmaintained/buildbot/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/unmaintained/buildbot/APKBUILD-expected.json @@ -1,5 +1,5 @@ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "buildbot", "version": "1.6.0-r0", @@ -30,17 +30,17 @@ "license_expression_spdx": "GPL-2.0-only", "matches": [ { - "score": 100.0, + "license_expression": "gpl-2.0", + "spdx_license_expression": "GPL-2.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 3, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", - "rule_identifier": "gpl-2.0_52.RULE", "rule_relevance": 100, + "rule_identifier": "gpl-2.0_52.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE", "matched_text": "gpl-2.0" } @@ -90,5 +90,5 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_apkbuild", - "purl": "pkg:alpine/buildbot@1.6.0-r0" + "purl": "pkg:apk/buildbot@1.6.0-r0" } \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/full-installed/installed-expected.json b/tests/packagedcode/data/alpine/full-installed/installed-expected.json index 39d8f9aa16f..900d770235d 100644 --- a/tests/packagedcode/data/alpine/full-installed/installed-expected.json +++ b/tests/packagedcode/data/alpine/full-installed/installed-expected.json @@ -1,6 +1,6 @@ [ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "musl", "version": "1.1.24-r8", @@ -93,10 +93,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/musl@1.1.24-r8?arch=x86_64" + "purl": "pkg:apk/musl@1.1.24-r8?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "busybox", "version": "1.31.1-r16", @@ -234,10 +234,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/busybox@1.31.1-r16?arch=x86_64" + "purl": "pkg:apk/busybox@1.31.1-r16?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "alpine-baselayout", "version": "3.2.0-r6", @@ -555,10 +555,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/alpine-baselayout@3.2.0-r6?arch=x86_64" + "purl": "pkg:apk/alpine-baselayout@3.2.0-r6?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "alpine-keys", "version": "2.2-r0", @@ -813,10 +813,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/alpine-keys@2.2-r0?arch=x86_64" + "purl": "pkg:apk/alpine-keys@2.2-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libcrypto1.1", "version": "1.1.1g-r0", @@ -999,10 +999,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libcrypto1.1@1.1.1g-r0?arch=x86_64" + "purl": "pkg:apk/libcrypto1.1@1.1.1g-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libssl1.1", "version": "1.1.1g-r0", @@ -1095,10 +1095,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libssl1.1@1.1.1g-r0?arch=x86_64" + "purl": "pkg:apk/libssl1.1@1.1.1g-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ca-certificates-bundle", "version": "20191127-r2", @@ -1191,10 +1191,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/ca-certificates-bundle@20191127-r2?arch=x86_64" + "purl": "pkg:apk/ca-certificates-bundle@20191127-r2?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libtls-standalone", "version": "2.9.1-r1", @@ -1290,10 +1290,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libtls-standalone@2.9.1-r1?arch=x86_64" + "purl": "pkg:apk/libtls-standalone@2.9.1-r1?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ssl_client", "version": "1.31.1-r16", @@ -1377,10 +1377,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/ssl_client@1.31.1-r16?arch=x86_64" + "purl": "pkg:apk/ssl_client@1.31.1-r16?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "zlib", "version": "1.2.11-r3", @@ -1473,10 +1473,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/zlib@1.2.11-r3?arch=x86_64" + "purl": "pkg:apk/zlib@1.2.11-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "apk-tools", "version": "2.10.5-r1", @@ -1560,10 +1560,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/apk-tools@2.10.5-r1?arch=x86_64" + "purl": "pkg:apk/apk-tools@2.10.5-r1?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "scanelf", "version": "1.2.6-r0", @@ -1647,10 +1647,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/scanelf@1.2.6-r0?arch=x86_64" + "purl": "pkg:apk/scanelf@1.2.6-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "musl-utils", "version": "1.1.24-r8", @@ -1781,10 +1781,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/musl-utils@1.1.24-r8?arch=x86_64" + "purl": "pkg:apk/musl-utils@1.1.24-r8?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libc-utils", "version": "0.7.2-r3", @@ -1869,6 +1869,6 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libc-utils@0.7.2-r3?arch=x86_64" + "purl": "pkg:apk/libc-utils@0.7.2-r3?arch=x86_64" } ] \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/rootfs/alpine-rootfs.tar.xz-expected.json b/tests/packagedcode/data/alpine/rootfs/alpine-rootfs.tar.xz-expected.json index 840bb413b74..a96349fcb92 100644 --- a/tests/packagedcode/data/alpine/rootfs/alpine-rootfs.tar.xz-expected.json +++ b/tests/packagedcode/data/alpine/rootfs/alpine-rootfs.tar.xz-expected.json @@ -1,7 +1,7 @@ { "packages": [ { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "musl", "version": "1.2.2-r7", @@ -84,17 +84,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/musl@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/musl@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/musl@1.2.2-r7?arch=x86_64" + "purl": "pkg:apk/alpine/musl@1.2.2-r7?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "busybox", "version": "1.34.1-r5", @@ -177,17 +177,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/busybox@1.34.1-r5?arch=x86_64" + "purl": "pkg:apk/alpine/busybox@1.34.1-r5?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "alpine-baselayout", "version": "3.2.0-r18", @@ -297,17 +297,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64" + "purl": "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "alpine-keys", "version": "2.4-r1", @@ -552,17 +552,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64" + "purl": "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "ca-certificates-bundle", "version": "20211220-r0", @@ -645,17 +645,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64" + "purl": "pkg:apk/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "libcrypto1.1", "version": "1.1.1n-r0", @@ -765,17 +765,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64" + "purl": "pkg:apk/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "libssl1.1", "version": "1.1.1n-r0", @@ -858,17 +858,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/libssl1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/libssl1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/libssl1.1@1.1.1n-r0?arch=x86_64" + "purl": "pkg:apk/alpine/libssl1.1@1.1.1n-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "libretls", "version": "3.3.4-r3", @@ -951,17 +951,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/libretls@3.3.4-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/libretls@3.3.4-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/libretls@3.3.4-r3?arch=x86_64" + "purl": "pkg:apk/alpine/libretls@3.3.4-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "ssl_client", "version": "1.34.1-r5", @@ -1032,17 +1032,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/ssl_client@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/ssl_client@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/ssl_client@1.34.1-r5?arch=x86_64" + "purl": "pkg:apk/alpine/ssl_client@1.34.1-r5?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "zlib", "version": "1.2.12-r0", @@ -1125,17 +1125,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/zlib@1.2.12-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/zlib@1.2.12-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/zlib@1.2.12-r0?arch=x86_64" + "purl": "pkg:apk/alpine/zlib@1.2.12-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "apk-tools", "version": "2.12.7-r3", @@ -1206,17 +1206,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/apk-tools@2.12.7-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/apk-tools@2.12.7-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/apk-tools@2.12.7-r3?arch=x86_64" + "purl": "pkg:apk/alpine/apk-tools@2.12.7-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "scanelf", "version": "1.3.3-r0", @@ -1287,17 +1287,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/scanelf@1.3.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/scanelf@1.3.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/scanelf@1.3.3-r0?arch=x86_64" + "purl": "pkg:apk/alpine/scanelf@1.3.3-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "musl-utils", "version": "1.2.2-r7", @@ -1368,17 +1368,17 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/musl-utils@1.2.2-r7?arch=x86_64" + "purl": "pkg:apk/alpine/musl-utils@1.2.2-r7?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": "alpine", "name": "libc-utils", "version": "0.7.2-r3", @@ -1449,14 +1449,14 @@ "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, - "package_uid": "pkg:alpine/alpine/libc-utils@0.7.2-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "package_uid": "pkg:apk/alpine/libc-utils@0.7.2-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ "alpine-rootfs/lib/apk/db/installed" ], "datasource_ids": [ "alpine_installed_db" ], - "purl": "pkg:alpine/alpine/libc-utils@0.7.2-r3?arch=x86_64" + "purl": "pkg:apk/alpine/libc-utils@0.7.2-r3?arch=x86_64" } ], "dependencies": [ @@ -1470,7 +1470,7 @@ "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:alpine/alpine/ca-certificates-bundle?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:alpine/alpine/libretls@3.3.4-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:apk/alpine/libretls@3.3.4-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "alpine-rootfs/lib/apk/db/installed", "datasource_id": "alpine_installed_db" }, @@ -1484,7 +1484,7 @@ "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:alpine/alpine/musl?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:alpine/alpine/apk-tools@2.12.7-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:apk/alpine/apk-tools@2.12.7-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "alpine-rootfs/lib/apk/db/installed", "datasource_id": "alpine_installed_db" }, @@ -1498,7 +1498,7 @@ "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:alpine/alpine/ca-certificates-bundle?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:alpine/alpine/apk-tools@2.12.7-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:apk/alpine/apk-tools@2.12.7-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "alpine-rootfs/lib/apk/db/installed", "datasource_id": "alpine_installed_db" }, @@ -1512,7 +1512,7 @@ "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:alpine/alpine/scanelf?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:alpine/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:apk/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "alpine-rootfs/lib/apk/db/installed", "datasource_id": "alpine_installed_db" }, @@ -1526,7 +1526,7 @@ "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:alpine/alpine/musl-utils?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:alpine/alpine/libc-utils@0.7.2-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:apk/alpine/libc-utils@0.7.2-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "alpine-rootfs/lib/apk/db/installed", "datasource_id": "alpine_installed_db" } @@ -1551,7 +1551,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1602,7 +1602,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1611,7 +1611,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1620,7 +1620,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1629,7 +1629,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1638,7 +1638,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1682,7 +1682,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1691,7 +1691,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1700,7 +1700,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1709,7 +1709,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1718,7 +1718,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1734,7 +1734,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1757,7 +1757,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1773,7 +1773,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1782,7 +1782,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1791,7 +1791,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1800,7 +1800,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1809,7 +1809,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1825,7 +1825,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1883,7 +1883,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -1949,7 +1949,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2000,7 +2000,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2016,7 +2016,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2025,7 +2025,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2034,7 +2034,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2043,7 +2043,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2052,7 +2052,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2061,7 +2061,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2070,7 +2070,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2079,7 +2079,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2102,7 +2102,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2118,7 +2118,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2127,7 +2127,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2136,7 +2136,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2152,7 +2152,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2168,7 +2168,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -2205,7 +2205,7 @@ "type": "file", "package_data": [ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "musl", "version": "1.2.2-r7", @@ -2298,10 +2298,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/musl@1.2.2-r7?arch=x86_64" + "purl": "pkg:apk/musl@1.2.2-r7?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "busybox", "version": "1.34.1-r5", @@ -2439,10 +2439,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/busybox@1.34.1-r5?arch=x86_64" + "purl": "pkg:apk/busybox@1.34.1-r5?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "alpine-baselayout", "version": "3.2.0-r18", @@ -2769,10 +2769,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/alpine-baselayout@3.2.0-r18?arch=x86_64" + "purl": "pkg:apk/alpine-baselayout@3.2.0-r18?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "alpine-keys", "version": "2.4-r1", @@ -3216,10 +3216,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/alpine-keys@2.4-r1?arch=x86_64" + "purl": "pkg:apk/alpine-keys@2.4-r1?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ca-certificates-bundle", "version": "20211220-r0", @@ -3312,10 +3312,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/ca-certificates-bundle@20211220-r0?arch=x86_64" + "purl": "pkg:apk/ca-certificates-bundle@20211220-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libcrypto1.1", "version": "1.1.1n-r0", @@ -3489,10 +3489,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64" + "purl": "pkg:apk/libcrypto1.1@1.1.1n-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libssl1.1", "version": "1.1.1n-r0", @@ -3585,10 +3585,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libssl1.1@1.1.1n-r0?arch=x86_64" + "purl": "pkg:apk/libssl1.1@1.1.1n-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libretls", "version": "3.3.4-r3", @@ -3692,10 +3692,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libretls@3.3.4-r3?arch=x86_64" + "purl": "pkg:apk/libretls@3.3.4-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ssl_client", "version": "1.34.1-r5", @@ -3779,10 +3779,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/ssl_client@1.34.1-r5?arch=x86_64" + "purl": "pkg:apk/ssl_client@1.34.1-r5?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "zlib", "version": "1.2.12-r0", @@ -3875,10 +3875,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/zlib@1.2.12-r0?arch=x86_64" + "purl": "pkg:apk/zlib@1.2.12-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "apk-tools", "version": "2.12.7-r3", @@ -3992,10 +3992,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/apk-tools@2.12.7-r3?arch=x86_64" + "purl": "pkg:apk/apk-tools@2.12.7-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "scanelf", "version": "1.3.3-r0", @@ -4079,10 +4079,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/scanelf@1.3.3-r0?arch=x86_64" + "purl": "pkg:apk/scanelf@1.3.3-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "musl-utils", "version": "1.2.2-r7", @@ -4213,10 +4213,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/musl-utils@1.2.2-r7?arch=x86_64" + "purl": "pkg:apk/musl-utils@1.2.2-r7?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libc-utils", "version": "0.7.2-r3", @@ -4301,7 +4301,7 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libc-utils@0.7.2-r3?arch=x86_64" + "purl": "pkg:apk/libc-utils@0.7.2-r3?arch=x86_64" } ], "for_packages": [], @@ -4340,7 +4340,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4349,7 +4349,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/apk-tools@2.12.7-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/apk-tools@2.12.7-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4358,7 +4358,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4367,7 +4367,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libssl1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libssl1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4376,7 +4376,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/zlib@1.2.12-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/zlib@1.2.12-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4406,7 +4406,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4485,7 +4485,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/apk-tools@2.12.7-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/apk-tools@2.12.7-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4494,7 +4494,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4503,7 +4503,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4547,7 +4547,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4556,7 +4556,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4565,7 +4565,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4574,7 +4574,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/musl-utils@1.2.2-r7?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4583,7 +4583,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/scanelf@1.3.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/scanelf@1.3.3-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4592,7 +4592,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/ssl_client@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/ssl_client@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4615,7 +4615,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4624,7 +4624,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4633,7 +4633,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4642,7 +4642,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/libretls@3.3.4-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/libretls@3.3.4-r3?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4721,7 +4721,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4730,7 +4730,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4739,7 +4739,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4748,7 +4748,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4757,7 +4757,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4766,7 +4766,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4775,7 +4775,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4784,7 +4784,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4793,7 +4793,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4802,7 +4802,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4811,7 +4811,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4820,7 +4820,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4829,7 +4829,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4838,7 +4838,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4847,7 +4847,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4856,7 +4856,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4865,7 +4865,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/alpine-keys@2.4-r1?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -4951,7 +4951,7 @@ "type": "file", "package_data": [], "for_packages": [ - "pkg:alpine/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:apk/alpine/busybox@1.34.1-r5?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, diff --git a/tests/packagedcode/data/alpine/single-installed/installed-expected.json b/tests/packagedcode/data/alpine/single-installed/installed-expected.json index f8e6a1fc88b..99e6a703d21 100644 --- a/tests/packagedcode/data/alpine/single-installed/installed-expected.json +++ b/tests/packagedcode/data/alpine/single-installed/installed-expected.json @@ -1,6 +1,6 @@ [ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "busybox", "version": "1.31.1-r9", @@ -41,17 +41,17 @@ "license_expression_spdx": "GPL-2.0-only", "matches": [ { - "score": 100.0, + "license_expression": "gpl-2.0", + "spdx_license_expression": "GPL-2.0-only", + "from_file": null, "start_line": 1, "end_line": 1, - "from_file": null, + "matcher": "1-hash", + "score": 100.0, "matched_length": 4, "match_coverage": 100.0, - "matcher": "1-hash", - "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", - "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE", "rule_relevance": 100, + "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE", "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE", "matched_text": "gpl-2.0-only" } @@ -138,6 +138,6 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/busybox@1.31.1-r9?arch=x86_64" + "purl": "pkg:apk/busybox@1.31.1-r9?arch=x86_64" } ] \ No newline at end of file diff --git a/tests/packagedcode/data/alpine/small-installed/installed-expected.json b/tests/packagedcode/data/alpine/small-installed/installed-expected.json index ad245604036..120f94fe086 100644 --- a/tests/packagedcode/data/alpine/small-installed/installed-expected.json +++ b/tests/packagedcode/data/alpine/small-installed/installed-expected.json @@ -1,6 +1,6 @@ [ { - "type": "alpine", + "type": "apk", "namespace": null, "name": "musl", "version": "1.1.24-r0", @@ -93,10 +93,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/musl@1.1.24-r0?arch=x86_64" + "purl": "pkg:apk/musl@1.1.24-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "busybox", "version": "1.31.1-r9", @@ -234,10 +234,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/busybox@1.31.1-r9?arch=x86_64" + "purl": "pkg:apk/busybox@1.31.1-r9?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "alpine-baselayout", "version": "3.2.0-r3", @@ -555,10 +555,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/alpine-baselayout@3.2.0-r3?arch=x86_64" + "purl": "pkg:apk/alpine-baselayout@3.2.0-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "alpine-keys", "version": "2.1-r2", @@ -795,10 +795,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/alpine-keys@2.1-r2?arch=x86_64" + "purl": "pkg:apk/alpine-keys@2.1-r2?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libcrypto1.1", "version": "1.1.1d-r3", @@ -981,10 +981,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libcrypto1.1@1.1.1d-r3?arch=x86_64" + "purl": "pkg:apk/libcrypto1.1@1.1.1d-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libssl1.1", "version": "1.1.1d-r3", @@ -1077,10 +1077,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libssl1.1@1.1.1d-r3?arch=x86_64" + "purl": "pkg:apk/libssl1.1@1.1.1d-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ca-certificates-cacert", "version": "20191127-r0", @@ -1164,10 +1164,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/ca-certificates-cacert@20191127-r0?arch=x86_64" + "purl": "pkg:apk/ca-certificates-cacert@20191127-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libtls-standalone", "version": "2.9.1-r0", @@ -1263,10 +1263,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libtls-standalone@2.9.1-r0?arch=x86_64" + "purl": "pkg:apk/libtls-standalone@2.9.1-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "ssl_client", "version": "1.31.1-r9", @@ -1350,10 +1350,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/ssl_client@1.31.1-r9?arch=x86_64" + "purl": "pkg:apk/ssl_client@1.31.1-r9?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "zlib", "version": "1.2.11-r3", @@ -1446,10 +1446,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/zlib@1.2.11-r3?arch=x86_64" + "purl": "pkg:apk/zlib@1.2.11-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "apk-tools", "version": "2.10.4-r3", @@ -1533,10 +1533,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/apk-tools@2.10.4-r3?arch=x86_64" + "purl": "pkg:apk/apk-tools@2.10.4-r3?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "scanelf", "version": "1.2.4-r0", @@ -1620,10 +1620,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/scanelf@1.2.4-r0?arch=x86_64" + "purl": "pkg:apk/scanelf@1.2.4-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "musl-utils", "version": "1.1.24-r0", @@ -1754,10 +1754,10 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/musl-utils@1.1.24-r0?arch=x86_64" + "purl": "pkg:apk/musl-utils@1.1.24-r0?arch=x86_64" }, { - "type": "alpine", + "type": "apk", "namespace": null, "name": "libc-utils", "version": "0.7.2-r0", @@ -1842,6 +1842,6 @@ "repository_download_url": null, "api_data_url": null, "datasource_id": "alpine_installed_db", - "purl": "pkg:alpine/libc-utils@0.7.2-r0?arch=x86_64" + "purl": "pkg:apk/libc-utils@0.7.2-r0?arch=x86_64" } ] \ No newline at end of file diff --git a/tests/packagedcode/test_alpine.py b/tests/packagedcode/test_alpine.py index 43cb257b673..98e85339de8 100644 --- a/tests/packagedcode/test_alpine.py +++ b/tests/packagedcode/test_alpine.py @@ -27,7 +27,7 @@ def test_parse_alpine_installed_db_small(self): test_installed = self.get_test_loc('alpine/small-installed/installed') result = [package.to_dict(_detailed=True) for package in alpine.parse_alpine_installed_db( - location=test_installed, datasource_id='alpine_installed_db', package_type='alpine', + location=test_installed, datasource_id='alpine_installed_db', package_type='apk', )] expected = test_installed + '-expected.json' check_result_equals_expected_json(result, expected, regen=REGEN_TEST_FIXTURES) @@ -36,7 +36,7 @@ def test_parse_alpine_installed_db_single(self): test_installed = self.get_test_loc('alpine/single-installed/installed') result = [package.to_dict(_detailed=True) for package in alpine.parse_alpine_installed_db( - location=test_installed, datasource_id='alpine_installed_db', package_type='alpine', + location=test_installed, datasource_id='alpine_installed_db', package_type='apk', )] expected = test_installed + '-expected.json' check_result_equals_expected_json(result, expected, regen=REGEN_TEST_FIXTURES) @@ -45,7 +45,7 @@ def test_parse_alpine_installed_db_full(self): test_installed = self.get_test_loc('alpine/full-installed/installed') result = [package.to_dict(_detailed=True) for package in alpine.parse_alpine_installed_db( - location=test_installed, datasource_id='alpine_installed_db', package_type='alpine', + location=test_installed, datasource_id='alpine_installed_db', package_type='apk', )] expected = test_installed + '-expected.json' check_result_equals_expected_json(result, expected, regen=REGEN_TEST_FIXTURES)