Compare commits

..

2 commits

Author SHA1 Message Date
Bradley G Smith
7e48e21614 Update to v1.27.6
Update cri-o to v1.27.6.
Resolves in part BZ #2234350.
Resolves CVE-2024-3154.
Adds support for autogenerated bundled golang provides via go-rpm-macros
capability.
2024-04-30 14:27:33 -07:00
Christian Glombek
bf5ab10e36 bump to v1.27.2 2023-12-04 14:38:58 +01:00
3 changed files with 36 additions and 82 deletions

9
.gitignore vendored
View file

@ -40,10 +40,5 @@
/cri-o-1.26.1.tar.gz
/cri-o-1.27.0.tar.gz
/cri-o-1.27.1.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
/cri-o-1.27.2.tar.gz
/cri-o-1.27.6.tar.gz

View file

@ -1,13 +1,6 @@
# https://github.com/cri-o/cri-o
%global goipath github.com/cri-o/cri-o
%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
Version: 1.27.6
%if 0%{?rhel} && 0%{?rhel} <= 9
%define gobuild(o:) %{expand:
@ -25,22 +18,36 @@ Version: 1.32.0
%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 b7f3c240bcbda6fae8d43561694d18317e09e167
%global commit0 b3bd0bf4dd07bd6d1c5c2f332ebd9896ad374fee
Name: cri-o
Epoch: 0
Release: 5%{?dist}
Release: 1%{?dist}
Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
# Upstream license specification: Apache-2.0
# Automatically converted from old format: ASL 2.0 - review is highly recommended.
License: Apache-2.0
License: ASL 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.23
BuildRequires: golang >= 1.19
%endif
%if 0%{?rhel} && 0%{?rhel} <= 8
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
@ -104,16 +111,14 @@ 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="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"
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)"
%if 0%{?rhel} && 0%{?rhel} <= 8
BUILDTAGS="$BUILDTAGS containers_image_openpgp"
@ -198,6 +203,7 @@ 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*
@ -224,61 +230,14 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf
%endif
%changelog
* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 0:1.32.0-5
- rebuild
* Tue Apr 30 2024 Bradley Smith <bradley.g.smith@gmail.com> - 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 Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 0:1.32.0-4
- Rebuild for golang-1.25.0
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.32.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.32.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Dec 23 2024 Bradley G Smith <bradley.g.smith@gmail.com> - 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 <dennis@ausil.us> - 0:1.31.1-1
- update to 1.31.1
* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 0:1.29.4-3
- convert license to SPDX
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.29.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Apr 30 2024 Bradley G Smith <bradley.g.smith@gmail.com> - 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 <bradley.g.smith@gmail.com> - 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 <pehunt@redhat.com> - 0:1.29.2-1
- bump to v1.29.2
* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 0:1.28.2-5
- Rebuild for golang 1.22.0
* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 0:1.28.2-4
- Rebuild for golang 1.22.0
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.28.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.28.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 04 2023 Christian Glombek <cglombek@redhat.com> - 0:1.28.2-1
- bump to v1.28.2
* Thu Aug 24 2023 Peter Hunt <pehunt@redhat.com> - 0:1.28.0-1
- bump to v1.28.0
* Mon Dec 04 2023 Christian Glombek <cglombek@redhat.com> - 0:1.27.2-1
- bump to v1.27.2
* Thu Jul 20 2023 T K Chandra Hasan <t.k.chandra.hasan@ibm.com> - 0:1.27.1-1
- bump to v1.27.1

View file

@ -1 +1 @@
SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96
SHA512 (cri-o-1.27.6.tar.gz) = e740adf3b5606a670c1162c87b1f11f4933db0a414dfb3b7794015118886af6b380a108a46c3fbe9f4d090c52c5b12dcf6066934c9147e44fe9b3ee62cba715a