From 715113b32b54c42e50760033169d21f9e4378c29 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 22 Apr 2024 16:16:06 -0700 Subject: [PATCH 01/16] Update to v1.29.3 Update to cri-o v1.29.3. This update resolves rpm build problem found in v1.29.2 among other fixes. Autogenerate bundled provides. The go-rpm-macros library includes a feature to autogenerate the list of bundled golang provides from libraries in ./vendor. This is enabled by changing '%license LICENSE' to '%license LICENSE vendor/modules.txt'. Remove otelttrpc.patch file and reference in spec file. Patch file was added to resolve rpm build problem that occurred in cri-o v1.29.2. v1.29.3 updates the otelrrprc vendor module which resolves the build problem. --- .gitignore | 1 + cri-o.spec | 14 +++-- otelttrpc.patch | 140 ------------------------------------------------ sources | 2 +- 4 files changed, 11 insertions(+), 146 deletions(-) delete mode 100644 otelttrpc.patch diff --git a/.gitignore b/.gitignore index 2fcd1e3..a2cfffa 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /cri-o-1.28.0.tar.gz /cri-o-1.28.2.tar.gz /cri-o-1.29.2.tar.gz +/cri-o-1.29.3.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 1b1a11e..450816f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.29.2 +Version: 1.29.3 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.29.2 %endif # Commit for the builds -%global commit0 d317b5dc918bbfbc78481072a0d93e572aa8d0e8 +%global commit0 12c618780c42414d92d6a8dc8d09c16337668eb2 Name: cri-o Epoch: 0 @@ -37,7 +37,6 @@ Summary: Open Container Initiative-based implementation of Kubernetes Con License: ASL 2.0 URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: otelttrpc.patch %if 0%{?rhel} BuildRequires: golang >= 1.19 @@ -192,7 +191,7 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %systemd_postun_with_restart %{service_name} %files -%license LICENSE +%license LICENSE vendor/modules.txt %doc docs code-of-conduct.md tutorial.md ADOPTERS.md CONTRIBUTING.md README.md %doc awesome.md transfer.md %{_bindir}/%{service_name} @@ -222,6 +221,11 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Sat Apr 27 2024 Bradley G Smith - 0:1.29.3-1 +- Bump to v1.29.3 +- Add support for autogenerated bundled provides +- Remove otelttrpc patch added in v1.29.2 to fix rpm build error. No longer needed. + * Thu Mar 21 2024 Peter Hunt - 0:1.29.2-1 - bump to v1.29.2 @@ -628,7 +632,7 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf - Configurable image volume support - Bugs and Stability fixes - OCI 1.0 runtime support -- Dropped internal runc, and now use systems runc +- Dropped internal runc, and now use systems runc * Fri Jun 30 2017 Lokesh Mandvekar - 1.0.0.alpha.0-1.git91977d3 - built commit 91977d3 diff --git a/otelttrpc.patch b/otelttrpc.patch deleted file mode 100644 index f9d44c9..0000000 --- a/otelttrpc.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 9bf89bf190f7462371640aa16ddfd4a11c73595b Mon Sep 17 00:00:00 2001 -From: Krisztian Litkey -Date: Tue, 5 Mar 2024 10:49:30 +0200 -Subject: [PATCH] deps: update otelttrpc to @latest and re-vendor. - -Update otelttrpc to latest HEAD to get rid of custom import -path checks which reportedly break RPM package builds. - -Signed-off-by: Krisztian Litkey ---- - go.mod | 2 +- - go.sum | 4 ++-- - vendor/github.com/containerd/otelttrpc/config.go | 2 +- - vendor/github.com/containerd/otelttrpc/interceptor.go | 2 +- - vendor/github.com/containerd/otelttrpc/internal/parse.go | 2 +- - vendor/github.com/containerd/otelttrpc/metadata_supplier.go | 2 +- - vendor/github.com/containerd/otelttrpc/semconv.go | 2 +- - vendor/github.com/containerd/otelttrpc/version.go | 2 +- - vendor/modules.txt | 2 +- - 9 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/go.mod b/go.mod -index fa9f1986d6a..ef48b581ba0 100644 ---- a/go.mod -+++ b/go.mod -@@ -13,7 +13,7 @@ require ( - github.com/containerd/cri-containerd v1.19.0 - github.com/containerd/fifo v1.1.0 - github.com/containerd/nri v0.6.0 -- github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 -+ github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 - github.com/containerd/ttrpc v1.2.3 - github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 - github.com/containernetworking/cni v1.1.2 -diff --git a/go.sum b/go.sum -index d6ec62bcb12..8cc4d36e87c 100644 ---- a/go.sum -+++ b/go.sum -@@ -846,8 +846,8 @@ github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oM - github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= - github.com/containerd/nri v0.6.0 h1:hdztxwL0gCS1CrCa9bvD1SoJiFN4jBuRQhplCvCPMj8= - github.com/containerd/nri v0.6.0/go.mod h1:F7OZfO4QTPqw5r87aq+syZJwiVvRYLIlHZiZDBV1W3A= --github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 h1:DzBGiha+Gvc0INnf4Z2WztM2VSATX7PAJpSdsFEVd6o= --github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1/go.mod h1:ZKzztepTSz/LKtbUSzfBNVwgqBEPABVZV9PQF/l53+Q= -+github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 h1:swk9KxrmARZjSMrHc1Lzb39XhcDwAhYpqkBhinCFLCQ= -+github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723/go.mod h1:ZKzztepTSz/LKtbUSzfBNVwgqBEPABVZV9PQF/l53+Q= - github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= - github.com/containerd/stargz-snapshotter/estargz v0.12.0/go.mod h1:AIQ59TewBFJ4GOPEQXujcrJ/EKxh5xXZegW1rkR1P/M= - github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G/ZW/0kEe2oEKCdS/ZxIyoCU= -diff --git a/vendor/github.com/containerd/otelttrpc/config.go b/vendor/github.com/containerd/otelttrpc/config.go -index a7768c3731d..186308a1eed 100644 ---- a/vendor/github.com/containerd/otelttrpc/config.go -+++ b/vendor/github.com/containerd/otelttrpc/config.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "go.opentelemetry.io/otel" -diff --git a/vendor/github.com/containerd/otelttrpc/interceptor.go b/vendor/github.com/containerd/otelttrpc/interceptor.go -index 8ce9fd9af81..e0c05c07c5d 100644 ---- a/vendor/github.com/containerd/otelttrpc/interceptor.go -+++ b/vendor/github.com/containerd/otelttrpc/interceptor.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "context" -diff --git a/vendor/github.com/containerd/otelttrpc/internal/parse.go b/vendor/github.com/containerd/otelttrpc/internal/parse.go -index 2520a129129..694aeba8015 100644 ---- a/vendor/github.com/containerd/otelttrpc/internal/parse.go -+++ b/vendor/github.com/containerd/otelttrpc/internal/parse.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package internal // import "github.com/containerd/ttrpc/otelttrpc" -+package internal - - import ( - "strings" -diff --git a/vendor/github.com/containerd/otelttrpc/metadata_supplier.go b/vendor/github.com/containerd/otelttrpc/metadata_supplier.go -index 4bda57a1805..b2c3cab182e 100644 ---- a/vendor/github.com/containerd/otelttrpc/metadata_supplier.go -+++ b/vendor/github.com/containerd/otelttrpc/metadata_supplier.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "context" -diff --git a/vendor/github.com/containerd/otelttrpc/semconv.go b/vendor/github.com/containerd/otelttrpc/semconv.go -index c0d5669cdfc..64f0fe8f30e 100644 ---- a/vendor/github.com/containerd/otelttrpc/semconv.go -+++ b/vendor/github.com/containerd/otelttrpc/semconv.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "go.opentelemetry.io/otel/attribute" -diff --git a/vendor/github.com/containerd/otelttrpc/version.go b/vendor/github.com/containerd/otelttrpc/version.go -index c2e09a34f90..bbf2bbcc5e0 100644 ---- a/vendor/github.com/containerd/otelttrpc/version.go -+++ b/vendor/github.com/containerd/otelttrpc/version.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - // Version is the current release version of the ttRPC instrumentation. - func Version() string { -diff --git a/vendor/modules.txt b/vendor/modules.txt -index eb710af7602..4ee9f9753b3 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -212,7 +212,7 @@ github.com/containerd/nri/pkg/net - github.com/containerd/nri/pkg/net/multiplex - github.com/containerd/nri/pkg/runtime-tools/generate - github.com/containerd/nri/pkg/stub --# github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 -+# github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 - ## explicit; go 1.13 - github.com/containerd/otelttrpc - github.com/containerd/otelttrpc/internal diff --git a/sources b/sources index 126fa47..4bbfbce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.29.2.tar.gz) = dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c +SHA512 (cri-o-1.29.3.tar.gz) = ed2e3d0342b0533cde26a5854447331503afb368fe4e56f87f33574c5b639bae780d58d0726d1f932fceae229f2c84500f5919aeedc3cb010fb6f271a97e3e55 From 128e53aa7c52ccd535e53c4d839dd22a3617a874 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 22 Apr 2024 16:16:06 -0700 Subject: [PATCH 02/16] Update to v1.29.3 Update to cri-o v1.29.3. This update brings cri-o version in line with Kubernetes for F40. Autogenerate bundled provides. The go-rpm-macros library includes a feature to autogenerate the list of bundled golang provides from libraries in ./vendor. This is enabled by changing '%license LICENSE' to '%license LICENSE vendor/modules.txt'. --- .gitignore | 1 + cri-o.spec | 13 +++-- otelttrpc.patch | 140 ------------------------------------------------ sources | 2 +- 4 files changed, 10 insertions(+), 146 deletions(-) delete mode 100644 otelttrpc.patch diff --git a/.gitignore b/.gitignore index 2fcd1e3..a2cfffa 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /cri-o-1.28.0.tar.gz /cri-o-1.28.2.tar.gz /cri-o-1.29.2.tar.gz +/cri-o-1.29.3.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 1b1a11e..1af4133 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.29.2 +Version: 1.29.3 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.29.2 %endif # Commit for the builds -%global commit0 d317b5dc918bbfbc78481072a0d93e572aa8d0e8 +%global commit0 12c618780c42414d92d6a8dc8d09c16337668eb2 Name: cri-o Epoch: 0 @@ -37,7 +37,6 @@ Summary: Open Container Initiative-based implementation of Kubernetes Con License: ASL 2.0 URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: otelttrpc.patch %if 0%{?rhel} BuildRequires: golang >= 1.19 @@ -192,7 +191,7 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %systemd_postun_with_restart %{service_name} %files -%license LICENSE +%license LICENSE vendor/modules.txt %doc docs code-of-conduct.md tutorial.md ADOPTERS.md CONTRIBUTING.md README.md %doc awesome.md transfer.md %{_bindir}/%{service_name} @@ -222,6 +221,10 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Sat Apr 27 2024 Bradley G Smith - 0:1.29.3-1 +- Bump to v1.29.3 +- Add support for autogenerated bundled provides + * Thu Mar 21 2024 Peter Hunt - 0:1.29.2-1 - bump to v1.29.2 @@ -628,7 +631,7 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf - Configurable image volume support - Bugs and Stability fixes - OCI 1.0 runtime support -- Dropped internal runc, and now use systems runc +- Dropped internal runc, and now use systems runc * Fri Jun 30 2017 Lokesh Mandvekar - 1.0.0.alpha.0-1.git91977d3 - built commit 91977d3 diff --git a/otelttrpc.patch b/otelttrpc.patch deleted file mode 100644 index f9d44c9..0000000 --- a/otelttrpc.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 9bf89bf190f7462371640aa16ddfd4a11c73595b Mon Sep 17 00:00:00 2001 -From: Krisztian Litkey -Date: Tue, 5 Mar 2024 10:49:30 +0200 -Subject: [PATCH] deps: update otelttrpc to @latest and re-vendor. - -Update otelttrpc to latest HEAD to get rid of custom import -path checks which reportedly break RPM package builds. - -Signed-off-by: Krisztian Litkey ---- - go.mod | 2 +- - go.sum | 4 ++-- - vendor/github.com/containerd/otelttrpc/config.go | 2 +- - vendor/github.com/containerd/otelttrpc/interceptor.go | 2 +- - vendor/github.com/containerd/otelttrpc/internal/parse.go | 2 +- - vendor/github.com/containerd/otelttrpc/metadata_supplier.go | 2 +- - vendor/github.com/containerd/otelttrpc/semconv.go | 2 +- - vendor/github.com/containerd/otelttrpc/version.go | 2 +- - vendor/modules.txt | 2 +- - 9 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/go.mod b/go.mod -index fa9f1986d6a..ef48b581ba0 100644 ---- a/go.mod -+++ b/go.mod -@@ -13,7 +13,7 @@ require ( - github.com/containerd/cri-containerd v1.19.0 - github.com/containerd/fifo v1.1.0 - github.com/containerd/nri v0.6.0 -- github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 -+ github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 - github.com/containerd/ttrpc v1.2.3 - github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 - github.com/containernetworking/cni v1.1.2 -diff --git a/go.sum b/go.sum -index d6ec62bcb12..8cc4d36e87c 100644 ---- a/go.sum -+++ b/go.sum -@@ -846,8 +846,8 @@ github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oM - github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= - github.com/containerd/nri v0.6.0 h1:hdztxwL0gCS1CrCa9bvD1SoJiFN4jBuRQhplCvCPMj8= - github.com/containerd/nri v0.6.0/go.mod h1:F7OZfO4QTPqw5r87aq+syZJwiVvRYLIlHZiZDBV1W3A= --github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 h1:DzBGiha+Gvc0INnf4Z2WztM2VSATX7PAJpSdsFEVd6o= --github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1/go.mod h1:ZKzztepTSz/LKtbUSzfBNVwgqBEPABVZV9PQF/l53+Q= -+github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 h1:swk9KxrmARZjSMrHc1Lzb39XhcDwAhYpqkBhinCFLCQ= -+github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723/go.mod h1:ZKzztepTSz/LKtbUSzfBNVwgqBEPABVZV9PQF/l53+Q= - github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= - github.com/containerd/stargz-snapshotter/estargz v0.12.0/go.mod h1:AIQ59TewBFJ4GOPEQXujcrJ/EKxh5xXZegW1rkR1P/M= - github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G/ZW/0kEe2oEKCdS/ZxIyoCU= -diff --git a/vendor/github.com/containerd/otelttrpc/config.go b/vendor/github.com/containerd/otelttrpc/config.go -index a7768c3731d..186308a1eed 100644 ---- a/vendor/github.com/containerd/otelttrpc/config.go -+++ b/vendor/github.com/containerd/otelttrpc/config.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "go.opentelemetry.io/otel" -diff --git a/vendor/github.com/containerd/otelttrpc/interceptor.go b/vendor/github.com/containerd/otelttrpc/interceptor.go -index 8ce9fd9af81..e0c05c07c5d 100644 ---- a/vendor/github.com/containerd/otelttrpc/interceptor.go -+++ b/vendor/github.com/containerd/otelttrpc/interceptor.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "context" -diff --git a/vendor/github.com/containerd/otelttrpc/internal/parse.go b/vendor/github.com/containerd/otelttrpc/internal/parse.go -index 2520a129129..694aeba8015 100644 ---- a/vendor/github.com/containerd/otelttrpc/internal/parse.go -+++ b/vendor/github.com/containerd/otelttrpc/internal/parse.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package internal // import "github.com/containerd/ttrpc/otelttrpc" -+package internal - - import ( - "strings" -diff --git a/vendor/github.com/containerd/otelttrpc/metadata_supplier.go b/vendor/github.com/containerd/otelttrpc/metadata_supplier.go -index 4bda57a1805..b2c3cab182e 100644 ---- a/vendor/github.com/containerd/otelttrpc/metadata_supplier.go -+++ b/vendor/github.com/containerd/otelttrpc/metadata_supplier.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "context" -diff --git a/vendor/github.com/containerd/otelttrpc/semconv.go b/vendor/github.com/containerd/otelttrpc/semconv.go -index c0d5669cdfc..64f0fe8f30e 100644 ---- a/vendor/github.com/containerd/otelttrpc/semconv.go -+++ b/vendor/github.com/containerd/otelttrpc/semconv.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "go.opentelemetry.io/otel/attribute" -diff --git a/vendor/github.com/containerd/otelttrpc/version.go b/vendor/github.com/containerd/otelttrpc/version.go -index c2e09a34f90..bbf2bbcc5e0 100644 ---- a/vendor/github.com/containerd/otelttrpc/version.go -+++ b/vendor/github.com/containerd/otelttrpc/version.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - // Version is the current release version of the ttRPC instrumentation. - func Version() string { -diff --git a/vendor/modules.txt b/vendor/modules.txt -index eb710af7602..4ee9f9753b3 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -212,7 +212,7 @@ github.com/containerd/nri/pkg/net - github.com/containerd/nri/pkg/net/multiplex - github.com/containerd/nri/pkg/runtime-tools/generate - github.com/containerd/nri/pkg/stub --# github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 -+# github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 - ## explicit; go 1.13 - github.com/containerd/otelttrpc - github.com/containerd/otelttrpc/internal diff --git a/sources b/sources index 126fa47..4bbfbce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.29.2.tar.gz) = dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c +SHA512 (cri-o-1.29.3.tar.gz) = ed2e3d0342b0533cde26a5854447331503afb368fe4e56f87f33574c5b639bae780d58d0726d1f932fceae229f2c84500f5919aeedc3cb010fb6f271a97e3e55 From 6d36a1f82e6d0723711bcd4a3a8d3fe538e5f969 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 30 Apr 2024 12:59:33 -0700 Subject: [PATCH 03/16] Update to v1.29.4 Resolves BZ2234350 in part. Fix CVE-2024-3154 , a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime. --- cri-o.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 1af4133..57687bc 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.29.3 +Version: 1.29.4 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.29.3 %endif # Commit for the builds -%global commit0 12c618780c42414d92d6a8dc8d09c16337668eb2 +%global commit0 51ea93e0b9af5ad2cfa7f8071ec48d99bf39a3ec Name: cri-o Epoch: 0 @@ -221,6 +221,10 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Tue Apr 30 2024 Bradley G Smith - 0:1.29.4-1 +- Bump to v1.29.4 +- Resolves CVE-2024-3154, a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime. + * Sat Apr 27 2024 Bradley G Smith - 0:1.29.3-1 - Bump to v1.29.3 - Add support for autogenerated bundled provides From af9724800cacdb408b5e5de1a6cd912fed114460 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 30 Apr 2024 12:59:33 -0700 Subject: [PATCH 04/16] Update to v1.29.4 Resolves BZ2234350 in part. Fix CVE-2024-3154 , a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime. --- cri-o.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 450816f..cdd381a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.29.3 +Version: 1.29.4 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.29.3 %endif # Commit for the builds -%global commit0 12c618780c42414d92d6a8dc8d09c16337668eb2 +%global commit0 51ea93e0b9af5ad2cfa7f8071ec48d99bf39a3ec Name: cri-o Epoch: 0 @@ -221,6 +221,10 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Tue Apr 30 2024 Bradley G Smith - 0:1.29.4-1 +- Bump to v1.29.4 +- Resolves CVE-2024-3154, a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime. + * Sat Apr 27 2024 Bradley G Smith - 0:1.29.3-1 - Bump to v1.29.3 - Add support for autogenerated bundled provides From ac7db51ac5261bf02b11cd34c0977cd45bd0a5e3 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 30 Apr 2024 13:42:56 -0700 Subject: [PATCH 05/16] Add source files --- .gitignore | 2 ++ sources | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a2cfffa..30453a0 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ /cri-o-1.28.2.tar.gz /cri-o-1.29.2.tar.gz /cri-o-1.29.3.tar.gz +/cri-o-1.29.4-1.fc41.src.rpm +/cri-o-1.29.4.tar.gz diff --git a/sources b/sources index 4bbfbce..f522956 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (cri-o-1.29.3.tar.gz) = ed2e3d0342b0533cde26a5854447331503afb368fe4e56f87f33574c5b639bae780d58d0726d1f932fceae229f2c84500f5919aeedc3cb010fb6f271a97e3e55 +SHA512 (cri-o-1.29.4-1.fc41.src.rpm) = 40bf07b4876e0ffea2cf7c04e506880a438f135edceace15b495427f97cdd2db675fb7cc72a6a2979b36ed0a87a66f68801444ddc02e17513dfb89a66bcf69b8 +SHA512 (cri-o-1.29.4.tar.gz) = 84c132662a726c829f1ddb7ef6722b4b201a74a4b7bcde23d56db9bfde550dd95c125b4f7f4c14e3024a5477087261c90bcbe0ea8492dba84c68cc40cb1a6314 From 183a7b1633b7294a21d5c33cf9092fae9246a41f Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 30 Apr 2024 13:54:13 -0700 Subject: [PATCH 06/16] Correct sources - remove src rpm --- .gitignore | 1 - sources | 1 - 2 files changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 30453a0..bb9f63e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,5 +44,4 @@ /cri-o-1.28.2.tar.gz /cri-o-1.29.2.tar.gz /cri-o-1.29.3.tar.gz -/cri-o-1.29.4-1.fc41.src.rpm /cri-o-1.29.4.tar.gz diff --git a/sources b/sources index f522956..2fbbe6e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (cri-o-1.29.4-1.fc41.src.rpm) = 40bf07b4876e0ffea2cf7c04e506880a438f135edceace15b495427f97cdd2db675fb7cc72a6a2979b36ed0a87a66f68801444ddc02e17513dfb89a66bcf69b8 SHA512 (cri-o-1.29.4.tar.gz) = 84c132662a726c829f1ddb7ef6722b4b201a74a4b7bcde23d56db9bfde550dd95c125b4f7f4c14e3024a5477087261c90bcbe0ea8492dba84c68cc40cb1a6314 From 13f1e06501dfb176097b7f7cb23ff15733375b81 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 30 Apr 2024 13:56:16 -0700 Subject: [PATCH 07/16] Update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a2cfffa..bb9f63e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /cri-o-1.28.2.tar.gz /cri-o-1.29.2.tar.gz /cri-o-1.29.3.tar.gz +/cri-o-1.29.4.tar.gz diff --git a/sources b/sources index 4bbfbce..2fbbe6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.29.3.tar.gz) = ed2e3d0342b0533cde26a5854447331503afb368fe4e56f87f33574c5b639bae780d58d0726d1f932fceae229f2c84500f5919aeedc3cb010fb6f271a97e3e55 +SHA512 (cri-o-1.29.4.tar.gz) = 84c132662a726c829f1ddb7ef6722b4b201a74a4b7bcde23d56db9bfde550dd95c125b4f7f4c14e3024a5477087261c90bcbe0ea8492dba84c68cc40cb1a6314 From 00742958126dc225e8f3f815111ff4deef8b4a0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:11:55 +0000 Subject: [PATCH 08/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index cdd381a..aa7d13b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Version: 1.29.4 Name: cri-o Epoch: 0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -221,6 +221,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0:1.29.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Apr 30 2024 Bradley G Smith - 0:1.29.4-1 - Bump to v1.29.4 - Resolves CVE-2024-3154, a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime. From 789f35272e708a8cf06f4d73ad2a7a3ae9787a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 24 Jul 2024 15:30:44 +0200 Subject: [PATCH 09/16] convert ASL 2.0 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- cri-o.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index aa7d13b..2b06cd7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,11 +30,12 @@ Version: 1.29.4 Name: cri-o Epoch: 0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 -License: ASL 2.0 +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz @@ -221,6 +222,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Wed Jul 24 2024 Miroslav Suchý - 0:1.29.4-3 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 0:1.29.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4c0b4c35e5b6c4debd9d70b5e9877649d58f29f2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 24 Oct 2024 19:44:08 -0500 Subject: [PATCH 10/16] update to 1.31.1 Signed-off-by: Dennis Gilmore --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bb9f63e..52315ff 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /cri-o-1.29.2.tar.gz /cri-o-1.29.3.tar.gz /cri-o-1.29.4.tar.gz +/cri-o-1.31.1.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 2b06cd7..0115f78 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.29.4 +Version: 1.31.1 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -30,7 +30,7 @@ Version: 1.29.4 Name: cri-o Epoch: 0 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -222,6 +222,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Thu Oct 24 2024 Dennis Gilmore - 0:1.31.1-1 +- update to 1.31.1 + * Wed Jul 24 2024 Miroslav Suchý - 0:1.29.4-3 - convert license to SPDX diff --git a/sources b/sources index 2fbbe6e..6359e0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.29.4.tar.gz) = 84c132662a726c829f1ddb7ef6722b4b201a74a4b7bcde23d56db9bfde550dd95c125b4f7f4c14e3024a5477087261c90bcbe0ea8492dba84c68cc40cb1a6314 +SHA512 (cri-o-1.31.1.tar.gz) = ebf83bf90d792ced458bbc321be14aa871ba5efcef212cf4777388916c5f35f9149aa65abf07c07de86834bbc23ac30035b2bff8cca74aac875c41b10ba76def From b69e768862ad5d6ea2e976a3ad48db464621863b Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 23 Dec 2024 08:10:33 -0800 Subject: [PATCH 11/16] Update to release v1.32.0 - Resolves rhbz#2333357 - Resolves https://github.com/cri-o/cri-o/issues/8860 - Amends buildtags to current upstream values --- .gitignore | 1 + cri-o.spec | 23 +++++++++++++++-------- sources | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 52315ff..839e3bb 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /cri-o-1.29.3.tar.gz /cri-o-1.29.4.tar.gz /cri-o-1.31.1.tar.gz +/cri-o-1.32.0.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 0115f78..a913baf 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.31.1 +Version: 1.32.0 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.31.1 %endif # Commit for the builds -%global commit0 51ea93e0b9af5ad2cfa7f8071ec48d99bf39a3ec +%global commit0 b7f3c240bcbda6fae8d43561694d18317e09e167 Name: cri-o Epoch: 0 @@ -40,7 +40,7 @@ URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz %if 0%{?rhel} -BuildRequires: golang >= 1.19 +BuildRequires: golang >= 1.23 %endif %if 0%{?rhel} && 0%{?rhel} <= 8 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -104,14 +104,16 @@ sed -i 's/\/local//' contrib/systemd/%{service_name}.service sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service %build +%global __golang_extldflags -Wl,-z,undefs + export GO111MODULE=on export GOFLAGS=-mod=vendor -export BUILDTAGS="$(hack/btrfs_installed_tag.sh) -$(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) -$(hack/libdm_no_deferred_remove_tag.sh) -$(hack/seccomp_tag.sh) -$(hack/selinux_tag.sh)" +export BUILDTAGS="containers_image_ostree_stub +$(hack/btrfs_installed_tag.sh) +$(hack/btrfs_tag.sh) $(hack/openpgp_tag.sh) +$(hack/seccomp_tag.sh) $(hack/selinux_tag.sh) +$(hack/libsubid_tag.sh) exclude_graphdriver_devicemapper" %if 0%{?rhel} && 0%{?rhel} <= 8 BUILDTAGS="$BUILDTAGS containers_image_openpgp" @@ -222,6 +224,11 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Mon Dec 23 2024 Bradley G Smith - 0:1.32.0-1 +- Bump to v1.32.0 +- Add -Wl,-z,undefs linker flags to resolve https://github.com/cri-o/cri-o/issues/8860 +- Update BUILDTAGS to conform to upstream + * Thu Oct 24 2024 Dennis Gilmore - 0:1.31.1-1 - update to 1.31.1 diff --git a/sources b/sources index 6359e0a..9249c0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.31.1.tar.gz) = ebf83bf90d792ced458bbc321be14aa871ba5efcef212cf4777388916c5f35f9149aa65abf07c07de86834bbc23ac30035b2bff8cca74aac875c41b10ba76def +SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96 From 831604e7dba9327a1a4f2901c09e15966e2a722d Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Sun, 5 Jan 2025 14:10:52 -0800 Subject: [PATCH 12/16] Update F40 to v1.29.11 Aligns CRI-O major:minor version with Kubernetes and CRI-Tools --- .gitignore | 1 + cri-o.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bb9f63e..b3cab74 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /cri-o-1.29.2.tar.gz /cri-o-1.29.3.tar.gz /cri-o-1.29.4.tar.gz +/cri-o-1.29.11.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 57687bc..90a9330 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.29.4 +Version: 1.29.11 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.29.4 %endif # Commit for the builds -%global commit0 51ea93e0b9af5ad2cfa7f8071ec48d99bf39a3ec +%global commit0 16d9bd6ab866a5157fe2f33e7d7d8a1c86cebae9 Name: cri-o Epoch: 0 @@ -39,7 +39,7 @@ URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz %if 0%{?rhel} -BuildRequires: golang >= 1.19 +BuildRequires: golang >= 1.21 %endif %if 0%{?rhel} && 0%{?rhel} <= 8 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -221,6 +221,10 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Sun Jan 5 2025 Bradley G. Smith - 0:1.29.11-1 +- Bump tp v1.29.11 +- Aligns F40 version with Kubernetes + * Tue Apr 30 2024 Bradley G Smith - 0:1.29.4-1 - Bump to v1.29.4 - Resolves CVE-2024-3154, a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime. diff --git a/sources b/sources index 2fbbe6e..1dce03c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.29.4.tar.gz) = 84c132662a726c829f1ddb7ef6722b4b201a74a4b7bcde23d56db9bfde550dd95c125b4f7f4c14e3024a5477087261c90bcbe0ea8492dba84c68cc40cb1a6314 +SHA512 (cri-o-1.29.11.tar.gz) = 0f21a29d401bb9e9b758ca6ee59d145d668b7012c898a4963b3237dba35c6cb276ec9b3295ac68bf74f8c18edc5f6b98a45c06211fc52d420a297f630d6d5002 From dc89cebb475dd545b48d85763ea116e75574587d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:50:18 +0000 Subject: [PATCH 13/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index a913baf..95bffe8 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Version: 1.32.0 Name: cri-o Epoch: 0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -224,6 +224,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0:1.32.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Dec 23 2024 Bradley G Smith - 0:1.32.0-1 - Bump to v1.32.0 - Add -Wl,-z,undefs linker flags to resolve https://github.com/cri-o/cri-o/issues/8860 From 3d7a891f95a356d1551db664cbe3b816c3a5b10d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:49:04 +0000 Subject: [PATCH 14/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 95bffe8..e7e13ac 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Version: 1.32.0 Name: cri-o Epoch: 0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -224,6 +224,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0:1.32.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 0:1.32.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3850bfc863206c9024a61d01b2f354cb6f15be47 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 14:26:48 -0500 Subject: [PATCH 15/16] Rebuild for golang-1.25.0 --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index e7e13ac..c749244 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Version: 1.32.0 Name: cri-o Epoch: 0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -224,6 +224,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Fri Aug 15 2025 Maxwell G - 0:1.32.0-4 +- Rebuild for golang-1.25.0 + * Wed Jul 23 2025 Fedora Release Engineering - 0:1.32.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 87d92a0ec4698be20464d7c5051af9e7b286a79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 13:11:13 +0200 Subject: [PATCH 16/16] rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index c749244..6f0a55b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Version: 1.32.0 Name: cri-o Epoch: 0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -224,6 +224,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Fri Oct 10 2025 Alejandro Sáez - 0:1.32.0-5 +- rebuild + * Fri Aug 15 2025 Maxwell G - 0:1.32.0-4 - Rebuild for golang-1.25.0