From a2c1b75a2454cc5545538f9e90405cc8bc92e8c2 Mon Sep 17 00:00:00 2001
From: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com>
Date: Mon, 25 May 2026 16:04:13 +0000
Subject: [PATCH] Update to 66

Resolves: RHEL-168682
---
 .gitignore         |   1 +
 image-builder.spec | 119 ++++++++++++++++++++-------------------------
 sources            |   2 +-
 3 files changed, 56 insertions(+), 66 deletions(-)

diff --git a/.gitignore b/.gitignore
index a072176..e64bb3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /image-builder-cli-48.tar.gz
 /image-builder-cli-50.tar.gz
 /image-builder-cli-51.tar.gz
+/image-builder-cli-66.tar.gz
diff --git a/image-builder.spec b/image-builder.spec
index 9b547c5..f08b664 100644
--- a/image-builder.spec
+++ b/image-builder.spec
@@ -3,11 +3,11 @@
 # required. So if this needs backport to places where there is no
 # recent osbuild available we could simply make --use-librepo false
 # and go back to 129.
-%global min_osbuild_version 171
+%global min_osbuild_version 181
 
 %global goipath         github.com/osbuild/image-builder-cli
 
-Version:        51
+Version:        66
 
 %gometa
 
@@ -46,49 +46,41 @@ BuildRequires:  btrfs-progs-devel
 BuildRequires:  systemd-rpm-macros
 # DO NOT REMOVE the BUNDLE_START and BUNDLE_END markers as they are used by 'tools/rpm_spec_add_provides_bundle.sh' to generate the Provides: bundled list
 # BUNDLE_START
-Provides: bundled(golang(dario.cat/mergo)) = 1.0.2
 Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.6.0
 Provides: bundled(golang(github.com/IBM/go-sdk-core/v5)) = 5.21.0
 Provides: bundled(golang(github.com/IBM/ibm-cos-sdk-go)) = 1.12.3
-Provides: bundled(golang(github.com/Microsoft/go-winio)) = 0.6.2
-Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 0.13.0
 Provides: bundled(golang(github.com/VividCortex/ewma)) = 1.2.0
 Provides: bundled(golang(github.com/acarl005/stripansi)) = 5a71ef0
 Provides: bundled(golang(github.com/asaskevich/govalidator)) = a9d515a
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2)) = 1.38.3
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream)) = 1.7.1
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/config)) = 1.31.6
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/credentials)) = 1.18.10
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds)) = 1.18.6
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/s3/manager)) = 1.19.4
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/configsources)) = 1.4.6
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/v2)) = 2.7.6
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/ini)) = 1.8.3
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a)) = 1.4.6
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/ec2)) = 1.249.0
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding)) = 1.13.1
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/checksum)) = 1.8.6
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/presigned-url)) = 1.13.6
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared)) = 1.19.6
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3)) = 1.87.3
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sso)) = 1.29.1
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/ssooidc)) = 1.34.2
-Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sts)) = 1.38.2
-Provides: bundled(golang(github.com/aws/smithy-go)) = 1.23.0
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2)) = 1.41.7
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream)) = 1.7.10
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/config)) = 1.32.17
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/credentials)) = 1.19.16
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds)) = 1.18.23
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager)) = 0.1.21
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/configsources)) = 1.4.23
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/v2)) = 2.7.23
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a)) = 1.4.24
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/ec2)) = 1.303.0
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding)) = 1.13.9
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/checksum)) = 1.9.15
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/presigned-url)) = 1.13.23
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared)) = 1.19.23
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3)) = 1.101.0
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/signin)) = 1.0.11
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sso)) = 1.30.17
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/ssooidc)) = 1.35.21
+Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sts)) = 1.42.1
+Provides: bundled(golang(github.com/aws/smithy-go)) = 1.25.1
 Provides: bundled(golang(github.com/cheggaaa/pb/v3)) = 3.1.7
