diff --git a/.gitignore b/.gitignore index 2fcd1e3..839e3bb 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,7 @@ /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 +/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 1b1a11e..6f0a55b 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.32.0 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,21 +26,21 @@ Version: 1.29.2 %endif # Commit for the builds -%global commit0 d317b5dc918bbfbc78481072a0d93e572aa8d0e8 +%global commit0 b7f3c240bcbda6fae8d43561694d18317e09e167 Name: cri-o Epoch: 0 -Release: 1%{?dist} +Release: 5%{?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 -Patch0: otelttrpc.patch %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" @@ -192,7 +194,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 +224,41 @@ 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 + +* 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 + +* 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 + +* 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 + +* 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 +- 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 +665,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..9249c0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.29.2.tar.gz) = dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c +SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96