From 4c0b4c35e5b6c4debd9d70b5e9877649d58f29f2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 24 Oct 2024 19:44:08 -0500 Subject: [PATCH 1/6] 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 2/6] 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 dc89cebb475dd545b48d85763ea116e75574587d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:50:18 +0000 Subject: [PATCH 3/6] 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 4/6] 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 5/6] 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 6/6] 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