Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package melange for openSUSE:Factory checked in at 2026-02-25 21:11:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/melange (Old) and /work/SRC/openSUSE:Factory/.melange.new.1977 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "melange" Wed Feb 25 21:11:10 2026 rev:140 rq:1335019 version:0.43.3 Changes: -------- --- /work/SRC/openSUSE:Factory/melange/melange.changes 2026-02-19 14:24:30.129516422 +0100 +++ /work/SRC/openSUSE:Factory/.melange.new.1977/melange.changes 2026-02-25 21:11:32.112557720 +0100 @@ -1,0 +2,27 @@ +Wed Feb 25 09:19:21 UTC 2026 - Johannes Kastl <[email protected]> + +- Update to version 0.43.3: + * build(deps): bump chainguard.dev/apko in the gomod group + (#2371) + * build(deps): bump github.com/google/go-containerregistry + (#2363) + * build(deps): bump goreleaser/goreleaser-action from 6.4.0 to + 7.0.0 (#2367) + * build(deps): bump github.com/github/go-spdx/v2 from 2.3.6 to + 2.4.0 (#2364) + * build(deps): bump the gomod group across 1 directory with 3 + updates (#2366) + * Fix typo in LINTER.md from 'disable' to 'disabled' (#2348) + +------------------------------------------------------------------- +Wed Feb 25 09:17:02 UTC 2026 - Johannes Kastl <[email protected]> + +- Update to version 0.43.2: + * Use namespace instead of ReleaseData for SBOM generation. + (#2365) + * fix(maven): use symlink instead of settings.xml for cache + localRepository (#2361) + * license-check: also consider license-paths from the config + (#2351) + +------------------------------------------------------------------- Old: ---- melange-0.43.1.obscpio New: ---- melange-0.43.3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ melange.spec ++++++ --- /var/tmp/diff_new_pack.ZSYESC/_old 2026-02-25 21:11:33.132599839 +0100 +++ /var/tmp/diff_new_pack.ZSYESC/_new 2026-02-25 21:11:33.132599839 +0100 @@ -17,7 +17,7 @@ Name: melange -Version: 0.43.1 +Version: 0.43.3 Release: 0 Summary: Build APKs from source code License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ZSYESC/_old 2026-02-25 21:11:33.168601325 +0100 +++ /var/tmp/diff_new_pack.ZSYESC/_new 2026-02-25 21:11:33.172601490 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/chainguard-dev/melange</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.43.1</param> + <param name="revision">v0.43.3</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ZSYESC/_old 2026-02-25 21:11:33.192602316 +0100 +++ /var/tmp/diff_new_pack.ZSYESC/_new 2026-02-25 21:11:33.196602481 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/chainguard-dev/melange</param> - <param name="changesrevision">a5fca9fbdbc75c099161196a38c7a4812824b2b9</param></service></servicedata> + <param name="changesrevision">66e9282b26b7537ac33b130a3499d9119a0e52f1</param></service></servicedata> (No newline at EOF) ++++++ melange-0.43.1.obscpio -> melange-0.43.3.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/docs/BUILD-CACHE.md new/melange-0.43.3/docs/BUILD-CACHE.md --- old/melange-0.43.1/docs/BUILD-CACHE.md 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/docs/BUILD-CACHE.md 2026-02-24 17:32:40.000000000 +0100 @@ -244,7 +244,7 @@ ### Example: Maven Dependencies -Maven caching is automatically enabled when using the `maven/configure-mirror` or `maven/pombump` pipelines. When a cache directory is mounted at `/var/cache/melange`, the pipelines automatically configure Maven to use `/var/cache/melange/m2repository` as the local repository. +Maven caching is automatically enabled when using the `maven/configure-mirror` or `maven/pombump` pipelines. When a cache directory is mounted at `/var/cache/melange`, the pipelines automatically symlink `~/.m2/repository` to `/var/cache/melange/m2repository` so that Maven's default local repository is backed by the cache. To use Maven caching, simply provide a cache directory: @@ -252,7 +252,7 @@ melange build --cache-dir /path/to/my/cache ... ``` -No additional configuration is required in your Melange config. The Maven pipelines detect the mounted cache directory and configure the local repository path automatically. This is useful for Java projects with many dependencies (e.g., apicurio-registry requires over 1 GB of dependencies). +No additional configuration is required in your Melange config. The Maven pipelines detect the mounted cache directory and set up the symlink automatically. This is useful for Java projects with many dependencies (e.g., apicurio-registry requires over 1 GB of dependencies). On subsequent builds, Maven will reuse the downloaded dependencies from the cache, avoiding redundant downloads. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/docs/LINTER.md new/melange-0.43.3/docs/LINTER.md --- old/melange-0.43.1/docs/LINTER.md 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/docs/LINTER.md 2026-02-24 17:32:40.000000000 +0100 @@ -47,7 +47,7 @@ version: 1.0.0 epoch: 42 checks: - disable: + disabled: - setuidgid # Package is meant to have setuid binaries - debug # Toolchain problems require we keep debug info ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/go.mod new/melange-0.43.3/go.mod --- old/melange-0.43.1/go.mod 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/go.mod 2026-02-24 17:32:40.000000000 +0100 @@ -1,20 +1,20 @@ module chainguard.dev/melange -go 1.25.0 +go 1.25.6 require ( - chainguard.dev/apko v1.1.9 + chainguard.dev/apko v1.1.11 github.com/chainguard-dev/clog v1.8.0 github.com/chainguard-dev/go-pkgconfig v0.0.0-20240404163941-6351b37b2a10 - github.com/chainguard-dev/yam v0.2.49 + github.com/chainguard-dev/yam v0.2.50 github.com/charmbracelet/log v0.4.2 github.com/docker/cli v29.2.1+incompatible github.com/docker/docker v28.5.2+incompatible github.com/dprotaso/go-yit v0.0.0-20250513224043-18a80f8f6df4 - github.com/github/go-spdx/v2 v2.3.6 + github.com/github/go-spdx/v2 v2.4.0 github.com/go-git/go-git/v5 v5.16.5 github.com/google/go-cmp v0.7.0 - github.com/google/go-containerregistry v0.20.7 + github.com/google/go-containerregistry v0.21.0 github.com/google/licenseclassifier/v2 v2.0.0 github.com/ijt/goparsify v0.0.0-20221203142333-3a5276334b8d github.com/in-toto/attestation v1.1.2 @@ -25,7 +25,7 @@ github.com/klauspost/pgzip v1.2.6 github.com/moby/moby v28.5.2+incompatible github.com/opencontainers/image-spec v1.1.1 - github.com/package-url/packageurl-go v0.1.3 + github.com/package-url/packageurl-go v0.1.4 github.com/pkg/errors v0.9.1 github.com/psanford/memfs v0.0.0-20241019191636-4ef911798f9b github.com/spdx/tools-golang v0.5.7 @@ -65,7 +65,7 @@ github.com/pavlo-v-chernykh/keystore-go/v4 v4.5.0 // indirect go.opencensus.io v0.24.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/tools v0.41.0 // indirect + golang.org/x/tools v0.42.0 // indirect k8s.io/klog/v2 v2.130.1 // indirect ) @@ -98,7 +98,7 @@ github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect github.com/containerd/containerd/v2 v2.1.5 // indirect github.com/containerd/log v0.1.0 // indirect - github.com/containerd/stargz-snapshotter/estargz v0.18.1 // indirect + github.com/containerd/stargz-snapshotter/estargz v0.18.2 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect github.com/cyphar/filepath-securejoin v0.4.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect @@ -166,11 +166,11 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect go.opentelemetry.io/otel/metric v1.40.0 // indirect go.opentelemetry.io/otel/trace v1.40.0 // indirect - go.step.sm/crypto v0.76.0 // indirect - golang.org/x/mod v0.32.0 // indirect - golang.org/x/net v0.49.0 // indirect + go.step.sm/crypto v0.76.2 // indirect + golang.org/x/mod v0.33.0 // indirect + golang.org/x/net v0.50.0 // indirect golang.org/x/oauth2 v0.35.0 // indirect - google.golang.org/api v0.267.0 // indirect + google.golang.org/api v0.268.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20 // indirect google.golang.org/grpc v1.78.0 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/go.sum new/melange-0.43.3/go.sum --- old/melange-0.43.1/go.sum 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/go.sum 2026-02-24 17:32:40.000000000 +0100 @@ -1,5 +1,5 @@ -chainguard.dev/apko v1.1.9 h1:H8mYvb37jMOfG0aniuXd1+lK3SljRCfXcYcdqSPS3ck= -chainguard.dev/apko v1.1.9/go.mod h1:WSKnReIy2VwQSe1wVb00OTyg5Uv78eYX8Y/WoWHebUA= +chainguard.dev/apko v1.1.11 h1:F6KBDxsP+GfjZUnAu85N0se6rk3kei8yoF8vRgj+BrM= +chainguard.dev/apko v1.1.11/go.mod h1:X35Hab7vcFt47yQEoZTOkzwB9oPgFpGotKB8ZTL3dFk= chainguard.dev/go-grpc-kit v0.17.15 h1:y+FBjta2lsC0XxlkG+W5P1VxYl0zG74GRvoYN2o+p7s= chainguard.dev/go-grpc-kit v0.17.15/go.mod h1:1wAVAX2CCamtFlfMs9PFzfgQQxX1/TQyF6cbWApbJ2U= chainguard.dev/sdk v0.1.50 h1:rCoIYf30+ledJdaChqHVi2vh1BwIaWdVLjPfuPGdQ80= @@ -44,8 +44,8 @@ github.com/chainguard-dev/clog v1.8.0/go.mod h1:5MQOZi+Iu7fV7GcJG8ag8rCB5elEOpqRMKEASgnGVdo= github.com/chainguard-dev/go-pkgconfig v0.0.0-20240404163941-6351b37b2a10 h1:XR2vgQC024I9/boh9r1ihVv8Z14+pbvWqXeYMCnZJpc= github.com/chainguard-dev/go-pkgconfig v0.0.0-20240404163941-6351b37b2a10/go.mod h1:1p6+MesLcjKeON5BRWa7I87mvAY0QmKjgginIM3w6BI= -github.com/chainguard-dev/yam v0.2.49 h1:Yn/Y+oucm7O2K+p7PecEQFm3Z13tWCNDoJXxKUN4onY= -github.com/chainguard-dev/yam v0.2.49/go.mod h1:Dwk2i+W3mifDxxM5nILZrvUs9GYZsIjVjEONgKMtBrI= +github.com/chainguard-dev/yam v0.2.50 h1:9PR9jzzDlRoLFRyI+dPa9Sxn1quJlIBobeNCpwF/ObA= +github.com/chainguard-dev/yam v0.2.50/go.mod h1:Dwk2i+W3mifDxxM5nILZrvUs9GYZsIjVjEONgKMtBrI= github.com/charmbracelet/colorprofile v0.3.2 h1:9J27WdztfJQVAQKX2WOlSSRB+5gaKqqITmrvb1uTIiI= github.com/charmbracelet/colorprofile v0.3.2/go.mod h1:mTD5XzNeWHj8oqHb+S1bssQb7vIHbepiebQ2kPKVKbI= github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= @@ -76,8 +76,8 @@ github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= -github.com/containerd/stargz-snapshotter/estargz v0.18.1 h1:cy2/lpgBXDA3cDKSyEfNOFMA/c10O1axL69EU7iirO8= -github.com/containerd/stargz-snapshotter/estargz v0.18.1/go.mod h1:ALIEqa7B6oVDsrF37GkGN20SuvG/pIMm7FwP7ZmRb0Q= +github.com/containerd/stargz-snapshotter/estargz v0.18.2 h1:yXkZFYIzz3eoLwlTUZKz2iQ4MrckBxJjkmD16ynUTrw= +github.com/containerd/stargz-snapshotter/estargz v0.18.2/go.mod h1:XyVU5tcJ3PRpkA9XS2T5us6Eg35yM0214Y+wvrZTBrY= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo= github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= @@ -121,8 +121,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= -github.com/github/go-spdx/v2 v2.3.6 h1:9flm625VmmTlWXi0YH5W9V8FdMfulvxalHdYnUfoqxc= -github.com/github/go-spdx/v2 v2.3.6/go.mod h1:/5rwgS0txhGtRdUZwc02bTglzg6HK3FfuEbECKlK2Sg= +github.com/github/go-spdx/v2 v2.4.0 h1:+4IwVwJJbm3rzvrQ6P1nI9BDMcy3la4RchRy5uehV/M= +github.com/github/go-spdx/v2 v2.4.0/go.mod h1:/5rwgS0txhGtRdUZwc02bTglzg6HK3FfuEbECKlK2Sg= github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c= github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= @@ -171,8 +171,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/go-containerregistry v0.20.7 h1:24VGNpS0IwrOZ2ms2P1QE3Xa5X9p4phx0aUgzYzHW6I= -github.com/google/go-containerregistry v0.20.7/go.mod h1:Lx5LCZQjLH1QBaMPeGwsME9biPeo1lPx6lbGj/UmzgM= +github.com/google/go-containerregistry v0.21.0 h1:ocqxUOczFwAZQBMNE7kuzfqvDe0VWoZxQMOesXreCDI= +github.com/google/go-containerregistry v0.21.0/go.mod h1:ctO5aCaewH4AK1AumSF5DPW+0+R+d2FmylMJdp5G7p0= github.com/google/go-licenses/v2 v2.0.1 h1:ti+9bi5o7DKbeeg5eBb/uZTgsaPNoJaLCh93cRcXsW8= github.com/google/go-licenses/v2 v2.0.1/go.mod h1:efibo0EDNGkau6AIMOViGW+rTNPudhxX9rCxtfw5zKE= github.com/google/go-replayers/httpreplay v1.2.0 h1:VM1wEyyjaoU53BwrOnaf9VhAyQQEEioJvFYxYcLRKzk= @@ -275,8 +275,8 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= -github.com/package-url/packageurl-go v0.1.3 h1:4juMED3hHiz0set3Vq3KeQ75KD1avthoXLtmE3I0PLs= -github.com/package-url/packageurl-go v0.1.3/go.mod h1:nKAWB8E6uk1MHqiS/lQb9pYBGH2+mdJ2PJc2s50dQY0= +github.com/package-url/packageurl-go v0.1.4 h1:RHfiiN1SSY+Kic537DXch6fy593rxGJW6WDzAiOwNdk= +github.com/package-url/packageurl-go v0.1.4/go.mod h1:nKAWB8E6uk1MHqiS/lQb9pYBGH2+mdJ2PJc2s50dQY0= github.com/pavlo-v-chernykh/keystore-go/v4 v4.5.0 h1:2nosf3P75OZv2/ZO/9Px5ZgZ5gbKrzA3joN1QMfOGMQ= github.com/pavlo-v-chernykh/keystore-go/v4 v4.5.0/go.mod h1:lAVhWwbNaveeJmxrxuSTxMgKpF6DjnuVpn6T8WiBwYQ= github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= @@ -384,8 +384,8 @@ go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA= go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4= go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE= -go.step.sm/crypto v0.76.0 h1:K23BSaeoiY7Y5dvvijTeYC9EduDBetNwQYMBwMhi1aA= -go.step.sm/crypto v0.76.0/go.mod h1:PXYJdKkK8s+GHLwLguFaLxHNAFsFL3tL1vSBrYfey5k= +go.step.sm/crypto v0.76.2 h1:JJ/yMcs/rmcCAwlo+afrHjq74XBFRTJw5B2y4Q4Z4c4= +go.step.sm/crypto v0.76.2/go.mod h1:m6KlB/HzIuGFep0UWI5e0SYi38UxpoKeCg6qUaHV6/Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= @@ -407,8 +407,8 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= -golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= +golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= +golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -421,8 +421,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= -golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= +golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60= +golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ= golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= @@ -478,14 +478,14 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= -golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= +golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/api v0.267.0 h1:w+vfWPMPYeRs8qH1aYYsFX68jMls5acWl/jocfLomwE= -google.golang.org/api v0.267.0/go.mod h1:Jzc0+ZfLnyvXma3UtaTl023TdhZu6OMBP9tJ+0EmFD0= +google.golang.org/api v0.268.0 h1:hgA3aS4lt9rpF5RCCkX0Q2l7DvHgvlb53y4T4u6iKkA= +google.golang.org/api v0.268.0/go.mod h1:HXMyMH496wz+dAJwD/GkAPLd3ZL33Kh0zEG32eNvy9w= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/build/build.go new/melange-0.43.3/pkg/build/build.go --- old/melange-0.43.1/pkg/build/build.go 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/build/build.go 2026-02-24 17:32:40.000000000 +0100 @@ -725,18 +725,6 @@ log.Infof("retrieving workspace from builder: %s", cfg.PodID) b.WorkspaceDirFS = apkofs.DirFS(ctx, b.WorkspaceDir) - // Retrieve the os-release information from the runner - releaseData, err := b.Runner.GetReleaseData(ctx, cfg) - if err != nil { - log.Warnf("failed to retrieve release data from runner, OS section will be unknown: %v", err) - // If we can't retrieve the release data, we will use a default 'unknown' one similar to apko. - releaseData = &apko_build.ReleaseData{ - ID: "unknown", - Name: "melange-generated package", - VersionID: "unknown", - } - } - // Apply xattrs to files in the new in-memory filesystem for path, attrs := range xattrs { for attr, data := range attrs { @@ -858,7 +846,6 @@ License: b.ConfigFileLicense, PURL: buildConfigPURL, }, - ReleaseData: releaseData, } if err := b.SBOMGenerator.GenerateSBOM(ctx, genCtx); err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/build/pipelines/maven/configure-mirror.yaml new/melange-0.43.3/pkg/build/pipelines/maven/configure-mirror.yaml --- old/melange-0.43.1/pkg/build/pipelines/maven/configure-mirror.yaml 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/build/pipelines/maven/configure-mirror.yaml 2026-02-24 17:32:40.000000000 +0100 @@ -4,19 +4,27 @@ - busybox pipeline: - runs: | - # Use melange's build cache for downloaded dependencies if mounted from host - MAVEN_LOCAL_REPO="/var/cache/melange/m2repository" - LOCAL_REPO_CONFIG="" + # Point Maven's default local repository to the melange cache so + # downloaded dependencies can be reused across builds. Uses a symlink + # instead of settings.xml <localRepository> so that builds which + # hardcode ~/.m2/repository paths keep working. + # Symlink both /root/.m2/repository (used by qemu runner where the + # build user is root) and $HOME/.m2/repository (used by bubblewrap/ + # docker where HOME=/home/build). if [ -d "/var/cache/melange" ]; then - mkdir -p "$MAVEN_LOCAL_REPO" - LOCAL_REPO_CONFIG="<localRepository>${MAVEN_LOCAL_REPO}</localRepository>" + mkdir -p /var/cache/melange/m2repository + for m2dir in /root/.m2 "$HOME/.m2"; do + mkdir -p "$m2dir" + if [ ! -e "$m2dir/repository" ]; then + ln -s /var/cache/melange/m2repository "$m2dir/repository" + fi + done fi # Maven checks $USER/.m2, we set $HOME to /home/build but it hardcodes $USER somehow mkdir -p /root/.m2 cat > /root/.m2/settings.xml <<EOF <settings> - ${LOCAL_REPO_CONFIG} <mirrors> <mirror> <id>google-maven-central</id> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/build/pipelines/maven/pombump.yaml new/melange-0.43.3/pkg/build/pipelines/maven/pombump.yaml --- old/melange-0.43.1/pkg/build/pipelines/maven/pombump.yaml 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/build/pipelines/maven/pombump.yaml 2026-02-24 17:32:40.000000000 +0100 @@ -33,16 +33,22 @@ pipeline: - runs: | - # Use melange's build cache for downloaded dependencies if mounted from host - MAVEN_LOCAL_REPO="/var/cache/melange/m2repository" + # Point Maven's default local repository to the melange cache so + # downloaded dependencies can be reused across builds. Uses a symlink + # instead of settings.xml <localRepository> so that builds which + # hardcode ~/.m2/repository paths (e.g. Cassandra's build-resolver.xml) + # keep working. + # Symlink both /root/.m2/repository (used by qemu runner where the + # build user is root) and $HOME/.m2/repository (used by bubblewrap/ + # docker where HOME=/home/build). if [ -d "/var/cache/melange" ]; then - mkdir -p "$MAVEN_LOCAL_REPO" - mkdir -p /root/.m2 - cat > /root/.m2/settings.xml <<EOF - <settings> - <localRepository>${MAVEN_LOCAL_REPO}</localRepository> - </settings> - EOF + mkdir -p /var/cache/melange/m2repository + for m2dir in /root/.m2 "$HOME/.m2"; do + mkdir -p "$m2dir" + if [ ! -e "$m2dir/repository" ]; then + ln -s /var/cache/melange/m2repository "$m2dir/repository" + fi + done fi PATCH_FILE_FLAG="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/build/sbom/generator.go new/melange-0.43.3/pkg/build/sbom/generator.go --- old/melange-0.43.1/pkg/build/sbom/generator.go 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/build/sbom/generator.go 2026-02-24 17:32:40.000000000 +0100 @@ -20,7 +20,6 @@ "time" apkofs "chainguard.dev/apko/pkg/apk/fs" - apko_build "chainguard.dev/apko/pkg/build" purl "github.com/package-url/packageurl-go" "chainguard.dev/melange/pkg/config" @@ -54,9 +53,6 @@ // Information about the build configuration file ConfigFile *ConfigFile - - // OS release data from the build container - ReleaseData *apko_build.ReleaseData } type ConfigFile struct { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/build/sbom/spdx/spdx.go new/melange-0.43.3/pkg/build/sbom/spdx/spdx.go --- old/melange-0.43.1/pkg/build/sbom/spdx/spdx.go 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/build/sbom/spdx/spdx.go 2026-02-24 17:32:40.000000000 +0100 @@ -24,6 +24,7 @@ "strconv" "time" + apko_build "chainguard.dev/apko/pkg/build" "chainguard.dev/apko/pkg/sbom/generator/spdx" "github.com/spdx/tools-golang/spdx/v2/common" @@ -206,12 +207,16 @@ out := make(map[string]spdx.Document) + releaseData := &apko_build.ReleaseData{ + ID: gc.Namespace, + } + // Convert the SBOMs to SPDX and write them for _, sp := range gc.Configuration.Subpackages { - out[sp.Name] = sg.Document(sp.Name).ToSPDX(ctx, gc.ReleaseData) + out[sp.Name] = sg.Document(sp.Name).ToSPDX(ctx, releaseData) } - out[pkg.Name] = pSBOM.ToSPDX(ctx, gc.ReleaseData) + out[pkg.Name] = pSBOM.ToSPDX(ctx, releaseData) return out, nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/build/sbom/spdx/spdx_test.go new/melange-0.43.3/pkg/build/sbom/spdx/spdx_test.go --- old/melange-0.43.1/pkg/build/sbom/spdx/spdx_test.go 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/build/sbom/spdx/spdx_test.go 2026-02-24 17:32:40.000000000 +0100 @@ -24,7 +24,6 @@ "time" apkofs "chainguard.dev/apko/pkg/apk/fs" - apko_build "chainguard.dev/apko/pkg/build" "chainguard.dev/apko/pkg/sbom/generator/spdx" "github.com/google/go-cmp/cmp" purl "github.com/package-url/packageurl-go" @@ -76,10 +75,6 @@ License: "Apache-2.0", PURL: &testPURL, }, - ReleaseData: &apko_build.ReleaseData{ - ID: "test-os", - VersionID: "1.0", - }, } gen := &Generator{} @@ -104,8 +99,7 @@ Packages: []spdx.Package{ { ID: "SPDXRef-OperatingSystem", - Name: "test-os", - Version: "1.0", + Name: "test-ns", FilesAnalyzed: false, LicenseConcluded: "NOASSERTION", LicenseDeclared: "NOASSERTION", @@ -178,8 +172,7 @@ Packages: []spdx.Package{ { ID: "SPDXRef-OperatingSystem", - Name: "test-os", - Version: "1.0", + Name: "test-ns", FilesAnalyzed: false, LicenseConcluded: "NOASSERTION", LicenseDeclared: "NOASSERTION", @@ -300,10 +293,6 @@ SourceDateEpoch: testTime, Namespace: "test-ns", Arch: "x86_64", - ReleaseData: &apko_build.ReleaseData{ - ID: "test-os", - VersionID: "1.0", - }, } gen := &Generator{} @@ -339,8 +328,7 @@ Packages: []spdx.Package{ { ID: "SPDXRef-OperatingSystem", - Name: "test-os", - Version: "1.0", + Name: "test-ns", FilesAnalyzed: false, LicenseConcluded: "NOASSERTION", LicenseDeclared: "NOASSERTION", @@ -412,10 +400,6 @@ SourceDateEpoch: testTime, Namespace: "test-ns", Arch: "x86_64", - ReleaseData: &apko_build.ReleaseData{ - ID: "test-os", - VersionID: "1.0", - }, } gen := &Generator{} @@ -451,8 +435,7 @@ Packages: []spdx.Package{ { ID: "SPDXRef-OperatingSystem", - Name: "test-os", - Version: "1.0", + Name: "test-ns", FilesAnalyzed: false, LicenseConcluded: "NOASSERTION", LicenseDeclared: "NOASSERTION", @@ -558,10 +541,6 @@ SourceDateEpoch: testTime, Namespace: "test-ns", Arch: "x86_64", - ReleaseData: &apko_build.ReleaseData{ - ID: "test-os", - VersionID: "1.0", - }, } gen := &Generator{} @@ -598,8 +577,7 @@ Packages: []spdx.Package{ { ID: "SPDXRef-OperatingSystem", - Name: "test-os", - Version: "1.0", + Name: "test-ns", FilesAnalyzed: false, LicenseConcluded: "NOASSERTION", LicenseDeclared: "NOASSERTION", @@ -672,8 +650,7 @@ Packages: []spdx.Package{ { ID: "SPDXRef-OperatingSystem", - Name: "test-os", - Version: "1.0", + Name: "test-ns", FilesAnalyzed: false, LicenseConcluded: "NOASSERTION", LicenseDeclared: "NOASSERTION", @@ -770,8 +747,7 @@ Packages: []spdx.Package{ { ID: "SPDXRef-OperatingSystem", - Name: "test-os", - Version: "1.0", + Name: "test-ns", FilesAnalyzed: false, LicenseConcluded: "NOASSERTION", LicenseDeclared: "NOASSERTION", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/build/testdata/goldenfiles/sboms/7zip-two-fetches-2301-r3.spdx.json new/melange-0.43.3/pkg/build/testdata/goldenfiles/sboms/7zip-two-fetches-2301-r3.spdx.json --- old/melange-0.43.1/pkg/build/testdata/goldenfiles/sboms/7zip-two-fetches-2301-r3.spdx.json 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/build/testdata/goldenfiles/sboms/7zip-two-fetches-2301-r3.spdx.json 2026-02-24 17:32:40.000000000 +0100 @@ -19,7 +19,6 @@ { "SPDXID": "SPDXRef-OperatingSystem", "name": "wolfi", - "versionInfo": "20230201", "filesAnalyzed": false, "licenseConcluded": "NOASSERTION", "licenseDeclared": "NOASSERTION", @@ -88,7 +87,7 @@ "externalRefs": [ { "referenceCategory": "PACKAGE-MANAGER", - "referenceLocator": "pkg:generic/7zip-two-fetches@2301?checksum=sha512%3Ae39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986\u0026download_url=https%3A%2F%2F7-zip.org%2Fa%2F7z2301-src.tar.xz", + "referenceLocator": "pkg:generic/7zip-two-fetches@2301?checksum=sha512:e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986\u0026download_url=https:%2F%2F7-zip.org%2Fa%2F7z2301-src.tar.xz", "referenceType": "purl" } ] @@ -113,7 +112,7 @@ "externalRefs": [ { "referenceCategory": "PACKAGE-MANAGER", - "referenceLocator": "pkg:generic/7zip-two-fetches@2301?checksum=sha512%3Ae39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986\u0026download_url=https%3A%2F%2F7-zip.org%2Fa%2F7z2301-src.tar.xz", + "referenceLocator": "pkg:generic/7zip-two-fetches@2301?checksum=sha512:e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986\u0026download_url=https:%2F%2F7-zip.org%2Fa%2F7z2301-src.tar.xz", "referenceType": "purl" } ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/build/testdata/goldenfiles/sboms/crane-0.20.2-r1.spdx.json new/melange-0.43.3/pkg/build/testdata/goldenfiles/sboms/crane-0.20.2-r1.spdx.json --- old/melange-0.43.1/pkg/build/testdata/goldenfiles/sboms/crane-0.20.2-r1.spdx.json 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/build/testdata/goldenfiles/sboms/crane-0.20.2-r1.spdx.json 2026-02-24 17:32:40.000000000 +0100 @@ -19,7 +19,6 @@ { "SPDXID": "SPDXRef-OperatingSystem", "name": "wolfi", - "versionInfo": "20230201", "filesAnalyzed": false, "licenseConcluded": "NOASSERTION", "licenseDeclared": "NOASSERTION", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/license/license.go new/melange-0.43.3/pkg/license/license.go --- old/melange-0.43.1/pkg/license/license.go 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/license/license.go 2026-02-24 17:32:40.000000000 +0100 @@ -239,7 +239,7 @@ // CollectLicenseInfo collects license information from the given filesystem. // If deep is true, the entire tree is scanned. If deep is false, only the top directory and one level down are scanned. -func CollectLicenseInfo(ctx context.Context, fsys fs.FS, deep bool) ([]License, error) { +func CollectLicenseInfo(ctx context.Context, fsys fs.FS, deep bool, cfg *config.Configuration) ([]License, error) { log := clog.FromContext(ctx) // Find all license-text files @@ -248,6 +248,29 @@ return nil, fmt.Errorf("finding license files: %w", err) } + // If configuration is provided, add any license-paths from the config + if cfg != nil { + // Build a set of existing paths to avoid duplicates + existingPaths := make(map[string]struct{}) + for _, lf := range licenseFiles { + existingPaths[lf.Path] = struct{}{} + } + + // Add license paths from the configuration + for _, cp := range cfg.Package.Copyright { + if cp.LicensePath != "" { + if _, exists := existingPaths[cp.LicensePath]; !exists { + licenseFiles = append(licenseFiles, LicenseFile{ + Name: filepath.Base(cp.LicensePath), + Path: cp.LicensePath, + Weight: 1.0, // Neutral weight + }) + existingPaths[cp.LicensePath] = struct{}{} + } + } + } + } + if len(licenseFiles) == 0 { // No license files detected, no linting performed. log.Debugf("no license files detected") @@ -287,7 +310,7 @@ log := clog.FromContext(ctx) log.Infof("checking license information") - detectedLicenses, err := CollectLicenseInfo(ctx, fsys, deep) + detectedLicenses, err := CollectLicenseInfo(ctx, fsys, deep, cfg) if err != nil { return nil, nil, fmt.Errorf("collecting license info: %w", err) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/license/license_test.go new/melange-0.43.3/pkg/license/license_test.go --- old/melange-0.43.1/pkg/license/license_test.go 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/license/license_test.go 2026-02-24 17:32:40.000000000 +0100 @@ -212,6 +212,7 @@ Copyright: []config.Copyright{ {License: "Apache-2.0", LicensePath: "LICENSE-APACHE"}, {License: "MIT", LicensePath: "LICENSE-BSD"}, + {License: "Apache-2.0", LicensePath: "ATYPICAL-FILENAME"}, {License: "GPL-2.0 OR GPL-3.0"}, }, }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/license/testdata/ATYPICAL-FILENAME new/melange-0.43.3/pkg/license/testdata/ATYPICAL-FILENAME --- old/melange-0.43.1/pkg/license/testdata/ATYPICAL-FILENAME 1970-01-01 01:00:00.000000000 +0100 +++ new/melange-0.43.3/pkg/license/testdata/ATYPICAL-FILENAME 2026-02-24 17:32:40.000000000 +0100 @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/melange-0.43.1/pkg/sbom/document.go new/melange-0.43.3/pkg/sbom/document.go --- old/melange-0.43.1/pkg/sbom/document.go 2026-02-19 09:59:54.000000000 +0100 +++ new/melange-0.43.3/pkg/sbom/document.go 2026-02-24 17:32:40.000000000 +0100 @@ -9,7 +9,6 @@ apko_build "chainguard.dev/apko/pkg/build" "chainguard.dev/apko/pkg/sbom/generator/spdx" - "github.com/chainguard-dev/clog" "github.com/spdx/tools-golang/spdx/v2/common" "sigs.k8s.io/release-utils/version" ) @@ -44,13 +43,8 @@ func (d Document) ToSPDX(ctx context.Context, releaseData *apko_build.ReleaseData) spdx.Document { spdxPkgs := make([]spdx.Package, 0, len(d.Packages)) - // Start off by adding the OperatingSystem package to the list of packages. - if releaseData != nil { - spdxPkgs = append(spdxPkgs, d.createOperatingSystemPackage(releaseData)) - } else { - log := clog.FromContext(ctx) - log.Warn("No release data provided, not adding OperatingSystem package to SPDX document") - } + // Add the OperatingSystem package to the list of packages. + spdxPkgs = append(spdxPkgs, d.createOperatingSystemPackage(releaseData)) for _, p := range d.Packages { spdxPkgs = append(spdxPkgs, p.ToSPDX(ctx)) ++++++ melange.obsinfo ++++++ --- /var/tmp/diff_new_pack.ZSYESC/_old 2026-02-25 21:11:35.244687048 +0100 +++ /var/tmp/diff_new_pack.ZSYESC/_new 2026-02-25 21:11:35.248687214 +0100 @@ -1,5 +1,5 @@ name: melange -version: 0.43.1 -mtime: 1771491594 -commit: a5fca9fbdbc75c099161196a38c7a4812824b2b9 +version: 0.43.3 +mtime: 1771950760 +commit: 66e9282b26b7537ac33b130a3499d9119a0e52f1 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/melange/vendor.tar.gz /work/SRC/openSUSE:Factory/.melange.new.1977/vendor.tar.gz differ: char 13, line 1
