diff --git a/cri-o-1.23.2.tar.gz b/cri-o-1.26.1.tar.gz similarity index 48% rename from cri-o-1.23.2.tar.gz rename to cri-o-1.26.1.tar.gz index de5c67930ebea55dd8f2916106895feec21e8191..c88375821de137c88b363386b8b653a1915abf58 100644 Binary files a/cri-o-1.23.2.tar.gz and b/cri-o-1.26.1.tar.gz differ diff --git a/cri-o.spec b/cri-o.spec index 3841bd1113f9c4321d249d9d626724381beaebe7..ee0432ea1ffe5162219823450bb791dabdb6430f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -2,9 +2,9 @@ %define gobuild(o:) %{expand: %global _dwz_low_mem_die_limit 0 %ifnarch ppc64 - go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now' -compressdwarf=false" -a -v -x %{?**}; + go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${BASE_LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**}; %else - go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now' -compressdwarf=false" -a -v -x %{?**}; + go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${BASE_LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**}; %endif } %bcond_with check @@ -16,22 +16,22 @@ %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) %global crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %global service_name crio -%global commit0 63ca93845d5fe05cdca826367afcb601ece8d7ad +%global commit0 4f915df8d691f7513bfc1ad030f81fb7aceb2587 Name: cri-o -Version: 1.23.2 +Version: 1.26.1 Epoch: 0 Release: 1 Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://github.com/cri-o/cri-o Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz +Source1: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -BuildRequires: golang >= 1.17, git-core, glib2-devel, glibc-static, openEuler-rpm-config +BuildRequires: golang >= 1.19, git-core, glib2-devel, glibc-static, openEuler-rpm-config BuildRequires: gpgme-devel, libassuan-devel, libseccomp-devel, systemd-devel, make Requires: container-selinux, containers-common >= 1:0.1.31-14, docker-runc >= 1.0.0-16 -Requires: containernetworking-plugins >= 0.7.5-1, conmon >= 2.0.2-1, socat +Requires: containernetworking-plugins >= 1.0.0-1, conmon >= 2.0.2-1, socat Obsoletes: ocid <= 0.3 Provides: ocid = %{epoch}:%{version}-%{release} Provides: %{service_name} = %{epoch}:%{version}-%{release} @@ -69,7 +69,7 @@ $(hack/libdm_no_deferred_remove_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)" -export LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path} +export BASE_LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path} -X %{goipath}/internal/version.buildDate=%{build_timestamp} -X %{goipath}/internal/version.gitCommit=%{commit0} -X %{goipath}/internal/version.version=%{version} @@ -99,8 +99,8 @@ install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir} # install conf files install -dp %{buildroot}%{_sysconfdir}/cni/net.d -install -p -m 644 contrib/cni/10-crio-bridge.conf %{buildroot}%{_sysconfdir}/cni/net.d/100-crio-bridge.conf -install -p -m 644 contrib/cni/99-loopback.conf %{buildroot}%{_sysconfdir}/cni/net.d/200-loopback.conf +install -p -m 644 contrib/cni/10-crio-bridge.conflist %{buildroot}%{_sysconfdir}/cni/net.d/100-crio-bridge.conflist +install -p -m 644 contrib/cni/99-loopback.conflist %{buildroot}%{_sysconfdir}/cni/net.d/200-loopback.conflist install -dp %{buildroot}%{_sysconfdir}/%{service_name} install -dp %{buildroot}%{_datadir}/containers/oci/hooks.d @@ -138,8 +138,8 @@ install -dp %{buildroot}%{_sharedstatedir}/containers %{_mandir}/man8/%{service_name}*.8* %dir %{_sysconfdir}/%{service_name} %config(noreplace) %{_sysconfdir}/%{service_name}/%{service_name}.conf -%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conf -%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf +%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conflist +%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conflist %config(noreplace) %{_sysconfdir}/crictl.yaml %dir %{_libexecdir}/%{service_name} %{_unitdir}/%{service_name}.service @@ -156,6 +156,9 @@ install -dp %{buildroot}%{_sharedstatedir}/containers %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Fri Apr 14 2023 lilong - 0:1.26.1-1 +- Upgrade to 1.26.1 + * Tue Jun 07 2022 fushanqing - 0:1.23.2-1 - Update cri-o to 1.23.2