-Provides: bundled(golang(github.com/containerd/cgroups/v3)) = 3.0.5
-Provides: bundled(golang(github.com/containerd/errdefs)) = 1.0.0
-Provides: bundled(golang(github.com/containerd/errdefs/pkg)) = 0.3.0
-Provides: bundled(golang(github.com/containerd/stargz-snapshotter/estargz)) = 0.16.3
-Provides: bundled(golang(github.com/containerd/typeurl/v2)) = 2.2.3
 Provides: bundled(golang(github.com/containers/common)) = 0.64.1
 Provides: bundled(golang(github.com/containers/image/v5)) = 5.36.1
 Provides: bundled(golang(github.com/containers/libtrust)) = c1716e8
 Provides: bundled(golang(github.com/containers/ocicrypt)) = 1.2.1
 Provides: bundled(golang(github.com/containers/storage)) = 1.59.1
 Provides: bundled(golang(github.com/coreos/go-semver)) = 0.3.1
+Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.7
 Provides: bundled(golang(github.com/cyberphone/json-canonicalization)) = 19d51d7
-Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = 0.4.1
 Provides: bundled(golang(github.com/davecgh/go-spew)) = d8f796a
 Provides: bundled(golang(github.com/distribution/reference)) = 0.6.0
 Provides: bundled(golang(github.com/docker/distribution)) = 2.8.3+incompatible
@@ -97,22 +89,16 @@ Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = 0.9.3
 Provides: bundled(golang(github.com/docker/go-connections)) = 0.5.0
 Provides: bundled(golang(github.com/docker/go-units)) = 0.5.0
 Provides: bundled(golang(github.com/fatih/color)) = 1.18.0
-Provides: bundled(golang(github.com/felixge/httpsnoop)) = 1.0.4
 Provides: bundled(golang(github.com/gabriel-vasile/mimetype)) = 1.4.8
-Provides: bundled(golang(github.com/go-jose/go-jose/v4)) = 4.0.5
-Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.3
-Provides: bundled(golang(github.com/go-logr/stdr)) = 1.2.2
+Provides: bundled(golang(github.com/go-jose/go-jose/v4)) = 4.1.4
 Provides: bundled(golang(github.com/go-openapi/errors)) = 0.22.0
 Provides: bundled(golang(github.com/go-openapi/strfmt)) = 0.23.0
 Provides: bundled(golang(github.com/go-playground/locales)) = 0.14.1
 Provides: bundled(golang(github.com/go-playground/universal-translator)) = 0.18.1
 Provides: bundled(golang(github.com/go-playground/validator/v10)) = 10.26.0
 Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3
-Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2
-Provides: bundled(golang(github.com/golang/groupcache)) = 2c02b82
 Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.4
 Provides: bundled(golang(github.com/google/go-containerregistry)) = 0.20.3
-Provides: bundled(golang(github.com/google/go-intervals)) = 0.0.2
 Provides: bundled(golang(github.com/google/uuid)) = 1.6.0
 Provides: bundled(golang(github.com/gophercloud/gophercloud/v2)) = 2.8.0
 Provides: bundled(golang(github.com/gorilla/mux)) = 1.8.1
@@ -126,16 +112,15 @@ Provides: bundled(golang(github.com/jmespath/go-jmespath)) = b0104c8
 Provides: bundled(golang(github.com/json-iterator/go)) = 1.1.12
 Provides: bundled(golang(github.com/klauspost/compress)) = 1.18.0
 Provides: bundled(golang(github.com/klauspost/pgzip)) = 1.2.6
+Provides: bundled(golang(github.com/kr/pretty)) = 0.3.1
 Provides: bundled(golang(github.com/leodido/go-urn)) = 1.4.0
 Provides: bundled(golang(github.com/letsencrypt/boulder)) = de9c061
 Provides: bundled(golang(github.com/mattn/go-colorable)) = 0.1.14
-Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20
+Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.22
 Provides: bundled(golang(github.com/mattn/go-runewidth)) = 0.0.16
 Provides: bundled(golang(github.com/mattn/go-sqlite3)) = 1.14.28
 Provides: bundled(golang(github.com/miekg/pkcs11)) = 1.1.1
-Provides: bundled(golang(github.com/mistifyio/go-zfs/v3)) = 3.0.1
 Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 1.5.0
-Provides: bundled(golang(github.com/moby/docker-image-spec)) = 1.3.1
 Provides: bundled(golang(github.com/moby/sys/capability)) = 0.4.0
 Provides: bundled(golang(github.com/moby/sys/mountinfo)) = 0.7.2
 Provides: bundled(golang(github.com/moby/sys/user)) = 0.4.0
@@ -145,14 +130,14 @@ Provides: bundled(golang(github.com/oklog/ulid)) = 1.3.1
 Provides: bundled(golang(github.com/opencontainers/go-digest)) = 1.0.0
 Provides: bundled(golang(github.com/opencontainers/image-spec)) = 1.1.1
 Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = 1.2.1
-Provides: bundled(golang(github.com/opencontainers/selinux)) = 1.12.0
-Provides: bundled(golang(github.com/osbuild/blueprint)) = 1.23.0
-Provides: bundled(golang(github.com/osbuild/images)) = 0.244.0
-Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1
+Provides: bundled(golang(github.com/osbuild/blueprint)) = 1.30.0
+Provides: bundled(golang(github.com/osbuild/images)) = 0.267.0
 Provides: bundled(golang(github.com/pmezard/go-difflib)) = 5d4384e
 Provides: bundled(golang(github.com/proglottis/gpgme)) = 0.1.4
 Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.23.0
 Provides: bundled(golang(github.com/rivo/uniseg)) = 0.4.7
+Provides: bundled(golang(github.com/rogpeppe/go-internal)) = 1.14.1
+Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0
 Provides: bundled(golang(github.com/secure-systems-lab/go-securesystemslib)) = 0.9.0
 Provides: bundled(golang(github.com/sigstore/fulcio)) = 1.6.6
 Provides: bundled(golang(github.com/sigstore/protobuf-specs)) = 0.4.1
@@ -163,32 +148,26 @@ Provides: bundled(golang(github.com/spf13/cobra)) = 1.10.2
 Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.10
 Provides: bundled(golang(github.com/stefanberger/go-pkcs11uri)) = 7828495
 Provides: bundled(golang(github.com/stretchr/testify)) = 1.11.1
-Provides: bundled(golang(github.com/sylabs/sif/v2)) = 2.21.1
-Provides: bundled(golang(github.com/tchap/go-patricia/v2)) = 2.3.3
+Provides: bundled(golang(github.com/supakeen/yamlplus)) = 1.1.0
 Provides: bundled(golang(github.com/titanous/rocacheck)) = afe7314
 Provides: bundled(golang(github.com/ulikunitz/xz)) = 0.5.12
 Provides: bundled(golang(github.com/vbatts/tar-split)) = 0.12.1
 Provides: bundled(golang(github.com/vbauerster/mpb/v8)) = 8.10.2
 Provides: bundled(golang(go.mongodb.org/mongo-driver)) = 1.17.2
-Provides: bundled(golang(go.opencensus.io)) = 0.24.0
-Provides: bundled(golang(go.opentelemetry.io/auto/sdk)) = 1.1.0
-Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.61.0
-Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.36.0
-Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.36.0
-Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.36.0
 Provides: bundled(golang(go.yaml.in/yaml/v2)) = 2.4.2
 Provides: bundled(golang(go.yaml.in/yaml/v3)) = 3.0.4
-Provides: bundled(golang(golang.org/x/crypto)) = 0.41.0
+Provides: bundled(golang(golang.org/x/crypto)) = 0.46.0
 Provides: bundled(golang(golang.org/x/exp)) = 7d7fa50
