0001-Fix-CVE-2024-24786.patch

@@ -1,41 +0,0 @@
-From b479c8f294b21bd0d0f89efadc9978b8f6cf05a5 Mon Sep 17 00:00:00 2001
-From: lauk001 <liukuo@kylinos.cn>
-Date: Mon, 15 Apr 2024 14:38:31 +0800
-Subject: [PATCH] Fix CVE-2024-24786
-
----
- .../protobuf/encoding/protojson/well_known_types.go           | 4 ++++
- .../protobuf/internal/encoding/json/decode.go                 | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go b/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go
-index 25329b7..4b177c8 100644
---- a/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go
-+++ b/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go
-@@ -322,6 +322,10 @@ func (d decoder) skipJSONValue() error {
- 			if open > d.opts.RecursionLimit {
- 				return errors.New("exceeded max recursion depth")
- 			}
-+		case json.EOF:
-+			// This can only happen if there's a bug in Decoder.Read.
-+			// Avoid an infinite loop if this does happen.
-+			return errors.New("unexpected EOF")
- 		}
- 		if open == 0 {
- 			return nil
-diff --git a/vendor/google.golang.org/protobuf/internal/encoding/json/decode.go b/vendor/google.golang.org/protobuf/internal/encoding/json/decode.go
-index d043a6e..d2b3ac0 100644
---- a/vendor/google.golang.org/protobuf/internal/encoding/json/decode.go
-+++ b/vendor/google.golang.org/protobuf/internal/encoding/json/decode.go
-@@ -121,7 +121,7 @@ func (d *Decoder) Read() (Token, error) {
- 
- 	case ObjectClose:
- 		if len(d.openStack) == 0 ||
--			d.lastToken.kind == comma ||
-+			d.lastToken.kind&(Name|comma) != 0 ||
- 			d.openStack[len(d.openStack)-1] != ObjectOpen {
- 			return Token{}, d.newSyntaxError(tok.pos, unexpectedFmt, tok.RawString())
- 		}
--- 
-2.33.0
-

README.md

@@ -1,35 +1,30 @@
 # ignition
 
 #### 介绍
-Ignition is a utility used to manipulate systems during the initramfs.
+Ignition is the utility used by NestOS to manipulate disks during the initramfs.
-This includes partitioning disks, formatting partitions, writing files
-(regular files, systemd units, etc.), and configuring users. On first
-boot, Ignition reads its configuration from a source of truth (remote
-URL, network metadata service, hypervisor bridge, etc.) and applies
-the configuration.
 
+#### 软件架构
+软件架构说明
 
 
 #### 安装教程
 
-Install ignition rpm package:
+1.  xxxx
-
+2.  xxxx
-yum install ignition
+3.  xxxx
 
 #### 使用说明
 
-ignition 是云底座操作系统NestOS的必需组件，详细说明见下
+1.  xxxx
-
+2.  xxxx
-Odds are good that you don't want to invoke Ignition directly. In fact, it isn't even present in the root filesystem. Take a look at the [Getting Started Guide](https://github.com/coreos/ignition/blob/main/docs/getting-started.md) for details on providing Ignition with a runtime configuration.
+3.  xxxx
 
 #### 参与贡献
 
-master分支使用最新的上游版本，如果检测到上游有最新版本发布，先形成issue后再提交对应PR更新，流程如下。
+1.  Fork 本仓库
-1.  提交issue
+2.  新建 Feat_xxx 分支
-2.  Fork 本仓库
+3.  提交代码
-3.  新建 Feat_xxx 分支
+4.  新建 Pull Request
-4.  提交代码
-5.  新建 Pull Request
 
 
 #### 特技

ignition.spec

@@ -5,17 +5,15 @@
 %global gotest go test
 
 Name:           ignition
-Version:        2.18.0
+Version:        2.15.0
 Release:        1
 Summary:        First boot installer and configuration tool
 License:        Apache-2.0
 URL:            https://github.com/coreos/ignition
 Source0:        https://github.com/coreos/ignition/archive/v%{version}/%{name}-%{version}.tar.gz
 
-Patch0001:      0001-Fix-CVE-2024-24786.patch
-
 BuildRequires: libblkid-devel
-BuildRequires: golang >= 1.20
+BuildRequires: golang >= 1.10
 BuildRequires: systemd
 
 # Requires for 'disks' stage
@@ -25,67 +23,66 @@ Requires: gdisk
 Requires: dracut
 Requires: dracut-network
 
+Obsoletes: ignition-dracut < 0.31.0-3
+
 # Main package Provides (generated with go-mods-to-bundled-provides.py | sort)
 Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3
-Provides: bundled(golang(cloud.google.com/go/storage)) = 1.38.0
+Provides: bundled(golang(cloud.google.com/go/storage)) = 1.29.0
-Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.38.0
+Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.29.0
-Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.38.0
+Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.29.0
-Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.38.0
+Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/stubs)) = 1.29.0
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.50.25
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.44.204
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.50.25
+Provides: bundled(golang(github.com/beevik/etree)) = 1.1.1-0.20200718192613.git4a2f8b9d084c
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.50.25
-Provides: bundled(golang(github.com/beevik/etree)) = 1.3.0
-Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.6.0
 Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.1
 Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.5.0
 Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.5.0
@@ -96,56 +93,51 @@ Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20230201181
 Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20230201181013.gitd72178a18687
 Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20230201181013.gitd72178a18687
 Provides: bundled(golang(github.com/google/renameio/v2)) = 2.0.0
-Provides: bundled(golang(github.com/google/uuid)) = 1.6.0
+Provides: bundled(golang(github.com/google/uuid)) = 1.3.0
-Provides: bundled(golang(github.com/mdlayher/vsock)) = 1.2.1
-Provides: bundled(golang(github.com/mitchellh/copystructure)) = 1.2.0
 Provides: bundled(golang(github.com/pin/tftp)) = 2.1.0
 Provides: bundled(golang(github.com/pin/tftp/netascii)) = 2.1.0
 Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6-0.20210604193023.gitd5e0c0615ace
-Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.8.4
+Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.8.1
 Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 1.0.0
 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = 0.0.0-20220317130741.git510905f0efa3
 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20220317130741.git510905f0efa3
 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-20220317130741.git510905f0efa3
 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20220317130741.git510905f0efa3
 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20220317130741.git510905f0efa3
-Provides: bundled(golang(golang.org/x/net/bpf)) = 0.21.0
+Provides: bundled(golang(golang.org/x/net/context)) = 0.7.0
-Provides: bundled(golang(golang.org/x/net/http2)) = 0.21.0
+Provides: bundled(golang(golang.org/x/net/http2)) = 0.7.0
-Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.21.0
+Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.7.0
-Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.21.0
+Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.7.0
-Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.21.0
+Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.7.0
-Provides: bundled(golang(golang.org/x/net/idna)) = 0.21.0
+Provides: bundled(golang(golang.org/x/net/idna)) = 0.7.0
-Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.21.0
+Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.7.0
-Provides: bundled(golang(golang.org/x/net/trace)) = 0.21.0
+Provides: bundled(golang(golang.org/x/net/trace)) = 0.7.0
-Provides: bundled(golang(golang.org/x/oauth2)) = 0.17.0
+Provides: bundled(golang(golang.org/x/oauth2)) = 0.5.0
-Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.17.0
+Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.5.0
-Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.17.0
+Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.5.0
-Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccount)) = 0.17.0
+Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccount)) = 0.5.0
-Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.17.0
+Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.5.0
-Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.17.0
+Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.5.0
-Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.17.0
+Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.5.0
-Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.17.0
+Provides: bundled(golang(golang.org/x/sys/unix)) = 0.5.0
-Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.17.0
+Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.110.0
-Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.17.0
+Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.110.0
-Provides: bundled(golang(golang.org/x/sys/unix)) = 0.17.0
+Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.110.0
-Provides: bundled(golang(golang.org/x/sys/windows)) = 0.17.0
+Provides: bundled(golang(google.golang.org/api/internal)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/internal)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/iterator)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/option)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/transport)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/iterator)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/transport/cert)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/option)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/transport)) = 0.167.0
+Provides: bundled(golang(google.golang.org/api/transport/internal/dca)) = 0.110.0
-Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.167.0
+
-Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.167.0
-Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.167.0
-Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
 
 %description
 Ignition is a utility used to manipulate systems during the initramfs.
@@ -161,6 +153,8 @@ the configuration.
 Summary:       Validation tool for Ignition configs
 License:       Apache-2.0
 
+Conflicts: ignition < 0.31.0-3
+
 %description validate
 Ignition is a utility used to manipulate systems during the initramfs.
 This includes partitioning disks, formatting partitions, writing files
@@ -223,21 +217,6 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition
 %{_bindir}/ignition-validate
 
 %changelog
-* Mon Apr 15 2024 liukuo <liukuo@kylinos.cn> - 2.18.0-1
-- upgrade version to 2.18.0, featuring selective inclusion of the dracut module in initramfs upon request and added support for Scaleway
-
-* Wed Apr 10 2024 zhangbowei <zhangbowei@kylinos.cn> - 2.17.0-2
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC: fix CVE-2024-24786
-
-* Wed Jan 03 2024 duyiwei <duyiwei@kylinos.cn> - 2.17.0-1
-- upgrade version to 2.17.0
-
-* Mon Aug 07 2023 duyiwei <duyiwei@kylinos.cn> - 2.16.2-1
-- upgrade version to 2.16.2
-
 * Mon May 29 2023 duyiwei <duyiwei@kylinos.cn> - 2.15.0-1
 - upgrade version to 2.15.0