diff --git a/.gitignore b/.gitignore index 0d060d5..839e3bb 100644 --- a/.gitignore +++ b/.gitignore @@ -40,5 +40,10 @@ /cri-o-1.26.1.tar.gz /cri-o-1.27.0.tar.gz /cri-o-1.27.1.tar.gz -/cri-o-1.27.2.tar.gz -/cri-o-1.27.6.tar.gz +/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 1c0d8d7..6f0a55b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,6 +1,13 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -Version: 1.27.6 +%global service_name crio + +# Related: github.com/cri-o/cri-o/issues/3684 +%global build_timestamp %(date -u +'%Y-%m-%dT%H:%M:%SZ') +%global git_tree_state clean +%global criocli_path "" + +Version: 1.32.0 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -18,36 +25,22 @@ Version: 1.27.6 %bcond_without check %endif -# Related: github.com/cri-o/cri-o/issues/3684 -%global build_timestamp %(date -u +'%Y-%m-%dT%H:%M:%SZ') -%global git_tree_state clean -%global criocli_path "" - -# Used for comparing with latest upstream tag -# to decide whether to autobuild (non-rawhide only) -%global built_tag v%{version} -%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%global crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') - -# Services -%global service_name crio - # Commit for the builds -%global commit0 b3bd0bf4dd07bd6d1c5c2f332ebd9896ad374fee +%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 %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 @@ -111,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" @@ -203,7 +198,6 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %doc docs code-of-conduct.md tutorial.md ADOPTERS.md CONTRIBUTING.md README.md %doc awesome.md transfer.md %{_bindir}/%{service_name} -%{_bindir}/%{service_name}-status %{_bindir}/pinns %{_mandir}/man5/%{service_name}.conf*5* %{_mandir}/man8/%{service_name}*.8* @@ -230,14 +224,61 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog -* Tue Apr 30 2024 Bradley Smith - 0:1.27.6-1 -- Bump to 1.27.6 -- Resolves BZ 2234350 in part -- Resolves CVE-2024-3154 -- Adds support for bundled golang provides +* Fri Oct 10 2025 Alejandro Sáez - 0:1.32.0-5 +- rebuild -* Mon Dec 04 2023 Christian Glombek - 0:1.27.2-1 -- bump to v1.27.2 +* 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 + +* Sun Feb 11 2024 Maxwell G - 0:1.28.2-5 +- Rebuild for golang 1.22.0 + +* Sun Feb 11 2024 Maxwell G - 0:1.28.2-4 +- Rebuild for golang 1.22.0 + +* Wed Jan 24 2024 Fedora Release Engineering - 0:1.28.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 0:1.28.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Christian Glombek - 0:1.28.2-1 +- bump to v1.28.2 + +* Thu Aug 24 2023 Peter Hunt - 0:1.28.0-1 +- bump to v1.28.0 * Thu Jul 20 2023 T K Chandra Hasan - 0:1.27.1-1 - bump to v1.27.1 diff --git a/sources b/sources index fca88bb..9249c0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.27.6.tar.gz) = e740adf3b5606a670c1162c87b1f11f4933db0a414dfb3b7794015118886af6b380a108a46c3fbe9f4d090c52c5b12dcf6066934c9147e44fe9b3ee62cba715a +SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96