Skip to content

Commit

Permalink
add support for SUPPORT_END in /etc/os-release
Browse files Browse the repository at this point in the history 
Signed-off-by: Benji Visser <benji@093b.org>

chore: update SPDX license list (anchore#1599)

Update SPDX license list to 3.20 (anchore#1600)

Signed-off-by: Marc-Etienne Vargenau <marc-etienne.vargenau@nokia.com>

Update Stereoscope to 529924d6d5aa6c708cceffc651883b6e1e27f5df (anchore#1602)

Signed-off-by: GitHub <noreply@github.com>

feat: add perl binary classifier (anchore#1592)

Signed-off-by: Benji Visser <benji@093b.org>

chore: update syft bootstrap tools to latest versions. (anchore#1593)

fix: issue when matching format versions (anchore#1585)

Signed-off-by: Keith Zantow <kzantow@gmail.com>

fix: merging of binary packages (anchore#1583)

chore: fix cataloger_test (anchore#1603)

Signed-off-by: Keith Zantow <kzantow@gmail.com>

Update Stereoscope to fab1c9638abc2c21cd53dca1f205f37d71148ee0 (anchore#1604)

Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: wagoodman <wagoodman@users.noreply.github.com>

Revert "add workaround for macos github actions cache issue (anchore#1584)" (anchore#1605)

This reverts commit 0076b19.

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

remove schema 6.2.1

Signed-off-by: Benji Visser <benji@093b.org>
  • Loading branch information
@noqcks
noqcks committed Feb 23, 2023
1 parent f671609 commit eccda5f
Show file tree
Hide file tree
Showing 44 changed files with 7,756 additions and 3,792 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/validations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,6 @@ jobs:
steps:
- uses: actions/checkout@v3

# TODO: remove this when actions/cache + mac runner is fixed
# see https://github.com/actions/cache/issues/1110
- name: Downgrade zstd on macOS
run: |
brew uninstall --ignore-dependencies zstd
git -C "$(brew --repo homebrew/core)" checkout d3f04bd Formula/zstd.rb
brew install zstd
- name: Download snapshot build
uses: actions/cache/restore@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ CHRONICLE_CMD = $(TEMP_DIR)/chronicle
GLOW_CMD = $(TEMP_DIR)/glow

# Tool versions #################################
GOLANGCILINT_VERSION := v1.51.1
GOSIMPORTS_VERSION := v0.3.5
GOLANGCILINT_VERSION := v1.51.2
GOSIMPORTS_VERSION := v0.3.7
BOUNCER_VERSION := v0.4.0
CHRONICLE_VERSION := v0.6.0
GORELEASER_VERSION := v1.15.2
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ require (
github.com/CycloneDX/cyclonedx-go v0.7.1-0.20221222100750-41a1ac565cce
github.com/Masterminds/sprig/v3 v3.2.3
github.com/anchore/go-logger v0.0.0-20220728155337-03b66a5207d8
github.com/anchore/stereoscope v0.0.0-20230216143338-4b5ebf8c7f4b
github.com/anchore/stereoscope v0.0.0-20230222185948-fab1c9638abc
github.com/docker/docker v23.0.1+incompatible
github.com/google/go-containerregistry v0.13.0
github.com/invopop/jsonschema v0.7.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b h1:e1bmaoJfZV
github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b/go.mod h1:Bkc+JYWjMCF8OyZ340IMSIi2Ebf3uwByOk6ho4wne1E=
github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501 h1:AV7qjwMcM4r8wFhJq3jLRztew3ywIyPTRapl2T1s9o8=
github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501/go.mod h1:Blo6OgJNiYF41ufcgHKkbCKF2MDOMlrqhXv/ij6ocR4=
github.com/anchore/stereoscope v0.0.0-20230216143338-4b5ebf8c7f4b h1:vMEAfz91QLjJq2W8JPxpIC4dG4OeynTY4MisHnZ19F0=
github.com/anchore/stereoscope v0.0.0-20230216143338-4b5ebf8c7f4b/go.mod h1:6oSG43mzahqiktzXZDctqi1o66fwU2wDk3xki0KlnbA=
github.com/anchore/stereoscope v0.0.0-20230222185948-fab1c9638abc h1:b+2KauWByrCPLNnzRHjLoUxo85tpszFtU7S1I5pAKK0=
github.com/anchore/stereoscope v0.0.0-20230222185948-fab1c9638abc/go.mod h1:Y+jiUa5PmQh9jUvzmvus4EvLnEG87cDTOYgV3nw3wDg=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
Expand Down
2 changes: 1 addition & 1 deletion internal/constants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ const (

// JSONSchemaVersion is the current schema version output by the JSON encoder
// This is roughly following the "SchemaVer" guidelines for versioning the JSON schema. Please see schema/json/README.md for details on how to increment.
JSONSchemaVersion = "6.2.0"
JSONSchemaVersion = "7.0.1"
)
52 changes: 52 additions & 0 deletions internal/spdxlicense/generate/generate_license_list_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func Test_processSPDXLicense(t *testing.T) {
"0bsd": "0BSD",
"aal": "AAL",
"abstyles": "Abstyles",
"adacore-doc": "AdaCore-doc",
"adobe-2006": "Adobe-2006",
"adobe-2006.0": "Adobe-2006",
"adobe-2006.0.0": "Adobe-2006",
Expand Down Expand Up @@ -145,6 +146,7 @@ func Test_processSPDXLicense(t *testing.T) {
"bahyph": "Bahyph",
"barr": "Barr",
"beerware": "Beerware",
"bitstream-charter": "Bitstream-Charter",
"bitstream-vera": "Bitstream-Vera",
"bittorrent-1": "BitTorrent-1.0",
"bittorrent-1.0": "BitTorrent-1.0",
Expand All @@ -156,6 +158,9 @@ func Test_processSPDXLicense(t *testing.T) {
"blueoak-1.0": "BlueOak-1.0.0",
"blueoak-1.0.0": "BlueOak-1.0.0",
"borceux": "Borceux",
"brian-gladman-3-clause": "Brian-Gladman-3-Clause",
"brian-gladman-3.0-clause": "Brian-Gladman-3-Clause",
"brian-gladman-3.0.0-clause": "Brian-Gladman-3-Clause",
"bsd-1-clause": "BSD-1-Clause",
"bsd-1.0-clause": "BSD-1-Clause",
"bsd-1.0.0-clause": "BSD-1-Clause",
Expand Down Expand Up @@ -213,6 +218,14 @@ func Test_processSPDXLicense(t *testing.T) {
"bsd-4.0.0-clause": "BSD-4-Clause",
"bsd-4.0.0-clause-shortened": "BSD-4-Clause-Shortened",
"bsd-4.0.0-clause-uc": "BSD-4-Clause-UC",
"bsd-4.3.0reno": "BSD-4.3RENO",
"bsd-4.3.0tahoe": "BSD-4.3TAHOE",
"bsd-4.3reno": "BSD-4.3RENO",
"bsd-4.3tahoe": "BSD-4.3TAHOE",
"bsd-4reno": "BSD-4.3RENO",
"bsd-4tahoe": "BSD-4.3TAHOE",
"bsd-advertising-acknowledgement": "BSD-Advertising-Acknowledgement",
"bsd-attribution-hpnd-disclaimer": "BSD-Attribution-HPND-disclaimer",
"bsd-protection": "BSD-Protection",
"bsd-source-code": "BSD-Source-Code",
"bsl-1": "BSL-1.0",
Expand Down Expand Up @@ -311,12 +324,15 @@ func Test_processSPDXLicense(t *testing.T) {
"cc-by-nc-sa-1.0": "CC-BY-NC-SA-1.0",
"cc-by-nc-sa-1.0.0": "CC-BY-NC-SA-1.0",
"cc-by-nc-sa-2": "CC-BY-NC-SA-2.0",
"cc-by-nc-sa-2-de": "CC-BY-NC-SA-2.0-DE",
"cc-by-nc-sa-2-fr": "CC-BY-NC-SA-2.0-FR",
"cc-by-nc-sa-2-uk": "CC-BY-NC-SA-2.0-UK",
"cc-by-nc-sa-2.0": "CC-BY-NC-SA-2.0",
"cc-by-nc-sa-2.0-de": "CC-BY-NC-SA-2.0-DE",
"cc-by-nc-sa-2.0-fr": "CC-BY-NC-SA-2.0-FR",
"cc-by-nc-sa-2.0-uk": "CC-BY-NC-SA-2.0-UK",
"cc-by-nc-sa-2.0.0": "CC-BY-NC-SA-2.0",
"cc-by-nc-sa-2.0.0-de": "CC-BY-NC-SA-2.0-DE",
"cc-by-nc-sa-2.0.0-fr": "CC-BY-NC-SA-2.0-FR",
"cc-by-nc-sa-2.0.0-uk": "CC-BY-NC-SA-2.0-UK",
"cc-by-nc-sa-2.5": "CC-BY-NC-SA-2.5",
Expand Down Expand Up @@ -423,8 +439,11 @@ func Test_processSPDXLicense(t *testing.T) {
"cern-ohl-w-2": "CERN-OHL-W-2.0",
"cern-ohl-w-2.0": "CERN-OHL-W-2.0",
"cern-ohl-w-2.0.0": "CERN-OHL-W-2.0",
"cfitsio": "CFITSIO",
"checkmk": "checkmk",
"clartistic": "ClArtistic",
"clips": "Clips",
"cmu-mach": "CMU-Mach",
"cnri-jython": "CNRI-Jython",
"cnri-python": "CNRI-Python",
"cnri-python-gpl-compatible": "CNRI-Python-GPL-Compatible",
Expand All @@ -440,6 +459,7 @@ func Test_processSPDXLicense(t *testing.T) {
"copyleft-next-0.3": "copyleft-next-0.3.0",
"copyleft-next-0.3.0": "copyleft-next-0.3.0",
"copyleft-next-0.3.1": "copyleft-next-0.3.1",
"cornell-lossless-jpeg": "Cornell-Lossless-JPEG",
"cpal-1": "CPAL-1.0",
"cpal-1.0": "CPAL-1.0",
"cpal-1.0.0": "CPAL-1.0",
Expand Down Expand Up @@ -637,19 +657,28 @@ func Test_processSPDXLicense(t *testing.T) {
"gpl-3.0.0-or-later": "GPL-3.0-or-later",
"gpl-3.0.0-with-autoconf-exception": "GPL-3.0-with-autoconf-exception",
"gpl-3.0.0-with-gcc-exception": "GPL-3.0-with-GCC-exception",
"graphics-gems": "Graphics-Gems",
"gsoap-1.3.0b": "gSOAP-1.3b",
"gsoap-1.3b": "gSOAP-1.3b",
"gsoap-1b": "gSOAP-1.3b",
"haskellreport": "HaskellReport",
"hippocratic-2": "Hippocratic-2.1",
"hippocratic-2.1": "Hippocratic-2.1",
"hippocratic-2.1.0": "Hippocratic-2.1",
"hp-1986": "HP-1986",
"hp-1986.0": "HP-1986",
"hp-1986.0.0": "HP-1986",
"hpnd": "HPND",
"hpnd-export-us": "HPND-export-US",
"hpnd-markus-kuhn": "HPND-Markus-Kuhn",
"hpnd-sell-variant": "HPND-sell-variant",
"hpnd-sell-variant-mit-disclaimer": "HPND-sell-variant-MIT-disclaimer",
"htmltidy": "HTMLTIDY",
"ibm-pibs": "IBM-pibs",
"icu": "ICU",
"iec-code-components-eula": "IEC-Code-Components-EULA",
"ijg": "IJG",
"ijg-short": "IJG-short",
"imagemagick": "ImageMagick",
"imatix": "iMatix",
"imlib2": "Imlib2",
Expand All @@ -668,8 +697,10 @@ func Test_processSPDXLicense(t *testing.T) {
"jasper-2": "JasPer-2.0",
"jasper-2.0": "JasPer-2.0",
"jasper-2.0.0": "JasPer-2.0",
"jpl-image": "JPL-image",
"jpnic": "JPNIC",
"json": "JSON",
"kazlib": "Kazlib",
"knuth-ctan": "Knuth-CTAN",
"lal-1": "LAL-1.2",
"lal-1.2": "LAL-1.2",
Expand Down Expand Up @@ -731,6 +762,7 @@ func Test_processSPDXLicense(t *testing.T) {
"liliq-rplus-1.1.0": "LiLiQ-Rplus-1.1",
"linux-man-pages-copyleft": "Linux-man-pages-copyleft",
"linux-openib": "Linux-OpenIB",
"loop": "LOOP",
"lpl-1": "LPL-1.0",
"lpl-1.0": "LPL-1.0",
"lpl-1.0.0": "LPL-1.0",
Expand All @@ -756,6 +788,7 @@ func Test_processSPDXLicense(t *testing.T) {
"lzma-sdk-9.22": "LZMA-SDK-9.22",
"lzma-sdk-9.22.0": "LZMA-SDK-9.22",
"makeindex": "MakeIndex",
"martin-birgmeier": "Martin-Birgmeier",
"minpack": "Minpack",
"miros": "MirOS",
"mit": "MIT",
Expand All @@ -766,6 +799,7 @@ func Test_processSPDXLicense(t *testing.T) {
"mit-feh": "MIT-feh",
"mit-modern-variant": "MIT-Modern-Variant",
"mit-open-group": "MIT-open-group",
"mit-wu": "MIT-Wu",
"mitnfa": "MITNFA",
"motosoto": "Motosoto",
"mpi-permissive": "mpi-permissive",
Expand Down Expand Up @@ -852,6 +886,7 @@ func Test_processSPDXLicense(t *testing.T) {
"odc-by-1": "ODC-By-1.0",
"odc-by-1.0": "ODC-By-1.0",
"odc-by-1.0.0": "ODC-By-1.0",
"offis": "OFFIS",
"ofl-1": "OFL-1.0",
"ofl-1-no-rfn": "OFL-1.0-no-RFN",
"ofl-1-rfn": "OFL-1.0-RFN",
Expand Down Expand Up @@ -918,6 +953,9 @@ func Test_processSPDXLicense(t *testing.T) {
"oldap-2.8": "OLDAP-2.8",
"oldap-2.8.0": "OLDAP-2.8",
"oml": "OML",
"openpbs-2": "OpenPBS-2.3",
"openpbs-2.3": "OpenPBS-2.3",
"openpbs-2.3.0": "OpenPBS-2.3",
"openssl": "OpenSSL",
"opl-1": "OPL-1.0",
"opl-1.0": "OPL-1.0",
Expand Down Expand Up @@ -974,8 +1012,11 @@ func Test_processSPDXLicense(t *testing.T) {
"python-2.0.1": "Python-2.0.1",
"qhull": "Qhull",
"qpl-1": "QPL-1.0",
"qpl-1-inria-2004": "QPL-1.0-INRIA-2004",
"qpl-1.0": "QPL-1.0",
"qpl-1.0-inria-2004": "QPL-1.0-INRIA-2004",
"qpl-1.0.0": "QPL-1.0",
"qpl-1.0.0-inria-2004": "QPL-1.0-INRIA-2004",
"rdisc": "Rdisc",
"rhecos-1": "RHeCos-1.1",
"rhecos-1.1": "RHeCos-1.1",
Expand Down Expand Up @@ -1022,6 +1063,7 @@ func Test_processSPDXLicense(t *testing.T) {
"smlnj": "SMLNJ",
"smppl": "SMPPL",
"snia": "SNIA",
"snprintf": "snprintf",
"spencer-86": "Spencer-86",
"spencer-86.0": "Spencer-86",
"spencer-86.0.0": "Spencer-86",
Expand All @@ -1043,7 +1085,9 @@ func Test_processSPDXLicense(t *testing.T) {
"sugarcrm-1": "SugarCRM-1.1.3",
"sugarcrm-1.1": "SugarCRM-1.1.3",
"sugarcrm-1.1.3": "SugarCRM-1.1.3",
"sunpro": "SunPro",
"swl": "SWL",
"symlinks": "Symlinks",
"tapr-ohl-1": "TAPR-OHL-1.0",
"tapr-ohl-1.0": "TAPR-OHL-1.0",
"tapr-ohl-1.0.0": "TAPR-OHL-1.0",
Expand All @@ -1054,12 +1098,18 @@ func Test_processSPDXLicense(t *testing.T) {
"torque-1.1": "TORQUE-1.1",
"torque-1.1.0": "TORQUE-1.1",
"tosl": "TOSL",
"tpdl": "TPDL",
"tpl-1": "TPL-1.0",
"tpl-1.0": "TPL-1.0",
"tpl-1.0.0": "TPL-1.0",
"ttwl": "TTWL",
"tu-berlin-1": "TU-Berlin-1.0",
"tu-berlin-1.0": "TU-Berlin-1.0",
"tu-berlin-1.0.0": "TU-Berlin-1.0",
"tu-berlin-2": "TU-Berlin-2.0",
"tu-berlin-2.0": "TU-Berlin-2.0",
"tu-berlin-2.0.0": "TU-Berlin-2.0",
"ucar": "UCAR",
"ucl-1": "UCL-1.0",
"ucl-1.0": "UCL-1.0",
"ucl-1.0.0": "UCL-1.0",
Expand All @@ -1086,6 +1136,7 @@ func Test_processSPDXLicense(t *testing.T) {
"w3c-20150513": "W3C-20150513",
"w3c-20150513.0": "W3C-20150513",
"w3c-20150513.0.0": "W3C-20150513",
"w3m": "w3m",
"watcom-1": "Watcom-1.0",
"watcom-1.0": "Watcom-1.0",
"watcom-1.0.0": "Watcom-1.0",
Expand All @@ -1099,6 +1150,7 @@ func Test_processSPDXLicense(t *testing.T) {
"xfree86-1.1": "XFree86-1.1",
"xfree86-1.1.0": "XFree86-1.1",
"xinetd": "xinetd",
"xlock": "xlock",
"xnet": "Xnet",
"xpp": "xpp",
"xskat": "XSkat",
Expand Down
Loading

0 comments on commit eccda5f

Please sign in to comment.