diff --git a/.gitignore b/.gitignore index 839e3bb..39c101d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,24 +26,6 @@ /v1.18.2.tar.gz /v1.18.3.tar.gz /v1.19.0.tar.gz -/v1.20.0.tar.gz -/v1.20.1.tar.gz -/v1.20.2.tar.gz -/cri-o-1.21.1.tar.gz -/cri-o-1.21.2.tar.gz -/cri-o-1.22.0.tar.gz -/cri-o-1.22.1.tar.gz -/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 +/v1.19.1.tar.gz +/v1.19.4.tar.gz +/v1.19.6.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 6f0a55b..559b479 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,100 +1,104 @@ -# https://github.com/cri-o/cri-o -%global goipath github.com/cri-o/cri-o -%global service_name crio +%if 0%{?centos} +%global with_debug 0 +%else +%global with_debug 1 +%endif +%global with_check 0 + +%if 0%{?with_debug} +%global _find_debuginfo_dwz_opts %{nil} +%global _dwz_low_mem_die_limit 0 +%else +%global debug_package %{nil} +%endif + +%if ! 0%{?gobuild:1} +%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; +%endif + +# Global vars +%global provider github +%global provider_tld com +%global project cri-o +%global repo cri-o # 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 "" +%global git_tree_state clean +%global criocli_path "" -Version: 1.32.0 - -%if 0%{?rhel} && 0%{?rhel} <= 9 -%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 %{?**}; - %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 %{?**}; - %endif -} -%bcond_with check -%else -%gometa -%bcond_without check -%endif +# https://github.com/cri-o/cri-o +%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 b7f3c240bcbda6fae8d43561694d18317e09e167 +%global commit0 c12bb210e9888cf6160134c7e636ee952c45c05a +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global git0 https://%{import_path} -Name: cri-o -Epoch: 0 -Release: 5%{?dist} -Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface +# Services +%global service_name crio -# Upstream license specification: Apache-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 +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%define built_tag v1.19.6 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') +%define download_url %{git0}/archive/%{built_tag}.tar.gz -%if 0%{?rhel} -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 -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -%endif +Epoch: 2 +Name: %{repo} +Version: 1.19.6 +Release: 1%{?dist} +ExcludeArch: ppc64 +Summary: Kubernetes Container Runtime Interface for OCI-based containers +License: ASL 2.0 +URL: %{git0} +Source0: %{download_url} +Source3: %{service_name}-network.sysconfig +Source4: %{service_name}-storage.sysconfig +Source5: %{service_name}-metrics.sysconfig +# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. +BuildRequires: golang %if 0%{?fedora} -BuildRequires: btrfs-progs-devel -BuildRequires: device-mapper-devel -BuildRequires: go-rpm-macros +BuildRequires: btrfs-progs-devel +BuildRequires: device-mapper-devel %endif -BuildRequires: git-core -BuildRequires: glib2-devel -BuildRequires: glibc-static -BuildRequires: go-md2man -BuildRequires: gpgme-devel -BuildRequires: libassuan-devel -BuildRequires: libseccomp-devel -%if 0%{?rhel} && 0%{?rhel} < 8 -BuildRequires: systemd-devel -%else -BuildRequires: systemd-rpm-macros -%endif -BuildRequires: make +BuildRequires: git +BuildRequires: glib2-devel +BuildRequires: glibc-static %if 0%{?fedora} -Requires(pre): container-selinux +BuildRequires: golang-github-cpuguy83-md2man %else -Requires: container-selinux +BuildRequires: go-md2man %endif -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 +BuildRequires: gpgme-devel +BuildRequires: libassuan-devel +BuildRequires: libseccomp-devel +BuildRequires: pkgconfig(systemd) +BuildRequires: make +%if 0%{?fedora} +Requires(pre): container-selinux %else -Recommends: runc >= 1.0.0-16 -Suggests: containernetworking-plugins >= 1.0.0-1 +Requires: container-selinux %endif -Requires: conmon >= 2.0.2-1 -Requires: socat - -Obsoletes: ocid <= 0.3 -Provides: ocid = %{epoch}:%{version}-%{release} -Provides: %{service_name} = %{epoch}:%{version}-%{release} +Requires: containers-common >= 1:0.1.31-14 +%if 0%{?fedora} || 0%{?centos} >= 8 +Recommends: runc >= 1.0.0-16 +%else +Requires: runc >= 1.0.0-16 +%endif +Obsoletes: ocid <= 0.3 +Provides: ocid = %{epoch}:%{version}-%{release} +Provides: %{service_name} = %{epoch}:%{version}-%{release} +Requires: containernetworking-plugins >= 0.7.5-1 +Requires: conmon >= 2.0.2-1 +Requires: socat %description -Open Container Initiative-based implementation of Kubernetes Container Runtime -Interface. +%{summary} %prep -%if 0%{?rhel} && 0%{?rhel} <= 9 -%autosetup -p1 -n %{name}-%{version} -%else -%goprep -k -%endif - +%autosetup -Sgit -n %{repo}-%{built_tag_strip} sed -i 's/install.config: crio.conf/install.config:/' Makefile sed -i 's/install.bin: binaries/install.bin:/' Makefile sed -i 's/install.man: $(MANPAGES)/install.man:/' Makefile @@ -103,47 +107,53 @@ sed -i 's/module_/module-/' internal/version/version.go 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" - -%if 0%{?rhel} && 0%{?rhel} <= 8 -BUILDTAGS="$BUILDTAGS containers_image_openpgp" +export CGO_CFLAGS='-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64' +%ifarch x86_64 +export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic" +%if 0%{?fedora} || 0%{?centos} >= 8 +export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection" %endif - -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} --X %{goipath}/internal/version.gitTreeState=%{git_tree_state} " - -for cmd in cmd/* ; do - %gobuild -o bin/$(basename $cmd) %{goipath}/$cmd -done - -%if 0%{?fedora} -%set_build_flags %endif -export CFLAGS="$CFLAGS -std=c99" -%make_build bin/pinns -GO_MD2MAN=go-md2man make docs +# These extra flags present in %%{optflags} have been skipped for now as they break the build +#export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" + +mkdir _output +pushd _output +mkdir -p src/%{provider}.%{provider_tld}/{%{project},opencontainers} +ln -s $(dirs +1 -l) src/%{import_path} +popd + +ln -s vendor src +export GOPATH=$(pwd)/_output:$(pwd) +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 GO111MODULE=off + +# FIX-ME we are doing a mimic of Makefile. +# Related: github.com/cri-o/cri-o/issues/3684 +export LDFLAGS="-X %{import_path}/internal/pkg/criocli.DefaultsPath=%{criocli_path} +-X %{import_path}/internal/version.buildDate=%{build_timestamp} +-X %{import_path}/internal/version.gitCommit=%{commit0} +-X %{import_path}/internal/version.version=%{version} +-X %{import_path}/internal/version.gitTreeState=%{git_tree_state}" + +%gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} +%gobuild -o bin/%{service_name}-status %{import_path}/cmd/%{service_name}-status + +GO_MD2MAN=go-md2man %{__make} docs +# work around until https://github.com/cri-o/cri-o/pull/4442 is accepted +# we need to drop -static for Stack Canary, Relro, and PIE +sed -i 's/-static//g' pinns/Makefile +CFLAGS="-std=c99 -Os -Wall -Werror -Wextra -fpie -pie -fstack-protector -D_FORTIFY_SOURCE=2 -Wl,-z,relro,-z,now" %{__make} bin/pinns %install sed -i 's/\/local//' contrib/systemd/%{service_name}.service -bin/%{service_name} \ +./bin/%{service_name} \ --selinux \ + --cgroup-manager "systemd" \ --cni-plugin-dir /opt/cni/bin \ --cni-plugin-dir "%{_libexecdir}/cni" \ - --enable-metrics \ - --metrics-port 9537 \ config > %{service_name}.conf # install binaries @@ -152,8 +162,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 @@ -163,51 +173,75 @@ install -p -m 644 crio.conf %{buildroot}%{_sysconfdir}/%{service_name} install -p -m 644 crio-umount.conf %{buildroot}%{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf install -p -m 644 crictl.yaml %{buildroot}%{_sysconfdir} -%make_install PREFIX=%{buildroot}%{_prefix} \ +install -dp %{buildroot}%{_sysconfdir}/sysconfig +install -p -m 644 contrib/sysconfig/%{service_name} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name} +install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-network +install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-storage +install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-metrics + +make PREFIX=%{buildroot}%{_usr} DESTDIR=%{buildroot} \ install.bin \ install.completions \ install.config \ install.man \ install.systemd -%if 0%{?rhel} && 0%{?rhel} <= 7 +%if 0%{?centos} <= 7 || 0%{?rhel} <= 7 # https://bugzilla.redhat.com/show_bug.cgi?id=1823374#c17 -install -d -p %{buildroot}%{_prefix}/lib/sysctl.d -echo "fs.may_detach_mounts=1" > %{buildroot}%{_prefix}/lib/sysctl.d/99-cri-o.conf +install -d -p %{buildroot}%{_usr}/lib/sysctl.d +echo "fs.may_detach_mounts=1" > %{buildroot}%{_usr}/lib/sysctl.d/99-cri-o.conf %endif install -dp %{buildroot}%{_sharedstatedir}/containers +#install -dp %%{buildroot}%%{_libexecdir}/%%{service_name}/%%{service_name}-wipe +#install -dp %%{buildroot}%%{_usr}/lib/systemd/system-preset + +%check +%if 0%{?with_check} +export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace +%endif %post -# Old verions of kernel do not recognize metacopy option. +# Old verions of kernel do not reconigze metacopy option. # Reference: github.com/cri-o/cri-o/issues/3631 -%if 0%{?rhel} && 0%{?rhel} <= 7 +%if ! 0%{?fedora} && (0%{?centos} <= 7 || 0%{?rhel} <= 7) sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %sysctl_apply 99-cri-o.conf %endif +ln -sf %{_unitdir}/%{service_name}.service {_unitdir}/%{repo}.service %systemd_post %{service_name} %preun %systemd_preun %{service_name} %postun +rm -f %{_unitdir}/%{repo}.service %systemd_postun_with_restart %{service_name} +#define license tag if not already defined +%{!?_licensedir:%global license %doc} + %files -%license LICENSE vendor/modules.txt -%doc docs code-of-conduct.md tutorial.md ADOPTERS.md CONTRIBUTING.md README.md -%doc awesome.md transfer.md +%license LICENSE +%doc README.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}/sysconfig/%{service_name} +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-storage +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-network +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-metrics +%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 +%{_unitdir}/%{repo}.service +%{_unitdir}/%{service_name}-shutdown.service %{_unitdir}/%{service_name}-wipe.service %dir %{_sharedstatedir}/containers %dir %{_datadir}/containers @@ -219,169 +253,32 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/bash-completion/completions/%{service_name}* %{_datadir}/fish/completions/%{service_name}*.fish %{_datadir}/zsh/site-functions/_%{service_name}* -%if 0%{?rhel} && 0%{?rhel} <= 7 -%{_prefix}/lib/sysctl.d/99-cri-o.conf +%if 0%{?centos} <= 7 || 0%{?rhel} <= 7 +%{_usr}/lib/sysctl.d/99-cri-o.conf %endif %changelog -* Fri Oct 10 2025 Alejandro Sáez - 0:1.32.0-5 -- rebuild +* Tue Mar 15 2022 Peter Hunt - 2:1.19.6-1 +- bump to v1.19.6 -* Fri Aug 15 2025 Maxwell G - 0:1.32.0-4 -- Rebuild for golang-1.25.0 +* Fri Sep 17 2021 Peter Hunt - 2:1.19.4-2 +- bump to 1.19.4 -* 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 - -* Wed Jul 19 2023 Fedora Release Engineering - 0:1.27.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Apr 25 2023 Peter Hunt - 0:1.27.0-1 -- bump to v1.27.0 - -* Wed Jan 25 2023 Peter Hunt~ - 0:1.26.1-2 -- update for obs - -* Tue Jan 10 2023 Peter Hunt~ - 0:1.26.1-1 -- bump to v1.26.1 - -* Fri Dec 23 2022 Peter Hunt~ - 0:1.26.0-1 -- bump to v1.26.0 - -* Fri Oct 07 2022 Peter Hunt~ - 0:1.25.1-1 -- bump to v1.25.1 - -* Mon Aug 29 2022 Peter Hunt~ - 0:1.25.0-1 -- bump to v1.25.0 - -* Mon Aug 29 2022 Peter Hunt~ - 0:1.25.0-1 -- bump to v1.25.0 - -* Tue Aug 09 2022 Peter Hunt~ - 0:1.24.2-1 -- bump to v1.24.2 - -* Mon Jun 06 2022 Peter Hunt - 0:1.24.1-1 -- bump to v1.24.1 - -* Wed May 11 2022 Peter Hunt - 0:1.24.0-1 -- bump to v1.24.0 - -* Tue Mar 15 2022 Peter Hunt - 0:1.23.2-1 -- bump to v1.23.2 - -* Tue Mar 15 2022 Peter Hunt - 0:1.23.2-1 -- bump to v1.23.2 - -* Fri Feb 11 2022 Peter Hunt - 0:1.23.1-1 -- bump to v1.23.1 - -* Fri Feb 11 2022 Peter Hunt - 0:1.23.1-1 -- bump to v1.23.1 - -* Fri Dec 17 2021 Peter Hunt - 0:1.23.0-1 -- bump to v1.23.0 - -* Fri Dec 03 2021 Peter Hunt - 0:1.22.1-2 -- fix bogus date - -* Thu Nov 11 2021 Peter Hunt - 0:1.22.1-1 -- bump to v1.22.1 - -* Mon Nov 08 2021 Peter Hunt - 0:1.22.0-4 -- update golang version - -* Mon Sep 13 2021 Peter Hunt - 0:1.22.0-3 -- fix spec - -* Wed Aug 25 2021 Peter Hunt - 0:1.22.0-2 -- bump to v1.22.0 - -* Tue Jul 20 2021 Peter Hunt - 0:1.21.2-1 -- bump to v1.21.2 - -* Mon Jul 19 2021 Peter Hunt - 0:1.21.1-1 -- bump to v1.21.1 - -* Tue Jun 22 2021 Peter Hunt - 0:1.21.0-3 -- update spec to be more conformant for fedora - -* Wed Apr 14 2021 Peter Hunt - 0:1.21.0-2 -- Use crio config for metrics configuration -- drop systemd from crio configuration - -* Wed Apr 14 2021 Peter Hunt - 0:1.21.0-1 -- Bump to v1.21.0 - -* Wed Mar 24 2021 Peter Hunt - 0:1.20.2-1 -- Bump to v1.20.2 - -* Fri Mar 12 2021 Peter Hunt - 0:1.20.1-1 -- Bump to v1.20.1 - -* Mon Feb 15 2021 Peter Hunt - 0:1.20.0-5 +* Mon Feb 15 2021 Peter Hunt - 2:1.19.1-9 - Keep metacopy for fedora -* Tue Jan 12 2021 Peter Hunt - 0:1.20.0-4 +* Fri Jan 15 2021 Peter Hunt - 2:1.19.1-8 +- fix pinns fortify level to build on fedora + +* Tue Jan 12 2021 Peter Hunt - 2:1.19.1-7 - add fs.may_detach_mounts sysctl for centos/rhel 7 -* Thu Dec 17 2020 Peter Hunt - 0:1.20.0-3 -- Fix checksec for pinns +* Mon Jan 4 2021 Peter Hunt - 2:1.19.1-6 +- bump to v1.19.1 -* Wed Dec 16 2020 Peter Hunt - 0:1.20.0-2 +* Wed Dec 16 2020 Peter Hunt - 2:1.19.0-5 - enable PIE mode for cri-o - -* Fri Dec 11 2020 Peter Hunt - 0:1.20.0-1 -- Bump to v1.20.0 +- Fix checksec for pinns * Thu Nov 19 2020 Peter Hunt - 2:1.19.0-4 - fix timestamp for centos 7 @@ -413,7 +310,7 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf * Fri Jun 05 2020 Douglas Schilling Landgraf - 2:1.18.1-2 - Add --cni-plugin-dir /opt/cni/bin to cri-o conf file -* Thu May 14 2020 Douglas Schilling Landgraf - 2:1.18.1-1 +* Thu May 16 2020 Douglas Schilling Landgraf - 2:1.18.1-1 - Release 1.18.1 * Thu Apr 23 2020 Douglas Schilling Landgraf - 2:1.18.0-2 @@ -665,7 +562,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 - 1.0.0.alpha.0-1.git91977d3 - built commit 91977d3 @@ -750,3 +647,5 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf * Tue Nov 08 2016 Lokesh Mandvekar - 0-0.1.gitc57530e - First package for Fedora + + diff --git a/crio-metrics.sysconfig b/crio-metrics.sysconfig new file mode 100644 index 0000000..c4bbe6e --- /dev/null +++ b/crio-metrics.sysconfig @@ -0,0 +1,2 @@ +# /etc/sysconfig/crio-metrics +CRIO_METRICS_OPTIONS="--enable-metrics=true --metrics-port=9537" diff --git a/crio-network.sysconfig b/crio-network.sysconfig new file mode 100644 index 0000000..7c47f86 --- /dev/null +++ b/crio-network.sysconfig @@ -0,0 +1,3 @@ +# /etc/sysconfig/crio-network + +CRIO_NETWORK_OPTIONS= diff --git a/crio-storage.sysconfig b/crio-storage.sysconfig new file mode 100644 index 0000000..fbc68c5 --- /dev/null +++ b/crio-storage.sysconfig @@ -0,0 +1,2 @@ +# /etc/sysconfig/crio-storage +CRIO_STORAGE_OPTIONS= diff --git a/sources b/sources index 9249c0d..a116be3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96 +SHA512 (v1.19.6.tar.gz) = cbf5173d14a072837c650f1745be1f1c1abb27e72893139bbd5be33ca0f45ca4822a2b426d6d5367e83cf8515543399035489e609488873279ac2334ca3f9ab2