Compare commits

...
Sign in to create a new pull request.

24 commits

Author SHA1 Message Date
Alejandro Sáez
87d92a0ec4 rebuild 2025-10-10 13:11:13 +02:00
Maxwell G
3850bfc863 Rebuild for golang-1.25.0 2025-08-15 14:26:48 -05:00
Fedora Release Engineering
3d7a891f95 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 18:49:04 +00:00
Fedora Release Engineering
dc89cebb47 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 14:50:18 +00:00
Bradley G Smith
b69e768862
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
2024-12-23 08:10:33 -08:00
Dennis Gilmore
4c0b4c35e5 update to 1.31.1
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2024-10-24 19:44:08 -05:00
Miroslav Suchý
789f35272e convert ASL 2.0 license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-24 15:30:44 +02:00
Fedora Release Engineering
0074295812 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 20:11:55 +00:00
Bradley G Smith
183a7b1633 Correct sources - remove src rpm 2024-04-30 13:54:13 -07:00
Bradley G Smith
ac7db51ac5 Add source files 2024-04-30 13:42:56 -07:00
Bradley G Smith
af9724800c 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.
2024-04-30 13:20:20 -07:00
Bradley G Smith
715113b32b 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.
2024-04-27 10:02:58 -07:00
Christian Glombek
60b4a41ab7 spec: remove unused %global crio_release_tag
and more shuffling
2024-03-23 03:13:40 +01:00
Christian Glombek
998ffdad23 spec: Move RPM info to top of spec 2024-03-22 18:15:02 +01:00
Christian Glombek
d0f8519e4d spec: minor cleanup
Move Version and commit0 closer together
2024-03-22 08:49:17 +01:00
Christian Glombek
5caa0f2b16 spec: Remove crio-status from files 2024-03-22 08:48:57 +01:00
Peter Hunt
7d8c30ed38 add otelttprc patch
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2024-03-21 11:49:03 -04:00
Peter Hunt
f0be83ef28 bump to 1.29.2
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2024-03-21 11:35:24 -04:00
Maxwell G
f25860a1c2
Rebuild for golang 1.22.0 2024-02-11 21:59:47 +00:00
Maxwell G
52078f228e
Rebuild for golang 1.22.0 2024-02-11 21:43:30 +00:00
Fedora Release Engineering
ed1ce84574 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 08:25:27 +00:00
Fedora Release Engineering
0c0f019cc7 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 16:21:50 +00:00
Christian Glombek
db43736e7d bump to v1.28.2 2023-12-04 13:56:17 +01:00
Peter Hunt
d6ff87ba32 bump to v1.28.0
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2023-09-05 14:25:29 -04:00
3 changed files with 86 additions and 29 deletions

7
.gitignore vendored
View file

@ -40,3 +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.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

View file

@ -1,6 +1,13 @@
# https://github.com/cri-o/cri-o
%global goipath github.com/cri-o/cri-o
Version: 1.27.1
%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.1
%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 65a8134d7c4722e1c39d0e1c473532a17c240682
%global commit0 b7f3c240bcbda6fae8d43561694d18317e09e167
Name: cri-o
Epoch: 0
Release: 2%{?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"
@ -199,11 +194,10 @@ 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}
%{_bindir}/%{service_name}-status
%{_bindir}/pinns
%{_mandir}/man5/%{service_name}.conf*5*
%{_mandir}/man8/%{service_name}*.8*
@ -230,6 +224,62 @@ 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
* 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
* Thu Jul 20 2023 T K Chandra Hasan <t.k.chandra.hasan@ibm.com> - 0:1.27.1-1
- bump to v1.27.1
@ -615,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 <lsm5@fedoraproject.org> - 1.0.0.alpha.0-1.git91977d3
- built commit 91977d3

View file

@ -1 +1 @@
SHA512 (cri-o-1.27.1.tar.gz) = 27fb79141dd60c1744df8761a4d43603256f7f06e32d2f9c76be62b95dcf62924c7501d0461efabb013ae397c16030b6a2b037eeaae7a5daec7c28943f71bc7e
SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96