bump to v1.23.5

Signed-off-by: Peter Hunt~ <pehunt@redhat.com>

.gitignore

@@ -36,14 +36,5 @@
 /cri-o-1.23.0.tar.gz
 /cri-o-1.23.1.tar.gz
 /cri-o-1.23.2.tar.gz
-/cri-o-1.24.1.tar.gz
-/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.23.4.tar.gz
+/cri-o-1.23.5.tar.gz

cri-o.spec

@@ -1,22 +1,15 @@
 # https://github.com/cri-o/cri-o
 %global goipath         github.com/cri-o/cri-o
-%global service_name    crio
+Version:                1.23.5
 
-# 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
+%if 0%{?rhel} && 0%{?rhel} <= 8
 %define gobuild(o:) %{expand:
   # https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
   %global _dwz_low_mem_die_limit 0
   %ifnarch ppc64
-  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 %{?**};
+  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 '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**};
   %else
-  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 %{?**};
+  go build                -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${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
@@ -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 d12c2842e9e4d051a2496e1740f846ffa22b3f1d
 
 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.17
 %endif
 %if 0%{?rhel} && 0%{?rhel} <= 8
 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
@@ -72,11 +79,10 @@ Requires:       container-selinux
 Requires:       containers-common >= 1:0.1.31-14
 %if 0%{?rhel} && 0%{?rhel} < 8
 Requires:       runc >= 1.0.0-16
-Requires:       containernetworking-plugins >= 1.0.0-1
 %else
 Recommends:     runc >= 1.0.0-16
-Suggests:       containernetworking-plugins >= 1.0.0-1
 %endif
+Requires:       containernetworking-plugins >= 0.7.5-1
 Requires:       conmon >= 2.0.2-1
 Requires:       socat
 
@@ -89,7 +95,7 @@ Open Container Initiative-based implementation of Kubernetes Container Runtime
 Interface.
 
 %prep
-%if 0%{?rhel} && 0%{?rhel} <= 9
+%if 0%{?rhel} && 0%{?rhel} <= 8
 %autosetup -p1 -n %{name}-%{version}
 %else
 %goprep -k
@@ -104,22 +110,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="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"
-%endif
-
-export BASE_LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path}
+export 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}
@@ -152,8 +152,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.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 -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 -dp %{buildroot}%{_sysconfdir}/%{service_name}
 install -dp %{buildroot}%{_datadir}/containers/oci/hooks.d
@@ -194,17 +194,18 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf
 %systemd_postun_with_restart %{service_name}
 
 %files
-%license LICENSE vendor/modules.txt
+%license LICENSE
 %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*
 %dir %{_sysconfdir}/%{service_name}
 %config(noreplace) %{_sysconfdir}/%{service_name}/%{service_name}.conf
-%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conflist
-%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conflist
+%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conf
+%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf
 %config(noreplace) %{_sysconfdir}/crictl.yaml
 %dir %{_libexecdir}/%{service_name}
 %{_unitdir}/%{service_name}.service
@@ -224,97 +225,11 @@ 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 Jan 10 2023 Peter Hunt~ <pehunt@redhat.com> - 0:1.23.5-1
+- bump to v1.23.5
 
-* 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
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.27.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Apr 25 2023 Peter Hunt <pehunt@redhat.com> - 0:1.27.0-1
-- bump to v1.27.0
-
-* Wed Jan 25 2023 Peter Hunt~ <pehunt@redhat.com> - 0:1.26.1-2
-- update for obs
-
-* Tue Jan 10 2023 Peter Hunt~ <pehunt@redhat.com> - 0:1.26.1-1
-- bump to v1.26.1
-
-* Fri Dec 23 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.26.0-1
-- bump to v1.26.0
-
-* Fri Oct 07 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.25.1-1
-- bump to v1.25.1
-
-* Mon Aug 29 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.25.0-1
-- bump to v1.25.0
-
-* Mon Aug 29 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.25.0-1
-- bump to v1.25.0
-
-* Tue Aug 09 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.24.2-1
-- bump to v1.24.2
-
-* Mon Jun 06 2022 Peter Hunt <pehunt@redhat.com> - 0:1.24.1-1
-- bump to v1.24.1
-
-* Wed May 11 2022 Peter Hunt <pehunt@redhat.com> - 0:1.24.0-1
-- bump to v1.24.0
+* Fri Oct 21 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.23.4-1
+- bump to v1.23.4
 
 * Tue Mar 15 2022 Peter Hunt <pehunt@redhat.com> - 0:1.23.2-1
 - bump to v1.23.2
@@ -665,7 +580,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

sources

@@ -1 +1 @@
-SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96
+SHA512 (cri-o-1.23.5.tar.gz) = 6045286a09ab1101b2918b18dc95271858c67e4cbe8e8802dd35b15ee275e8483e73d7cb667eff64a949d819fc8561b608636990985549abee4f03cfe7a80540