-Provides: bundled(golang(golang.org/x/net)) = 0.43.0
-Provides: bundled(golang(golang.org/x/sync)) = 0.16.0
-Provides: bundled(golang(golang.org/x/sys)) = 0.35.0
-Provides: bundled(golang(golang.org/x/term)) = 0.34.0
-Provides: bundled(golang(golang.org/x/text)) = 0.28.0
-Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = 3122310
-Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = 3122310
-Provides: bundled(golang(google.golang.org/grpc)) = 1.74.2
-Provides: bundled(golang(google.golang.org/protobuf)) = 1.36.7
+Provides: bundled(golang(golang.org/x/net)) = 0.48.0
+Provides: bundled(golang(golang.org/x/sync)) = 0.19.0
+Provides: bundled(golang(golang.org/x/sys)) = 0.41.0
+Provides: bundled(golang(golang.org/x/term)) = 0.40.0
+Provides: bundled(golang(golang.org/x/text)) = 0.32.0
+Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = ff82c1b
+Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = ff82c1b
+Provides: bundled(golang(google.golang.org/grpc)) = 1.79.3
+Provides: bundled(golang(google.golang.org/protobuf)) = 1.36.10
+Provides: bundled(golang(gopkg.in/check.v1)) = 10cb982
 Provides: bundled(golang(gopkg.in/ini.v1)) = 1.67.0
 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
 Provides: bundled(golang(libvirt.org/go/libvirt)) = 1.11006.0
@@ -237,14 +216,20 @@ GOTAGS="exclude_graphdriver_btrfs"
 %endif
 
 export LDFLAGS="${LDFLAGS} -X 'main.version=%{version}'"
-%gobuild ${GOTAGS:+-tags=$GOTAGS} -o %{gobuilddir}/bin/image-builder %{goipath}/cmd/image-builder
+%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/image-builder %{goipath}/cmd/image-builder
+
+# Generate man pages
+mkdir -p man/man1
+_bin/image-builder doc man/man1/
 
 %install
 install -m 0755 -vd                                 %{buildroot}%{_bindir}
-install -m 0755 -vp %{gobuilddir}/bin/image-builder %{buildroot}%{_bindir}/
+install -m 0755 -vp _bin/image-builder              %{buildroot}%{_bindir}/
 # tmpfiles.d snippet
 install -m 0755 -vd                                 %{buildroot}%{_tmpfilesdir}
 install -m 0644 -vp data/tmpfiles.d/image-builder.conf %{buildroot}%{_tmpfilesdir}/image-builder.conf
+install -m 0755 -vd                                 %{buildroot}%{_mandir}/man1
+install -m 0644 -vp man/man1/image-builder*.1       %{buildroot}%{_mandir}/man1/
 %check
 export GOFLAGS="-buildmode=pie"
 %if 0%{?rhel}
@@ -262,9 +247,13 @@ cd $PWD/_build/src/%{goipath}
 %doc README.md
 %{_bindir}/image-builder
 %{_tmpfilesdir}/image-builder.conf
+%{_mandir}/man1/image-builder*.1*
 %ghost %attr(0755, root, root) %dir /var/cache/image-builder
 
 %changelog
+* Mon May 25 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 66-1
+- New upstream release
+
 * Thu Feb 19 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 51-1
 - New upstream release
 
diff --git a/sources b/sources
index 60fd26e..663be90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (image-builder-cli-51.tar.gz) = e710df19a9445b117a993a4b562674de4f91235997d3c636a64f08d21b54dcb6d83fe310793751119fd15c6aecf674706e10876f5ed41febc5a87f9bf0922ba8
+SHA512 (image-builder-cli-66.tar.gz) = a3de51c2c577d8a1d7d5c269737743db5e1e8a13b99ef8a4daa6ea08d85cfef8ef7f82943fff4e4bb1151ae5b6cdff7b7798d78d942a629cab5b787f02a485d8