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-10-27 11:24:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/melange (Old)
and /work/SRC/openSUSE:Factory/.melange.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "melange"
Sun Oct 27 11:24:40 2024 rev:37 rq:1218502 version:0.14.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/melange/melange.changes 2024-10-24
15:44:08.379572931 +0200
+++ /work/SRC/openSUSE:Factory/.melange.new.2020/melange.changes
2024-10-27 11:24:50.721335876 +0100
@@ -1,0 +2,16 @@
+Sat Oct 26 08:39:55 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 0.14.10:
+ * build(deps): bump the gomod group across 1 directory with 2
+ updates
+
+-------------------------------------------------------------------
+Fri Oct 25 12:22:11 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 0.14.9:
+ * chore: unexport build pkg methods
+ * bump apko to get http key support
+ * go mod tidy
+ * bump apko to pick up chainguard key fix
+
+-------------------------------------------------------------------
Old:
----
melange-0.14.8.obscpio
New:
----
melange-0.14.10.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ melange.spec ++++++
--- /var/tmp/diff_new_pack.bDNhpH/_old 2024-10-27 11:24:52.533410986 +0100
+++ /var/tmp/diff_new_pack.bDNhpH/_new 2024-10-27 11:24:52.533410986 +0100
@@ -17,7 +17,7 @@
Name: melange
-Version: 0.14.8
+Version: 0.14.10
Release: 0
Summary: Build APKs from source code
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.bDNhpH/_old 2024-10-27 11:24:52.569412479 +0100
+++ /var/tmp/diff_new_pack.bDNhpH/_new 2024-10-27 11:24:52.573412644 +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.14.8</param>
+ <param name="revision">v0.14.10</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.bDNhpH/_old 2024-10-27 11:24:52.593413473 +0100
+++ /var/tmp/diff_new_pack.bDNhpH/_new 2024-10-27 11:24:52.597413639 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/chainguard-dev/melange</param>
- <param
name="changesrevision">1cbadb01479998301f8dfba24cde8da47cd148b2</param></service></servicedata>
+ <param
name="changesrevision">b88740a9f1c3e3fd9be091008bb1fa25faa01453</param></service></servicedata>
(No newline at EOF)
++++++ melange-0.14.8.obscpio -> melange-0.14.10.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.14.8/go.mod new/melange-0.14.10/go.mod
--- old/melange-0.14.8/go.mod 2024-10-23 19:06:35.000000000 +0200
+++ new/melange-0.14.10/go.mod 2024-10-26 05:23:59.000000000 +0200
@@ -4,9 +4,9 @@
require (
al.essio.dev/pkg/shellescape v1.5.1
- chainguard.dev/apko v0.19.3-0.20241022221321-4e38dc838f9c
+ chainguard.dev/apko v0.19.4
cloud.google.com/go/storage v1.45.0
- dagger.io/dagger v0.13.5
+ dagger.io/dagger v0.13.6
github.com/chainguard-dev/clog v1.5.1-0.20240811185937-4c523ae4593f
github.com/chainguard-dev/go-pkgconfig
v0.0.0-20240404163941-6351b37b2a10
github.com/chainguard-dev/yam v0.2.2
@@ -44,7 +44,7 @@
golang.org/x/sys v0.26.0
golang.org/x/text v0.19.0
golang.org/x/time v0.7.0
- google.golang.org/api v0.202.0
+ google.golang.org/api v0.203.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
@@ -68,7 +68,7 @@
cloud.google.com/go/iam v1.2.1 // indirect
cloud.google.com/go/monitoring v1.21.1 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
- github.com/99designs/gqlgen v0.17.49 // indirect
+ github.com/99designs/gqlgen v0.17.55 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 //
indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp
v1.24.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric
v0.48.1 // indirect
@@ -76,7 +76,7 @@
github.com/Khan/genqlient v0.7.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
- github.com/adrg/xdg v0.5.0 // indirect
+ github.com/adrg/xdg v0.5.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 //
indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect
@@ -144,7 +144,7 @@
github.com/josharian/intern v1.0.0 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
- github.com/letsencrypt/boulder v0.0.0-20241021211548-844334e04aef //
indirect
+ github.com/letsencrypt/boulder v0.0.0-20241023221324-e5edb7077fc1 //
indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -185,7 +185,7 @@
github.com/u-root/u-root v0.14.0 // indirect
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
github.com/vbatts/tar-split v0.11.6 // indirect
- github.com/vektah/gqlparser/v2 v2.5.16 // indirect
+ github.com/vektah/gqlparser/v2 v2.5.17 // indirect
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
@@ -196,6 +196,8 @@
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0
// indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc
v0.0.0-20240518090000-14441aefdf88 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.3.0 //
indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc
v1.27.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp
v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0
// indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0
// indirect
@@ -219,7 +221,7 @@
google.golang.org/grpc/stats/opentelemetry
v0.0.0-20240907200651-3ffb98b2c93a // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
- k8s.io/apimachinery v0.31.1 // indirect
+ k8s.io/apimachinery v0.31.2 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
mvdan.cc/sh/v3 v3.8.0 // indirect
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.14.8/go.sum new/melange-0.14.10/go.sum
--- old/melange-0.14.8/go.sum 2024-10-23 19:06:35.000000000 +0200
+++ new/melange-0.14.10/go.sum 2024-10-26 05:23:59.000000000 +0200
@@ -2,8 +2,8 @@
al.essio.dev/pkg/shellescape v1.5.1/go.mod
h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
cel.dev/expr v0.16.1 h1:NR0+oFYzR1CqLFhTAqg3ql59G9VfN8fKq1TCHJ6gq1g=
cel.dev/expr v0.16.1/go.mod h1:AsGA5zb3WruAEQeQng1RZdGEXmBj0jvMWh6l5SnNuC8=
-chainguard.dev/apko v0.19.3-0.20241022221321-4e38dc838f9c
h1:64LG4/NwSvA7SDfyn+O8/bvg/PCcgj9Gro/u+yF9C6E=
-chainguard.dev/apko v0.19.3-0.20241022221321-4e38dc838f9c/go.mod
h1:LIjh/prp/tZQPRiByhMzZzwcH7D3GjFd67WVLuiuT3A=
+chainguard.dev/apko v0.19.4 h1:ce01FSWOKiVk2+3d4BDol/AiOqnUQLaq121XrlcWn1M=
+chainguard.dev/apko v0.19.4/go.mod
h1:Xwby6unVOg4xJZ11l2kyHdr9sykJmmEaWvgoT18CFbI=
chainguard.dev/go-grpc-kit v0.17.6
h1:lwIs9LmSnm8jwrH1QmigCwMP6MYkIBENq/0xGduYZss=
chainguard.dev/go-grpc-kit v0.17.6/go.mod
h1:ZNaXn2KEO++2u2WveHs65krYiHmAEGjYLeEtfaQaOWU=
chainguard.dev/sdk v0.1.28 h1:xLQv0JxiGhqVKOL059DmTReTjrKFhUsP5U1W6cgr+jQ=
@@ -29,14 +29,14 @@
cloud.google.com/go/storage v1.45.0/go.mod
h1:wpPblkIuMP5jCB/E48Pz9zIo2S/zD8g+ITmxKkPCITE=
cloud.google.com/go/trace v1.11.1
h1:UNqdP+HYYtnm6lb91aNA5JQ0X14GnxkABGlfz2PzPew=
cloud.google.com/go/trace v1.11.1/go.mod
h1:IQKNQuBzH72EGaXEodKlNJrWykGZxet2zgjtS60OtjA=
-dagger.io/dagger v0.13.5 h1:OOKqcosTgLjNa/Af9kJBh5EwY706rblqT+jwnXUvYjw=
-dagger.io/dagger v0.13.5/go.mod h1:MskKkqirGk7Nzq8TQY+bGoT7arpLr0D1/ODkJ4jH9i8=
+dagger.io/dagger v0.13.6 h1:SB/0zQtxAjFpLjSX+t9LfSbCxPCVwaPz9yWRROGEOD8=
+dagger.io/dagger v0.13.6/go.mod h1:YCNpoHLR3fiqE7a0yZs06rqD4+oXI9r/u7l6om1w0pI=
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod
h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-github.com/99designs/gqlgen v0.17.49
h1:b3hNGexHd33fBSAd4NDT/c3NCcQzcAVkknhN9ym36YQ=
-github.com/99designs/gqlgen v0.17.49/go.mod
h1:tC8YFVZMed81x7UJ7ORUwXF4Kn6SXuucFqQBhN8+BU0=
+github.com/99designs/gqlgen v0.17.55
h1:3vzrNWYyzSZjGDFo68e5j9sSauLxfKvLp+6ioRokVtM=
+github.com/99designs/gqlgen v0.17.55/go.mod
h1:3Bq768f8hgVPGZxL8aY9MaYmbxa6llPM/qu1IGH1EJo=
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161
h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod
h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/BurntSushi/toml v0.3.1/go.mod
h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -57,8 +57,8 @@
github.com/Microsoft/go-winio v0.6.2/go.mod
h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/ProtonMail/go-crypto v1.0.0
h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78=
github.com/ProtonMail/go-crypto v1.0.0/go.mod
h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
-github.com/adrg/xdg v0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY=
-github.com/adrg/xdg v0.5.0/go.mod
h1:dDdY4M4DF9Rjy4kHPeNL+ilVF+p2lK8IdM9/rTSGcI4=
+github.com/adrg/xdg v0.5.1 h1:Im8iDbEFARltY09yOJlSGu4Asjk2vF85+3Dyru8uJ0U=
+github.com/adrg/xdg v0.5.1/go.mod
h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
github.com/anchore/go-struct-converter
v0.0.0-20221118182256-c68fdcfa2092/go.mod
h1:rYqSE9HbjzpHTI74vwPvae4ZVYZd1lue2ta6xHPdblA=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod
h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
@@ -332,8 +332,8 @@
github.com/kubescape/go-git-url v0.0.30/go.mod
h1:3ddc1HEflms1vMhD9owt/3FBES070UaYTUarcjx8jDk=
github.com/kylelemons/godebug v1.1.0
h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod
h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/letsencrypt/boulder v0.0.0-20241021211548-844334e04aef
h1:iMdlQdJbEjIbIH8qWsy8O1l9CGRCk2mLJmrQFqW2XDA=
-github.com/letsencrypt/boulder v0.0.0-20241021211548-844334e04aef/go.mod
h1:UQQzuebeGqBJqA5Stf1Ng77rw1BjxV697QU0CEI/eSk=
+github.com/letsencrypt/boulder v0.0.0-20241023221324-e5edb7077fc1
h1:d7tOyKmOJGOkFkRKp4fBORYFCLNFC8o9CyQCtQ+s2y8=
+github.com/letsencrypt/boulder v0.0.0-20241023221324-e5edb7077fc1/go.mod
h1:UQQzuebeGqBJqA5Stf1Ng77rw1BjxV697QU0CEI/eSk=
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=
@@ -479,8 +479,8 @@
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701/go.mod
h1:P3a5rG4X7tI17Nn3aOIAYr5HbIMukwXG0urG0WuL8OA=
github.com/vbatts/tar-split v0.11.6
h1:4SjTW5+PU11n6fZenf2IPoV8/tz3AaYHMWjf23envGs=
github.com/vbatts/tar-split v0.11.6/go.mod
h1:dqKNtesIOr2j2Qv3W/cHjnvk9I8+G7oAkFDFN6TCBEI=
-github.com/vektah/gqlparser/v2 v2.5.16
h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0vy5p8=
-github.com/vektah/gqlparser/v2 v2.5.16/go.mod
h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww=
+github.com/vektah/gqlparser/v2 v2.5.17
h1:9At7WblLV7/36nulgekUgIaqHZWn5hxqluxrxGUhOmI=
+github.com/vektah/gqlparser/v2 v2.5.17/go.mod
h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww=
github.com/wk8/go-ordered-map/v2 v2.1.8
h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
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=
@@ -512,6 +512,10 @@
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc
v0.0.0-20240518090000-14441aefdf88/go.mod
h1:JGG8ebaMO5nXOPnvKEl+DiA4MGwFjCbjsxT1WHIEBPY=
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.3.0
h1:ccBrA8nCY5mM0y5uO7FT0ze4S0TuFcWdDB2FxGMTjkI=
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.3.0/go.mod
h1:/9pb6634zi2Lk8LYg9Q0X8Ar6jka4dkFOylBLbVQPCE=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0
h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc
v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0
h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp
v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0
h1:lsInsfvhVIfOI6qHVyysXMNDnjO9Npvl7tlDPJFBVd4=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0/go.mod
h1:KQsVNh4OjgjTG0G6EiNi1jVpnaeeKsKMRwbLN+f1+8M=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0
h1:m0yTiGDLUvVYaTFbAvCkVYIYcvwKt3G7OLoN77NUs/8=
@@ -674,8 +678,8 @@
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.202.0 h1:y1iuVHMqokQbimW79ZqPZWo4CiyFu6HcCYHwSNyzlfo=
-google.golang.org/api v0.202.0/go.mod
h1:3Jjeq7M/SFblTNCp7ES2xhq+WvGL0KeXI0joHQBfwTQ=
+google.golang.org/api v0.203.0 h1:SrEeuwU3S11Wlscsn+LA1kb/Y5xT8uggJSkIhD08NAU=
+google.golang.org/api v0.203.0/go.mod
h1:BuOVyCSYEPwJb3npWvDnNmFI92f3GeRnHNkETneT3SI=
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=
@@ -739,8 +743,8 @@
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod
h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod
h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod
h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
-k8s.io/apimachinery v0.31.1/go.mod
h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
+k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
+k8s.io/apimachinery v0.31.2/go.mod
h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
h1:0LQagt0gDpKqvIkAMPaRGcXawNMouPECM1+F9BVxEaM=
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f/go.mod
h1:S9tOR0FxgyusSNR+MboCuiDpVWkAifZvaYI1Q2ubgro=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.14.8/pkg/build/build.go
new/melange-0.14.10/pkg/build/build.go
--- old/melange-0.14.8/pkg/build/build.go 2024-10-23 19:06:35.000000000
+0200
+++ new/melange-0.14.10/pkg/build/build.go 2024-10-26 05:23:59.000000000
+0200
@@ -241,7 +241,7 @@
log.Infof("applying configuration patches for build option %s",
optName)
if opt, ok := b.Configuration.Options[optName]; ok {
- if err := b.ApplyBuildOption(opt); err != nil {
+ if err := b.applyBuildOption(opt); err != nil {
return nil, err
}
}
@@ -270,11 +270,11 @@
return errors.Join(errs...)
}
-// BuildGuest invokes apko to build the guest environment, returning a
reference to the image
+// buildGuest invokes apko to build the guest environment, returning a
reference to the image
// loaded by the OCI Image loader.
-func (b *Build) BuildGuest(ctx context.Context, imgConfig
apko_types.ImageConfiguration, guestFS apkofs.FullFS) (string, error) {
+func (b *Build) buildGuest(ctx context.Context, imgConfig
apko_types.ImageConfiguration, guestFS apkofs.FullFS) (string, error) {
log := clog.FromContext(ctx)
- ctx, span := otel.Tracer("melange").Start(ctx, "BuildGuest")
+ ctx, span := otel.Tracer("melange").Start(ctx, "buildGuest")
defer span.End()
tmp, err := os.MkdirTemp(os.TempDir(), "apko-temp-*")
@@ -303,7 +303,7 @@
}
bc.Summarize(ctx)
- log.Infof("auth configured for: %s", maps.Keys(b.Auth)) // TODO: add
this to Summarize
+ log.Infof("auth configured for: %s", maps.Keys(b.Auth)) // TODO: add
this to summarize
// lay out the contents for the image in a directory.
if err := bc.BuildImage(ctx); err != nil {
@@ -364,8 +364,8 @@
return nil
}
-// ApplyBuildOption applies a patch described by a BuildOption to a package
build.
-func (b *Build) ApplyBuildOption(bo config.BuildOption) error {
+// applyBuildOption applies a patch described by a BuildOption to a package
build.
+func (b *Build) applyBuildOption(bo config.BuildOption) error {
// Patch the variables block.
if b.Configuration.Vars == nil {
b.Configuration.Vars = make(map[string]string)
@@ -435,7 +435,7 @@
return ignorePatterns, nil
}
-func (b *Build) OverlayBinSh() error {
+func (b *Build) overlayBinSh() error {
if b.BinShOverlay == "" {
return nil
}
@@ -521,10 +521,10 @@
return tmp, nil
}
-// IsBuildLess returns true if the build context does not actually do any
building.
+// isBuildLess returns true if the build context does not actually do any
building.
// TODO(kaniini): Improve the heuristic for this by checking for uses/runs
statements
// in the pipeline.
-func (b *Build) IsBuildLess() bool {
+func (b *Build) isBuildLess() bool {
return len(b.Configuration.Pipeline) == 0
}
@@ -549,9 +549,9 @@
return u, nil
}
-func (b *Build) PopulateCache(ctx context.Context) error {
+func (b *Build) populateCache(ctx context.Context) error {
log := clog.FromContext(ctx)
- ctx, span := otel.Tracer("melange").Start(ctx, "PopulateCache")
+ ctx, span := otel.Tracer("melange").Start(ctx, "populateCache")
defer span.End()
if b.CacheDir == "" {
@@ -625,9 +625,9 @@
return nil
}
-func (b *Build) PopulateWorkspace(ctx context.Context, src fs.FS) error {
+func (b *Build) populateWorkspace(ctx context.Context, src fs.FS) error {
log := clog.FromContext(ctx)
- _, span := otel.Tracer("melange").Start(ctx, "PopulateWorkspace")
+ _, span := otel.Tracer("melange").Start(ctx, "populateWorkspace")
defer span.End()
ignorePatterns, err := b.loadIgnoreRules(ctx)
@@ -676,7 +676,7 @@
ctx, span := otel.Tracer("melange").Start(ctx, "BuildPackage")
defer span.End()
- b.Summarize(ctx)
+ b.summarize(ctx)
namespace := b.Namespace
if namespace == "" {
@@ -762,7 +762,7 @@
pr := &pipelineRunner{
interactive: b.Interactive,
debug: b.Debug,
- config: b.WorkspaceConfig(ctx),
+ config: b.workspaceConfig(ctx),
runner: b.Runner,
}
@@ -775,7 +775,7 @@
}
log.Infof("populating workspace %s from %s", b.WorkspaceDir,
b.SourceDir)
- if err := b.PopulateWorkspace(ctx, os.DirFS(b.SourceDir)); err
!= nil {
+ if err := b.populateWorkspace(ctx, os.DirFS(b.SourceDir)); err
!= nil {
return fmt.Errorf("unable to populate workspace: %w",
err)
}
}
@@ -785,9 +785,9 @@
}
linterQueue := []linterTarget{}
- cfg := b.WorkspaceConfig(ctx)
+ cfg := b.workspaceConfig(ctx)
- if !b.IsBuildLess() {
+ if !b.isBuildLess() {
// Prepare guest directory
if err := os.MkdirAll(b.GuestDir, 0755); err != nil {
return fmt.Errorf("mkdir -p %s: %w", b.GuestDir, err)
@@ -796,7 +796,7 @@
log.Infof("building workspace in '%s' with apko", b.GuestDir)
guestFS := apkofs.DirFS(b.GuestDir, apkofs.WithCreateDir())
- imgRef, err := b.BuildGuest(ctx, b.Configuration.Environment,
guestFS)
+ imgRef, err := b.buildGuest(ctx, b.Configuration.Environment,
guestFS)
if err != nil {
return fmt.Errorf("unable to build guest: %w", err)
}
@@ -806,11 +806,11 @@
// TODO(kaniini): Make overlay-binsh work with Docker and
Kubernetes.
// Probably needs help from apko.
- if err := b.OverlayBinSh(); err != nil {
+ if err := b.overlayBinSh(); err != nil {
return fmt.Errorf("unable to install overlay /bin/sh:
%w", err)
}
- if err := b.PopulateCache(ctx); err != nil {
+ if err := b.populateCache(ctx); err != nil {
return fmt.Errorf("unable to populate cache: %w", err)
}
@@ -858,7 +858,7 @@
// run any pipelines for subpackages
for _, sp := range b.Configuration.Subpackages {
sp := sp
- if !b.IsBuildLess() {
+ if !b.isBuildLess() {
log.Infof("running pipeline for subpackage %s", sp.Name)
ctx := clog.WithLogger(ctx, log.With("subpackage",
sp.Name))
@@ -883,7 +883,7 @@
// Retrieve the post build workspace from the runner
log.Infof("retrieving workspace from builder: %s", cfg.PodID)
fsys := apkofs.DirFS(b.WorkspaceDir)
- if err := b.RetrieveWorkspace(ctx, fsys); err != nil {
+ if err := b.retrieveWorkspace(ctx, fsys); err != nil {
return fmt.Errorf("retrieving workspace: %w", err)
}
log.Infof("retrieved and wrote post-build workspace to: %s",
b.WorkspaceDir)
@@ -945,7 +945,7 @@
}
}
- if !b.IsBuildLess() {
+ if !b.isBuildLess() {
// clean build guest container
if err := os.RemoveAll(b.GuestDir); err != nil {
log.Warnf("unable to clean guest container: %s", err)
@@ -1058,37 +1058,25 @@
}
}
-func (b *Build) Summarize(ctx context.Context) {
+func (b *Build) summarize(ctx context.Context) {
log := clog.FromContext(ctx)
log.Infof("melange is building:")
log.Infof(" configuration file: %s", b.ConfigFile)
b.SummarizePaths(ctx)
}
-// BuildFlavor determines if a build context uses glibc or musl, it returns
+// buildFlavor determines if a build context uses glibc or musl, it returns
// "gnu" for GNU systems, and "musl" for musl systems.
-func (b *Build) BuildFlavor() string {
+func (b *Build) buildFlavor() string {
if b.Libc == "" {
return "gnu"
}
return b.Libc
}
-// BuildTripletGnu returns the GNU autoconf build triplet, for example
-// `x86_64-pc-linux-gnu`.
-func (b *Build) BuildTripletGnu() string {
- return b.Arch.ToTriplet(b.BuildFlavor())
-}
-
-// BuildTripletRust returns the Rust/Cargo build triplet, for example
-// `x86_64-unknown-linux-gnu`.
-func (b *Build) BuildTripletRust() string {
- return b.Arch.ToRustTriplet(b.BuildFlavor())
-}
-
func (b *Build) buildWorkspaceConfig(ctx context.Context) *container.Config {
log := clog.FromContext(ctx)
- if b.IsBuildLess() {
+ if b.isBuildLess() {
return &container.Config{
Arch: b.Arch,
WorkspaceDir: b.WorkspaceDir,
@@ -1144,7 +1132,7 @@
return &cfg
}
-func (b *Build) WorkspaceConfig(ctx context.Context) *container.Config {
+func (b *Build) workspaceConfig(ctx context.Context) *container.Config {
if b.containerConfig == nil {
b.containerConfig = b.buildWorkspaceConfig(ctx)
}
@@ -1152,11 +1140,11 @@
return b.containerConfig
}
-// RetrieveWorkspace retrieves the workspace from the container and unpacks it
+// retrieveWorkspace retrieves the workspace from the container and unpacks it
// to the workspace directory. The workspace retrieved from the runner is in a
// tar stream containing the workspace contents rooted at ./melange-out
-func (b *Build) RetrieveWorkspace(ctx context.Context, fs apkofs.FullFS) error
{
- ctx, span := otel.Tracer("melange").Start(ctx, "RetrieveWorkspace")
+func (b *Build) retrieveWorkspace(ctx context.Context, fs apkofs.FullFS) error
{
+ ctx, span := otel.Tracer("melange").Start(ctx, "retrieveWorkspace")
defer span.End()
r, err := b.Runner.WorkspaceTar(ctx, b.containerConfig)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.14.8/pkg/build/compile.go
new/melange-0.14.10/pkg/build/compile.go
--- old/melange-0.14.8/pkg/build/compile.go 2024-10-23 19:06:35.000000000
+0200
+++ new/melange-0.14.10/pkg/build/compile.go 2024-10-26 05:23:59.000000000
+0200
@@ -113,7 +113,7 @@
// Compile compiles all configuration, including tests, by loading any
pipelines and substituting all variables.
func (b *Build) Compile(ctx context.Context) error {
cfg := b.Configuration
- sm, err := NewSubstitutionMap(&cfg, b.Arch, b.BuildFlavor(),
b.EnabledBuildOptions)
+ sm, err := NewSubstitutionMap(&cfg, b.Arch, b.buildFlavor(),
b.EnabledBuildOptions)
if err != nil {
return err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.14.8/pkg/build/test.go
new/melange-0.14.10/pkg/build/test.go
--- old/melange-0.14.8/pkg/build/test.go 2024-10-23 19:06:35.000000000
+0200
+++ new/melange-0.14.10/pkg/build/test.go 2024-10-26 05:23:59.000000000
+0200
@@ -134,7 +134,7 @@
// Returns the imgRef for the created image, or error.
func (t *Test) BuildGuest(ctx context.Context, imgConfig
apko_types.ImageConfiguration, guestFS apkofs.FullFS) (string, error) {
log := clog.FromContext(ctx)
- ctx, span := otel.Tracer("melange").Start(ctx, "BuildGuest")
+ ctx, span := otel.Tracer("melange").Start(ctx, "buildGuest")
defer span.End()
tmp, err := os.MkdirTemp(os.TempDir(), "apko-temp-*")
@@ -229,7 +229,7 @@
func (t *Test) PopulateCache(ctx context.Context) error {
log := clog.FromContext(ctx)
- ctx, span := otel.Tracer("melange").Start(ctx, "PopulateCache")
+ ctx, span := otel.Tracer("melange").Start(ctx, "populateCache")
defer span.End()
if t.CacheDir == "" {
@@ -300,7 +300,7 @@
func (t *Test) PopulateWorkspace(ctx context.Context, src fs.FS) error {
log := clog.FromContext(ctx)
- _, span := otel.Tracer("melange").Start(ctx, "PopulateWorkspace")
+ _, span := otel.Tracer("melange").Start(ctx, "populateWorkspace")
defer span.End()
if t.SourceDir == "" {
++++++ melange.obsinfo ++++++
--- /var/tmp/diff_new_pack.bDNhpH/_old 2024-10-27 11:24:52.973429226 +0100
+++ /var/tmp/diff_new_pack.bDNhpH/_new 2024-10-27 11:24:52.981429557 +0100
@@ -1,5 +1,5 @@
name: melange
-version: 0.14.8
-mtime: 1729703195
-commit: 1cbadb01479998301f8dfba24cde8da47cd148b2
+version: 0.14.10
+mtime: 1729913039
+commit: b88740a9f1c3e3fd9be091008bb1fa25faa01453
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/melange/vendor.tar.gz
/work/SRC/openSUSE:Factory/.melange.new.2020/vendor.tar.gz differ: char 5, line
1
