Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package melange for openSUSE:Factory checked
in at 2024-03-17 22:16:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/melange (Old)
and /work/SRC/openSUSE:Factory/.melange.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "melange"
Sun Mar 17 22:16:40 2024 rev:16 rq:1158673 version:0.6.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/melange/melange.changes 2024-02-25
14:06:47.790371177 +0100
+++ /work/SRC/openSUSE:Factory/.melange.new.1905/melange.changes
2024-03-17 22:17:48.424369192 +0100
@@ -1,0 +2,55 @@
+Sun Mar 17 08:04:49 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 0.6.9:
+ * build(deps): bump google.golang.org/api from 0.166.0 to 0.168.0
+ * build(deps): bump golang.org/x/sys from 0.17.0 to 0.18.0
+ * build(deps): bump dagger.io/dagger from 0.9.10 to 0.10.1
+ * Fix the bug in dropping the suffix.
+ * Drop WaitDelay from bubblewrap
+ * build(deps): bump actions/download-artifact from 4.1.2 to 4.1.4
+ * build(deps): bump github.com/stretchr/testify from 1.8.4 to
+ 1.9.0
+ * build(deps): bump cloud.google.com/go/storage from 1.38.0 to
+ 1.39.0
+
+-------------------------------------------------------------------
+Sun Mar 17 08:00:25 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 0.6.8:
+ * Update pombump.yaml
+
+-------------------------------------------------------------------
+Sun Mar 17 07:51:04 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 0.6.7:
+ * Rename the default bump file name.
+
+-------------------------------------------------------------------
+Sun Mar 17 07:45:18 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 0.6.6:
+ * Add ${{cross.triplet.rust.[glibc,musl]}}
+ * Add pombump pipeline.
+
+-------------------------------------------------------------------
+Sun Mar 17 07:35:28 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 0.6.5:
+ * Fix resource usage in melange
+ * Fix job control with interactive bubblewrap
+ * build(deps): bump github.com/chainguard-dev/yam from 0.0.1 to
+ 0.0.2
+ * build(deps): bump
+ go.opentelemetry.io/otel/exporters/stdout/stdouttrace
+ * build(deps): bump go.opentelemetry.io/otel/sdk from 1.23.1 to
+ 1.24.0
+ * build(deps): bump cloud.google.com/go/storage from 1.37.0 to
+ 1.38.0
+ * Bump apko
+ * Fix typo in error message
+ * build(deps): bump actions/upload-artifact from 4.3.0 to 4.3.1
+ * build(deps): bump actions/download-artifact from 4.1.1 to 4.1.2
+ * build(deps): bump golangci/golangci-lint-action from 3.7.0 to
+ 4.0.0
+
+-------------------------------------------------------------------
Old:
----
melange-0.6.4.obscpio
New:
----
melange-0.6.9.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ melange.spec ++++++
--- /var/tmp/diff_new_pack.oxLSoQ/_old 2024-03-17 22:17:50.268437035 +0100
+++ /var/tmp/diff_new_pack.oxLSoQ/_new 2024-03-17 22:17:50.280437477 +0100
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: melange
-Version: 0.6.4
+Version: 0.6.9
Release: 0
Summary: Build APKs from source code
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.oxLSoQ/_old 2024-03-17 22:17:50.544447190 +0100
+++ /var/tmp/diff_new_pack.oxLSoQ/_new 2024-03-17 22:17:50.580448514 +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.6.4</param>
+ <param name="revision">v0.6.9</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.oxLSoQ/_old 2024-03-17 22:17:50.604449398 +0100
+++ /var/tmp/diff_new_pack.oxLSoQ/_new 2024-03-17 22:17:50.612449692 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/chainguard-dev/melange</param>
- <param
name="changesrevision">49264c764db801371d44023b72bdaa9d5c2c4174</param></service></servicedata>
+ <param
name="changesrevision">7eabd5f9b87d98af6a4d52da340f20e77e554ba5</param></service></servicedata>
(No newline at EOF)
++++++ melange-0.6.4.obscpio -> melange-0.6.9.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/melange-0.6.4/.github/workflows/melange-test-pipelines.yaml
new/melange-0.6.9/.github/workflows/melange-test-pipelines.yaml
--- old/melange-0.6.4/.github/workflows/melange-test-pipelines.yaml
2024-02-24 03:43:46.000000000 +0100
+++ new/melange-0.6.9/.github/workflows/melange-test-pipelines.yaml
2024-03-06 19:33:40.000000000 +0100
@@ -26,7 +26,7 @@
run: |
make melange
- - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
# v4.3.0
+ - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
# v4.3.1
with:
name: melange-${{ github.run_id }}
path: ${{ github.workspace }}/melange
@@ -64,7 +64,7 @@
steps:
# Grab the melange we uploaded above, and install it.
- - uses:
actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
+ - uses:
actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
with:
name: melange-${{ github.run_id }}
path: ${{ github.workspace }}/.melange-dir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/.github/workflows/verify.yaml
new/melange-0.6.9/.github/workflows/verify.yaml
--- old/melange-0.6.4/.github/workflows/verify.yaml 2024-02-24
03:43:46.000000000 +0100
+++ new/melange-0.6.9/.github/workflows/verify.yaml 2024-03-06
19:33:40.000000000 +0100
@@ -23,7 +23,7 @@
check-latest: true
- name: golangci-lint
- uses:
golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.1.0
+ uses:
golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v3.1.0
with:
version: v1.54
args: --timeout=5m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/.github/workflows/wolfi-presubmit.yaml
new/melange-0.6.9/.github/workflows/wolfi-presubmit.yaml
--- old/melange-0.6.4/.github/workflows/wolfi-presubmit.yaml 2024-02-24
03:43:46.000000000 +0100
+++ new/melange-0.6.9/.github/workflows/wolfi-presubmit.yaml 2024-03-06
19:33:40.000000000 +0100
@@ -26,7 +26,7 @@
run: |
make melange
- - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
# v4.3.0
+ - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
# v4.3.1
with:
name: melange-${{ github.run_id }}
path: ${{ github.workspace }}/melange
@@ -70,7 +70,7 @@
with:
repository: wolfi-dev/os
- - uses:
actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
+ - uses:
actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
with:
name: melange-${{ github.run_id }}
path: ${{ github.workspace }}/.melange-dir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/go.mod new/melange-0.6.9/go.mod
--- old/melange-0.6.4/go.mod 2024-02-24 03:43:46.000000000 +0100
+++ new/melange-0.6.9/go.mod 2024-03-06 19:33:40.000000000 +0100
@@ -5,15 +5,15 @@
toolchain go1.21.5
require (
- chainguard.dev/apko v0.14.1-0.20240210120952-623f9b1c1ae1
- cloud.google.com/go/storage v1.37.0
- dagger.io/dagger v0.9.10
+ chainguard.dev/apko v0.14.1-0.20240227175428-53cb29ff83c9
+ cloud.google.com/go/storage v1.39.0
+ dagger.io/dagger v0.10.1
dario.cat/mergo v1.0.0
github.com/chainguard-dev/clog v1.3.1
- github.com/chainguard-dev/go-apk v0.0.0-20240207141231-4a3a18e598d6
+ github.com/chainguard-dev/go-apk v0.0.0-20240226195449-7ea5a3036268
github.com/chainguard-dev/go-pkgconfig
v0.0.0-20230818193557-bee0072057ce
github.com/chainguard-dev/kontext v0.1.0
- github.com/chainguard-dev/yam v0.0.1
+ github.com/chainguard-dev/yam v0.0.2
github.com/charmbracelet/log v0.3.2-0.20240205220859-7a3834f9b367
github.com/docker/cli v25.0.3+incompatible
github.com/docker/docker v25.0.3+incompatible
@@ -28,31 +28,31 @@
github.com/invopop/jsonschema v0.12.0
github.com/joho/godotenv v1.5.1
github.com/kelseyhightower/envconfig v1.4.0
- github.com/klauspost/compress v1.17.6
+ github.com/klauspost/compress v1.17.7
github.com/klauspost/pgzip v1.2.6
github.com/kubescape/go-git-url v0.0.27
- github.com/opencontainers/image-spec v1.1.0-rc6
+ github.com/opencontainers/image-spec v1.1.0
github.com/package-url/packageurl-go v0.1.2
github.com/pkg/errors v0.9.1
github.com/psanford/memfs v0.0.0-20230130182539-4dbf7e3e865e
github.com/spf13/cobra v1.8.0
- github.com/stretchr/testify v1.8.4
+ github.com/stretchr/testify v1.9.0
github.com/yookoala/realpath v1.0.0
github.com/zealic/xignore v0.3.3
gitlab.alpinelinux.org/alpine/go v0.8.1-0.20230928153721-5381bfaecf9b
- go.opentelemetry.io/otel v1.23.1
- go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.23.1
- go.opentelemetry.io/otel/sdk v1.23.1
- golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
+ go.opentelemetry.io/otel v1.24.0
+ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0
+ go.opentelemetry.io/otel/sdk v1.24.0
+ golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
golang.org/x/sync v0.6.0
- golang.org/x/sys v0.17.0
+ golang.org/x/sys v0.18.0
golang.org/x/text v0.14.0
golang.org/x/time v0.5.0
- google.golang.org/api v0.161.0
+ google.golang.org/api v0.168.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.29.1
- k8s.io/apimachinery v0.29.1
+ k8s.io/apimachinery v0.29.2
k8s.io/client-go v0.29.1
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
knative.dev/pkg v0.0.0-20230821102121-81e4ee140363
@@ -62,9 +62,9 @@
require (
cloud.google.com/go v0.112.0 // indirect
- cloud.google.com/go/compute v1.23.3 // indirect
+ cloud.google.com/go/compute v1.24.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
- cloud.google.com/go/iam v1.1.5 // indirect
+ cloud.google.com/go/iam v1.1.6 // indirect
github.com/99designs/gqlgen v0.17.41 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 //
indirect
github.com/Khan/genqlient v0.6.0 // indirect
@@ -108,7 +108,7 @@
github.com/go-openapi/loads v0.21.5 // indirect
github.com/go-openapi/runtime v0.27.1 // indirect
github.com/go-openapi/spec v0.20.14 // indirect
- github.com/go-openapi/strfmt v0.22.0 // indirect
+ github.com/go-openapi/strfmt v0.22.1 // indirect
github.com/go-openapi/swag v0.22.9 // indirect
github.com/go-openapi/validate v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
@@ -122,7 +122,7 @@
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
- github.com/googleapis/gax-go/v2 v2.12.0 // indirect
+ github.com/googleapis/gax-go/v2 v2.12.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -135,7 +135,7 @@
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
- github.com/letsencrypt/boulder v0.0.0-20240212193449-3865b4663866 //
indirect
+ github.com/letsencrypt/boulder v0.0.0-20240226214708-a97e074b5a3e //
indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -174,24 +174,24 @@
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.lsp.dev/uri v0.3.0 // indirect
- go.mongodb.org/mongo-driver v1.13.1 // indirect
+ go.mongodb.org/mongo-driver v1.14.0 // indirect
go.opencensus.io v0.24.0 // indirect
-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.47.0 // indirect
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0
// indirect
+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.49.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
// indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0
// indirect
- go.opentelemetry.io/otel/metric v1.23.1 // indirect
- go.opentelemetry.io/otel/trace v1.23.1 // indirect
- golang.org/x/crypto v0.19.0 // indirect
+ go.opentelemetry.io/otel/metric v1.24.0 // indirect
+ go.opentelemetry.io/otel/trace v1.24.0 // indirect
+ golang.org/x/crypto v0.20.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.21.0 // indirect
- golang.org/x/oauth2 v0.16.0 // indirect
+ golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/term v0.17.0 // indirect
golang.org/x/tools v0.18.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
- google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac //
indirect
- google.golang.org/genproto/googleapis/api
v0.0.0-20240122161410-6c6643bf1457 // indirect
- google.golang.org/genproto/googleapis/rpc
v0.0.0-20240116215550-a9fa1716bcac // indirect
- google.golang.org/grpc v1.61.0 // indirect
+ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 //
indirect
+ google.golang.org/genproto/googleapis/api
v0.0.0-20240221002015-b0ce06bbee7c // indirect
+ google.golang.org/genproto/googleapis/rpc
v0.0.0-20240304161311-37d4d3c04a78 // indirect
+ google.golang.org/grpc v1.62.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/go-jose/go-jose.v2 v2.6.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/go.sum new/melange-0.6.9/go.sum
--- old/melange-0.6.4/go.sum 2024-02-24 03:43:46.000000000 +0100
+++ new/melange-0.6.9/go.sum 2024-03-06 19:33:40.000000000 +0100
@@ -1,18 +1,18 @@
-chainguard.dev/apko v0.14.1-0.20240210120952-623f9b1c1ae1
h1:H6hm7vjQx/43tlwePmNxbXqL7R9fbiqX/YER9xND5+c=
-chainguard.dev/apko v0.14.1-0.20240210120952-623f9b1c1ae1/go.mod
h1:fEYr33zuMtpalgyPGEjOT43WdKYYRn8Y80Y/BApyINw=
+chainguard.dev/apko v0.14.1-0.20240227175428-53cb29ff83c9
h1:qRqVVASOFQyZK446Zp8JvtXvRCHTVfqufyBIar373hk=
+chainguard.dev/apko v0.14.1-0.20240227175428-53cb29ff83c9/go.mod
h1:uDrJ1TKnzXVP+4tNcrL0Rm/B/Kw1XoeadgMR+XmYUQI=
cloud.google.com/go v0.26.0/go.mod
h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM=
cloud.google.com/go v0.112.0/go.mod
h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4=
-cloud.google.com/go/compute v1.23.3
h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
-cloud.google.com/go/compute v1.23.3/go.mod
h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
+cloud.google.com/go/compute v1.24.0
h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg=
+cloud.google.com/go/compute v1.24.0/go.mod
h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40=
cloud.google.com/go/compute/metadata v0.2.3
h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
cloud.google.com/go/compute/metadata v0.2.3/go.mod
h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
-cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI=
-cloud.google.com/go/iam v1.1.5/go.mod
h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8=
-cloud.google.com/go/storage v1.37.0
h1:WI8CsaFO8Q9KjPVtsZ5Cmi0dXV25zMoX0FklT7c3Jm4=
-cloud.google.com/go/storage v1.37.0/go.mod
h1:i34TiT2IhiNDmcj65PqwCjcoUX7Z5pLzS8DEmoiFq1k=
-dagger.io/dagger v0.9.10 h1:pwFPbTL0yEGmFCkoEALXxSE6s5jfaRGz6gi6RYDBalI=
-dagger.io/dagger v0.9.10/go.mod h1:aq9P87v4apEOXKPXzn35uK+by5dUplSU5ZeXm+E8Sgw=
+cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc=
+cloud.google.com/go/iam v1.1.6/go.mod
h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI=
+cloud.google.com/go/storage v1.39.0
h1:brbjUa4hbDHhpQf48tjqMaXEV+f1OGoaTmQau9tmCsA=
+cloud.google.com/go/storage v1.39.0/go.mod
h1:OAEj/WZwUYjA3YHQ10/YcN9ttGuEpLwvaoyBXIPikEk=
+dagger.io/dagger v0.10.1 h1:/Gr12SuYAkWAFYMOp7VJdb5D3UXkrvLvmyugeteVonw=
+dagger.io/dagger v0.10.1/go.mod h1:AonAYX6ZXNGsVvro4HhB/Uzsp9FU+aI41YfAEY9f5mI=
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/99designs/gqlgen v0.17.41
h1:C1/zYMhGVP5TWNCNpmZ9Mb6CqT1Vr5SHEWoTOEJ3v3I=
@@ -57,14 +57,14 @@
github.com/chainguard-dev/clog v1.3.1/go.mod
h1:cV516KZWqYc/phZsCNwF36u/KMGS+Gj5Uqeb8Hlp95Y=
github.com/chainguard-dev/git-urls v1.0.2
h1:pSpT7ifrpc5X55n4aTTm7FFUE+ZQHKiqpiwNkJrVcKQ=
github.com/chainguard-dev/git-urls v1.0.2/go.mod
h1:rbGgj10OS7UgZlbzdUQIQpT0k/D4+An04HJY7Ol+Y/o=
-github.com/chainguard-dev/go-apk v0.0.0-20240207141231-4a3a18e598d6
h1:EV1GSw01XEbGAUElsHbVzG2N1+pGuewP2wmzcy+9MbM=
-github.com/chainguard-dev/go-apk v0.0.0-20240207141231-4a3a18e598d6/go.mod
h1:OdsmvVJb8RNVcTVQ7x07L319LLeiRaRnnsmj8qBBgb4=
+github.com/chainguard-dev/go-apk v0.0.0-20240226195449-7ea5a3036268
h1:gb0dzSYmYicDAOzXvW0LBwi9ZR0AF4lOgHWtlI1T7ic=
+github.com/chainguard-dev/go-apk v0.0.0-20240226195449-7ea5a3036268/go.mod
h1:a/Zmj1U8a+lKIDbigQOXi9qMlvZu75pF/aKzBSL9NDs=
github.com/chainguard-dev/go-pkgconfig v0.0.0-20230818193557-bee0072057ce
h1:v3SY2sW8rUIxG9wXMxXlMN7sd9VNUSdZ+FnVqOrm2nI=
github.com/chainguard-dev/go-pkgconfig
v0.0.0-20230818193557-bee0072057ce/go.mod
h1:obzGv2cx3tkRgkLQADSPaRl3OEsYmyfSv7t2Wu60tZw=
github.com/chainguard-dev/kontext v0.1.0
h1:GFnDRZiqa+anUi7tzZMECXr0nwt4Eo/zMzTQPLRXUIs=
github.com/chainguard-dev/kontext v0.1.0/go.mod
h1:hdyG5Sia0niCW8HN8MDXcDh/nL0sgcWQYSjPRFZOX/w=
-github.com/chainguard-dev/yam v0.0.1
h1:c1hPfBc8aI/lm/iTc3/DNaTEE/HIOEovDObc7X1hNxs=
-github.com/chainguard-dev/yam v0.0.1/go.mod
h1:CU1XgPmRuuFNq7q/INjrlAHgAMiDMhECboDQREn6rMo=
+github.com/chainguard-dev/yam v0.0.2
h1:nyNdg1nqwbbspENLNN64xIbEKh7NXz/CHlWaphR4lu4=
+github.com/chainguard-dev/yam v0.0.2/go.mod
h1:CU1XgPmRuuFNq7q/INjrlAHgAMiDMhECboDQREn6rMo=
github.com/charmbracelet/lipgloss v0.9.1
h1:PNyd3jvaJbg4jRHKWXnCj1akQm4rh8dbEzN1p/u1KWg=
github.com/charmbracelet/lipgloss v0.9.1/go.mod
h1:1mPmG4cxScwUQALAAnacHaigiiHB9Pmr+v1VEawJl6I=
github.com/charmbracelet/log v0.3.2-0.20240205220859-7a3834f9b367
h1:1MMPxtIznPH0tm+nC6rTkwZKJ3741yM++MGh+aY6XKg=
@@ -77,8 +77,6 @@
github.com/cloudflare/circl v1.3.7
h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
github.com/cloudflare/circl v1.3.7/go.mod
h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod
h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101
h1:7To3pQ+pZo0i3dsWEbinPNFs5gPSBOsJtx3wTT94VBY=
-github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101/go.mod
h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be
h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ=
github.com/common-nighthawk/go-figure
v0.0.0-20210622060536-734e95fb86be/go.mod
h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w=
github.com/containerd/log v0.1.0
h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
@@ -125,8 +123,6 @@
github.com/envoyproxy/go-control-plane
v0.9.1-0.20191026205805-5f8ba28d4473/go.mod
h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod
h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod
h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v1.0.2
h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
-github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod
h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
github.com/evanphx/json-patch v5.6.0+incompatible
h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod
h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/fatih/color v1.13.0/go.mod
h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
@@ -173,8 +169,8 @@
github.com/go-openapi/runtime v0.27.1/go.mod
h1:fijeJEiEclyS8BRurYE1DE5TLb9/KZl6eAdbzjsrlLU=
github.com/go-openapi/spec v0.20.14
h1:7CBlRnw+mtjFGlPDRZmAMnq35cRzI91xj03HVyUi/Do=
github.com/go-openapi/spec v0.20.14/go.mod
h1:8EOhTpBoFiask8rrgwbLC3zmJfz4zsCUueRuPM6GNkw=
-github.com/go-openapi/strfmt v0.22.0
h1:Ew9PnEYc246TwrEspvBdDHS4BVKXy/AOVsfqGDgAcaI=
-github.com/go-openapi/strfmt v0.22.0/go.mod
h1:HzJ9kokGIju3/K6ap8jL+OlGAbjpSv27135Yr9OivU4=
+github.com/go-openapi/strfmt v0.22.1
h1:5Ky8cybT4576C6Ffc+8gYji/wRXCo6Ozm8RaWjPI6jc=
+github.com/go-openapi/strfmt v0.22.1/go.mod
h1:OfVoytIXJasDkkGvkb1Cceb3BPyMOwk1FgmyyEw7NYg=
github.com/go-openapi/swag v0.22.9
h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE=
github.com/go-openapi/swag v0.22.9/go.mod
h1:3/OXnFfnMAwBD099SwYRk7GD3xOrr1iL7d/XNLXVVwE=
github.com/go-openapi/validate v0.23.0
h1:2l7PJLzCis4YUGEoW6eoQw3WhyM65WSIcjX6SQnlfDw=
@@ -203,7 +199,6 @@
github.com/golang/protobuf v1.5.2/go.mod
h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3
h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod
h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.1/go.mod
h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49
h1:0VpGH+cDhbDtdcweoyCVsF3fhN8kejK6rFe/2FFX2nU=
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49/go.mod
h1:BkkQ4L1KS1xMt2aWSPStnn55ChGC0DPOn2FQYj+f25M=
github.com/google/go-cmp v0.2.0/go.mod
h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -241,8 +236,8 @@
github.com/google/uuid v1.6.0/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/enterprise-certificate-proxy v0.3.2
h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod
h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
-github.com/googleapis/gax-go/v2 v2.12.0
h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
-github.com/googleapis/gax-go/v2 v2.12.0/go.mod
h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
+github.com/googleapis/gax-go/v2 v2.12.2
h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA=
+github.com/googleapis/gax-go/v2 v2.12.2/go.mod
h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc=
github.com/gorilla/websocket v1.4.2/go.mod
h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.5.0
h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod
h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -283,9 +278,8 @@
github.com/kevinburke/ssh_config v1.2.0/go.mod
h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kisielk/errcheck v1.5.0/go.mod
h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod
h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.13.6/go.mod
h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.6
h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
-github.com/klauspost/compress v1.17.6/go.mod
h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/compress v1.17.7
h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
+github.com/klauspost/compress v1.17.7/go.mod
h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/pgzip v1.2.6
h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
github.com/klauspost/pgzip v1.2.6/go.mod
h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
github.com/kr/pretty v0.1.0/go.mod
h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -297,8 +291,8 @@
github.com/kr/text v0.2.0/go.mod
h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kubescape/go-git-url v0.0.27
h1:nvHDwuFs4ezOJ5CGL9U7ZL6gRMneWZdelBs0KEK8yb8=
github.com/kubescape/go-git-url v0.0.27/go.mod
h1:3ddc1HEflms1vMhD9owt/3FBES070UaYTUarcjx8jDk=
-github.com/letsencrypt/boulder v0.0.0-20240212193449-3865b4663866
h1:mZ9+AbpGno2MRQZfLq6Q/Eu6n3biJsSajRPid5z4DTI=
-github.com/letsencrypt/boulder v0.0.0-20240212193449-3865b4663866/go.mod
h1:xFWTlJ4v5tijJj9HVIJi6TOij35bNTuAGwgOFmEg1p8=
+github.com/letsencrypt/boulder v0.0.0-20240226214708-a97e074b5a3e
h1:0YcEneR01FfQAfP/OlniqnE+NMLLGuJ/RTJmlamX2EY=
+github.com/letsencrypt/boulder v0.0.0-20240226214708-a97e074b5a3e/go.mod
h1:qY5wBgmaPwKkhGd2gNWZcoJBe9c76gsHm4OTc/N12+g=
github.com/lucasb-eyer/go-colorful v1.2.0
h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod
h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/mailru/easyjson v0.7.7
h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -331,7 +325,6 @@
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod
h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.2
h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod
h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod
h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
github.com/morikuni/aec v1.0.0/go.mod
h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
@@ -364,8 +357,8 @@
github.com/onsi/gomega v1.29.0/go.mod
h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
github.com/opencontainers/go-digest v1.0.0
h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod
h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0-rc6
h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU=
-github.com/opencontainers/image-spec v1.1.0-rc6/go.mod
h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/image-spec v1.1.0
h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
+github.com/opencontainers/image-spec v1.1.0/go.mod
h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
github.com/package-url/packageurl-go v0.1.2
h1:0H2DQt6DHd/NeRlVwW4EZ4oEI6Bn40XlNPRqegcxuo4=
github.com/package-url/packageurl-go v0.1.2/go.mod
h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c=
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
@@ -430,8 +423,8 @@
github.com/stretchr/testify v1.7.2/go.mod
h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
github.com/stretchr/testify v1.8.0/go.mod
h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod
h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4
h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod
h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0
h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod
h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399
h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0=
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod
h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs=
github.com/vbatts/tar-split v0.11.5
h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts=
@@ -442,12 +435,8 @@
github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod
h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
github.com/xanzy/ssh-agent v0.3.3
h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
github.com/xanzy/ssh-agent v0.3.3/go.mod
h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
-github.com/xdg-go/pbkdf2 v1.0.0/go.mod
h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.1.2/go.mod
h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
-github.com/xdg-go/stringprep v1.0.4/go.mod
h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
github.com/yookoala/realpath v1.0.0
h1:7OA9pj4FZd+oZDsyvXWQvjn5oBdcHRTV44PpdMSuImQ=
github.com/yookoala/realpath v1.0.0/go.mod
h1:gJJMA9wuX7AcqLy1+ffPatSCySA1FQ2S8Ya9AIoYBpE=
-github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod
h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
github.com/yuin/goldmark v1.1.27/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.13/go.mod
h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -457,28 +446,28 @@
gitlab.alpinelinux.org/alpine/go v0.8.1-0.20230928153721-5381bfaecf9b/go.mod
h1:F2JLVqRezwY1mhf7X/sPkQ/u+X550PHOL4OpCFyuOVU=
go.lsp.dev/uri v0.3.0 h1:KcZJmh6nFIBeJzTugn5JTU6OOyG0lDOo3R9KwTxTYbo=
go.lsp.dev/uri v0.3.0/go.mod h1:P5sbO1IQR+qySTWOCnhnK7phBx+W3zbLqSMDJNTw88I=
-go.mongodb.org/mongo-driver v1.13.1
h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk=
-go.mongodb.org/mongo-driver v1.13.1/go.mod
h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo=
+go.mongodb.org/mongo-driver v1.14.0
h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
+go.mongodb.org/mongo-driver v1.14.0/go.mod
h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0
h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod
h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA=
-go.opentelemetry.io/otel v1.23.1
h1:Za4UzOqJYS+MUczKI320AtqZHZb7EqxO00jAHE0jmQY=
-go.opentelemetry.io/otel v1.23.1/go.mod
h1:Td0134eafDLcTS4y+zQ26GE8u3dEuRBiBCTUIRHaikA=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod
h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
+go.opentelemetry.io/otel v1.24.0
h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
+go.opentelemetry.io/otel v1.24.0/go.mod
h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0
h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod
h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0
h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod
h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.23.1
h1:IqmsDcJnxQSs6W+1TMSqpYO7VY4ZuEKJGYlSBPUlT1s=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.23.1/go.mod
h1:VMZ84RYOd4Lrp0+09mckDvqBj2PXWDwOFaxb1P5uO8g=
-go.opentelemetry.io/otel/metric v1.23.1
h1:PQJmqJ9u2QaJLBOELl1cxIdPcpbwzbkjfEyelTl2rlo=
-go.opentelemetry.io/otel/metric v1.23.1/go.mod
h1:mpG2QPlAfnK8yNhNJAxDZruU9Y1/HubbC+KyH8FaCWI=
-go.opentelemetry.io/otel/sdk v1.23.1
h1:O7JmZw0h76if63LQdsBMKQDWNb5oEcOThG9IrxscV+E=
-go.opentelemetry.io/otel/sdk v1.23.1/go.mod
h1:LzdEVR5am1uKOOwfBWFef2DCi1nu3SA8XQxx2IerWFk=
-go.opentelemetry.io/otel/trace v1.23.1
h1:4LrmmEd8AU2rFvU1zegmvqW7+kWarxtNOPyeL6HmYY8=
-go.opentelemetry.io/otel/trace v1.23.1/go.mod
h1:4IpnpJFwr1mo/6HL8XIPJaE9y0+u1KcVmuW7dwFSVrI=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0
h1:s0PHtIkN+3xrbDOpt2M8OTG92cWqUESvzh2MxiR5xY8=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0/go.mod
h1:hZlFbDbRt++MMPCCfSJfmhkGIWnX1h3XjkfxZUjLrIA=
+go.opentelemetry.io/otel/metric v1.24.0
h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
+go.opentelemetry.io/otel/metric v1.24.0/go.mod
h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
+go.opentelemetry.io/otel/sdk v1.24.0
h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
+go.opentelemetry.io/otel/sdk v1.24.0/go.mod
h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
+go.opentelemetry.io/otel/trace v1.24.0
h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
+go.opentelemetry.io/otel/trace v1.24.0/go.mod
h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
go.opentelemetry.io/proto/otlp v1.0.0
h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
go.opentelemetry.io/proto/otlp v1.0.0/go.mod
h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod
h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -488,11 +477,11 @@
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod
h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod
h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
golang.org/x/crypto v0.7.0/go.mod
h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
-golang.org/x/crypto v0.19.0/go.mod
h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg=
+golang.org/x/crypto v0.20.0/go.mod
h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod
h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
-golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod
h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
+golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
+golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod
h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod
h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod
h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod
h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -524,8 +513,8 @@
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod
h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ=
-golang.org/x/oauth2 v0.16.0/go.mod
h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o=
+golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ=
+golang.org/x/oauth2 v0.17.0/go.mod
h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -567,8 +556,8 @@
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod
h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod
h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -607,8 +596,8 @@
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod
h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
-google.golang.org/api v0.161.0 h1:oYzk/bs26WN10AV7iU7MVJVXBH8oCPS2hHyBiEeFoSU=
-google.golang.org/api v0.161.0/go.mod
h1:0mu0TpK33qnydLvWqbImq2b1eQ5FHRSDCBzAxX9ZHyw=
+google.golang.org/api v0.168.0 h1:MBRe+Ki4mMN93jhDDbpuRLjRddooArz4FeSObvUMmjY=
+google.golang.org/api v0.168.0/go.mod
h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg=
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/appengine v1.6.8
h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
@@ -616,19 +605,19 @@
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod
h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod
h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod
h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac
h1:ZL/Teoy/ZGnzyrqK/Optxxp2pmVh+fmJ97slxSRyzUg=
-google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod
h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k=
-google.golang.org/genproto/googleapis/api v0.0.0-20240122161410-6c6643bf1457
h1:KHBtwE+eQc3+NxpjmRFlQ3pJQ2FNnhhgB9xOV8kyBuU=
-google.golang.org/genproto/googleapis/api
v0.0.0-20240122161410-6c6643bf1457/go.mod
h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac
h1:nUQEQmH/csSvFECKYRv6HWEyypysidKl2I6Qpsglq/0=
-google.golang.org/genproto/googleapis/rpc
v0.0.0-20240116215550-a9fa1716bcac/go.mod
h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA=
+google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9
h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y=
+google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod
h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s=
+google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c
h1:9g7erC9qu44ks7UK4gDNlnk4kOxZG707xKm4jVniy6o=
+google.golang.org/genproto/googleapis/api
v0.0.0-20240221002015-b0ce06bbee7c/go.mod
h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78
h1:Xs9lu+tLXxLIfuci70nG4cpwaRC+mRQPUL7LoIeDJC4=
+google.golang.org/genproto/googleapis/rpc
v0.0.0-20240304161311-37d4d3c04a78/go.mod
h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
google.golang.org/grpc v1.19.0/go.mod
h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.23.0/go.mod
h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.25.1/go.mod
h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.27.0/go.mod
h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.33.2/go.mod
h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0=
-google.golang.org/grpc v1.61.0/go.mod
h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
+google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk=
+google.golang.org/grpc v1.62.0/go.mod
h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod
h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod
h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod
h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -673,8 +662,8 @@
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod
h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw=
k8s.io/api v0.29.1/go.mod h1:7Kl10vBRUXhnQQI8YR/R327zXC8eJ7887/+Ybta+RoQ=
-k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc=
-k8s.io/apimachinery v0.29.1/go.mod
h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
+k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8=
+k8s.io/apimachinery v0.29.2/go.mod
h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A=
k8s.io/client-go v0.29.1/go.mod h1:TDG/psL9hdet0TI9mGyHJSgRkW3H9JZk2dNEUS7bRks=
k8s.io/klog/v2 v2.120.0 h1:z+q5mfovBj1fKFxiRzsa2DsJLPIVMk/KFL81LMOfK+8=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/melange-0.6.4/internal/contextreader/contextreader.go
new/melange-0.6.9/internal/contextreader/contextreader.go
--- old/melange-0.6.4/internal/contextreader/contextreader.go 2024-02-24
03:43:46.000000000 +0100
+++ new/melange-0.6.9/internal/contextreader/contextreader.go 2024-03-06
19:33:40.000000000 +0100
@@ -49,7 +49,7 @@
c.n, c.err = c.r.Read(p)
c.done <- struct{}{}
case <-c.ctx.Done():
- break
+ return
}
}
}()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/pkg/build/pipeline.go
new/melange-0.6.9/pkg/build/pipeline.go
--- old/melange-0.6.4/pkg/build/pipeline.go 2024-02-24 03:43:46.000000000
+0100
+++ new/melange-0.6.9/pkg/build/pipeline.go 2024-03-06 19:33:40.000000000
+0100
@@ -144,6 +144,8 @@
nw[config.SubstitutionHostTripletRust] =
pb.Build.BuildTripletRust()
nw[config.SubstitutionCrossTripletGnuGlibc] =
pb.Build.Arch.ToTriplet("gnu")
nw[config.SubstitutionCrossTripletGnuMusl] =
pb.Build.Arch.ToTriplet("musl")
+ nw[config.SubstitutionCrossTripletRustGlibc] =
pb.Build.Arch.ToRustTriplet("gnu")
+ nw[config.SubstitutionCrossTripletRustMusl] =
pb.Build.Arch.ToRustTriplet("musl")
nw[config.SubstitutionBuildArch] = pb.Build.Arch.ToAPK()
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/pkg/build/pipelines/maven/pombump.yaml
new/melange-0.6.9/pkg/build/pipelines/maven/pombump.yaml
--- old/melange-0.6.4/pkg/build/pipelines/maven/pombump.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/melange-0.6.9/pkg/build/pipelines/maven/pombump.yaml 2024-03-06
19:33:40.000000000 +0100
@@ -0,0 +1,57 @@
+name: Run pombump tool to update versions and properties in a Maven POM file
+needs:
+ packages:
+ - busybox
+ - pombump
+
+inputs:
+ patch-file:
+ description: |
+ Patches file to use for updating the POM file
+ default: ./pombump-deps.yaml
+ properties-file:
+ description: |
+ Properties file to be used for updating the POM file
+ default: ./pombump-properties.yaml
+ dependencies:
+ description: |
+ Dependencies to be used for updating the POM file via command line flag
+ properties:
+ description: |
+ Properties to update / add the POM file via command line flag
+ debug:
+ description: |
+ Enable debug mode, which will print out the diffs of the pom.xml file
after running pombump
+ default: false
+
+
+pipeline:
+ - runs: |
+ PATCH_FILE_FLAG=""
+ PROPERTIES_FILE_FLAG=""
+ DEPENDENCIES_FLAG=""
+ PROPERTIES_FLAG=""
+
+ if [ -f"${{inputs.patch-file}}" ]; then
+ PATCH_FILE_FLAG="--patch-file ${{inputs.patch-file}}"
+ fi
+
+ if [ -f "${{inputs.properties-file}}" ]; then
+ PROPERTIES_FILE_FLAG="--properties-file ${{inputs.properties-file}}"
+ fi
+
+ if [ -n "${{inputs.dependencies}}" ]; then
+ DEPENDENCIES_FLAG="--dependencies ${{inputs.dependencies}}"
+ fi
+
+ if [ -n "${{inputs.properties}}" ]; then
+ PROPERTIES_FLAG="--properties ${{inputs.properties}}"
+ fi
+
+ pombump pom.xml $PATCH_FILE_FLAG $PROPERTIES_FILE_FLAG
$DEPENDENCIES_FLAG $PROPERTIES_FLAG > pom.xml.new
+
+ if [ "${{inputs.debug}}" = "true" ]; then
+ # If there are any differences, it will return a non-zero exit code,
so we use `|| true` to ignore that
+ diff -w pom.xml pom.xml.new || true
+ fi
+ mv pom.xml.new pom.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/pkg/build/pipelines/pecl/install.yaml
new/melange-0.6.9/pkg/build/pipelines/pecl/install.yaml
--- old/melange-0.6.4/pkg/build/pipelines/pecl/install.yaml 2024-02-24
03:43:46.000000000 +0100
+++ new/melange-0.6.9/pkg/build/pipelines/pecl/install.yaml 2024-03-06
19:33:40.000000000 +0100
@@ -14,4 +14,4 @@
- runs: |
make INSTALL_ROOT="${{targets.destdir}}" install
install -d ${{targets.destdir}}/etc/php/conf.d
- echo "extension=${{inputs.extension}}" >
${{targets.destdir}}/etc/php/conf.d/${{inputs.extension}}.ini
+ echo "extension=${{inputs.extension}}.so" >
${{targets.destdir}}/etc/php/conf.d/${{inputs.extension}}.ini
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/pkg/config/vars.go
new/melange-0.6.9/pkg/config/vars.go
--- old/melange-0.6.4/pkg/config/vars.go 2024-02-24 03:43:46.000000000
+0100
+++ new/melange-0.6.9/pkg/config/vars.go 2024-03-06 19:33:40.000000000
+0100
@@ -22,19 +22,21 @@
)
const (
- SubstitutionPackageName = "${{package.name}}"
- SubstitutionPackageVersion = "${{package.version}}"
- SubstitutionPackageFullVersion = "${{package.full-version}}"
- SubstitutionPackageEpoch = "${{package.epoch}}"
- SubstitutionPackageDescription = "${{package.description}}"
- SubstitutionTargetsDestdir = "${{targets.destdir}}"
- SubstitutionTargetsContextdir = "${{targets.contextdir}}"
- SubstitutionSubPkgDir = "${{targets.subpkgdir}}"
- SubstitutionHostTripletGnu = "${{host.triplet.gnu}}"
- SubstitutionHostTripletRust = "${{host.triplet.rust}}"
- SubstitutionCrossTripletGnuGlibc = "${{cross.triplet.gnu.glibc}}"
- SubstitutionCrossTripletGnuMusl = "${{cross.triplet.gnu.musl}}"
- SubstitutionBuildArch = "${{build.arch}}"
+ SubstitutionPackageName = "${{package.name}}"
+ SubstitutionPackageVersion = "${{package.version}}"
+ SubstitutionPackageFullVersion = "${{package.full-version}}"
+ SubstitutionPackageEpoch = "${{package.epoch}}"
+ SubstitutionPackageDescription = "${{package.description}}"
+ SubstitutionTargetsDestdir = "${{targets.destdir}}"
+ SubstitutionTargetsContextdir = "${{targets.contextdir}}"
+ SubstitutionSubPkgDir = "${{targets.subpkgdir}}"
+ SubstitutionHostTripletGnu = "${{host.triplet.gnu}}"
+ SubstitutionHostTripletRust = "${{host.triplet.rust}}"
+ SubstitutionCrossTripletGnuGlibc = "${{cross.triplet.gnu.glibc}}"
+ SubstitutionCrossTripletGnuMusl = "${{cross.triplet.gnu.musl}}"
+ SubstitutionCrossTripletRustGlibc = "${{cross.triplet.rust.glibc}}"
+ SubstitutionCrossTripletRustMusl = "${{cross.triplet.rust.musl}}"
+ SubstitutionBuildArch = "${{build.arch}}"
)
// Get variables from configuration and return them in a map
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/pkg/container/bubblewrap_runner.go
new/melange-0.6.9/pkg/container/bubblewrap_runner.go
--- old/melange-0.6.4/pkg/container/bubblewrap_runner.go 2024-02-24
03:43:46.000000000 +0100
+++ new/melange-0.6.9/pkg/container/bubblewrap_runner.go 2024-03-06
19:33:40.000000000 +0100
@@ -23,7 +23,6 @@
"os/exec"
"path/filepath"
"strings"
- "time"
apko_build "chainguard.dev/apko/pkg/build"
apko_types "chainguard.dev/apko/pkg/build/types"
@@ -56,7 +55,7 @@
// Run runs a Bubblewrap task given a Config and command string.
func (bw *bubblewrap) Run(ctx context.Context, cfg *Config, args ...string)
error {
- execCmd := bw.cmd(ctx, cfg, args...)
+ execCmd := bw.cmd(ctx, cfg, false, args...)
log := clog.FromContext(ctx)
stdout, stderr := logwriter.New(log.Info), logwriter.New(log.Warn)
@@ -69,7 +68,7 @@
return execCmd.Run()
}
-func (bw *bubblewrap) cmd(ctx context.Context, cfg *Config, args ...string)
*exec.Cmd {
+func (bw *bubblewrap) cmd(ctx context.Context, cfg *Config, debug bool, args
...string) *exec.Cmd {
baseargs := []string{}
// always be sure to mount the / first!
@@ -84,8 +83,13 @@
"--dev", "/dev",
"--proc", "/proc",
"--chdir", runnerWorkdir,
- "--clearenv",
- "--new-session")
+ "--clearenv")
+
+ if !debug {
+ // This flag breaks job control, which we only care about for
--interactive debugging.
+ // So we usually include it, but if we're about to debug, don't
set it.
+ baseargs = append(baseargs, "--new-session")
+ }
if !cfg.Capabilities.Networking {
baseargs = append(baseargs, "--unshare-net")
@@ -98,18 +102,13 @@
args = append(baseargs, args...)
execCmd := exec.CommandContext(ctx, "bwrap", args...)
- // If you fork a child process in bubblewrap, Run will never return.
- // WaitDelay gives children 1 second to behave before orphaning them.
- // TODO: Remove bubblewrap runner or get someone at redhat to merge
something.
- execCmd.WaitDelay = 1 * time.Second
-
clog.FromContext(ctx).Infof("executing: %s", strings.Join(execCmd.Args,
" "))
return execCmd
}
func (bw *bubblewrap) Debug(ctx context.Context, cfg *Config, args ...string)
error {
- execCmd := bw.cmd(ctx, cfg, args...)
+ execCmd := bw.cmd(ctx, cfg, true, args...)
execCmd.Stdout = os.Stdout
execCmd.Stderr = os.Stderr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/pkg/container/docker/docker_runner.go
new/melange-0.6.9/pkg/container/docker/docker_runner.go
--- old/melange-0.6.4/pkg/container/docker/docker_runner.go 2024-02-24
03:43:46.000000000 +0100
+++ new/melange-0.6.9/pkg/container/docker/docker_runner.go 2024-03-06
19:33:40.000000000 +0100
@@ -199,6 +199,8 @@
defer stderr.Close()
// Wrap this in a contextReader so we respond to cancel.
+ ctx, cancel := context.WithCancel(ctx)
+ defer cancel()
ctxr := contextreader.New(ctx, r)
_, err := stdcopy.StdCopy(stdout, stderr, ctxr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.6.4/pkg/sbom/implementation.go
new/melange-0.6.9/pkg/sbom/implementation.go
--- old/melange-0.6.4/pkg/sbom/implementation.go 2024-02-24
03:43:46.000000000 +0100
+++ new/melange-0.6.9/pkg/sbom/implementation.go 2024-03-06
19:33:40.000000000 +0100
@@ -72,7 +72,7 @@
if os.IsNotExist(err) {
return false, nil
}
- return false, fmt.Errorf("checking if workind directory exists:
%w", err)
+ return false, fmt.Errorf("checking if working directory exists:
%w", err)
}
return true, nil
++++++ melange.obsinfo ++++++
--- /var/tmp/diff_new_pack.oxLSoQ/_old 2024-03-17 22:17:50.964462642 +0100
+++ /var/tmp/diff_new_pack.oxLSoQ/_new 2024-03-17 22:17:50.968462789 +0100
@@ -1,5 +1,5 @@
name: melange
-version: 0.6.4
-mtime: 1708742626
-commit: 49264c764db801371d44023b72bdaa9d5c2c4174
+version: 0.6.9
+mtime: 1709750020
+commit: 7eabd5f9b87d98af6a4d52da340f20e77e554ba5
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/melange/vendor.tar.gz
/work/SRC/openSUSE:Factory/.melange.new.1905/vendor.tar.gz differ: char 5, line
1
