diff --git a/.gitignore b/.gitignore index 6193b2d..c894000 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,16 @@ crun-0.1.1.tar.gz /crun-0.20.1.7-7ef7.tar.xz /crun-0.20.1.9-60de.tar.xz /crun-0.21-dirty.tar.xz +/crun-0.21.tar.xz +/crun-1.0.tar.xz +/crun-1.1.tar.xz +/crun-1.2.tar.xz +/crun-1.3.tar.xz +/crun-1.4.tar.xz +/crun-1.4.1.tar.xz +/crun-1.4.2.tar.xz +/crun-1.4.3.tar.xz +/crun-1.4.4.tar.xz +/crun-1.4.5.tar.xz +/crun-1.5.tar.xz +/crun-1.6.tar.xz diff --git a/crun.spec b/crun.spec index 7b0f7f8..b59ed7c 100644 --- a/crun.spec +++ b/crun.spec @@ -1,49 +1,75 @@ -%global git0 https://github.com/containers/crun - -# Used for comparing with latest upstream tag -# to decide whether to autobuild (non-rawhide only) -%global built_tag 0.21 -%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%if 0%{?fedora} >= 37 +%ifarch aarch64,x86_64 +%global krun_support enabled +%endif +%else +%global krun_support disabled +%endif + +%global built_tag_strip 1.6 Summary: OCI runtime written in C Name: crun -Version: 0.21 -Release: 1%{?dist} -URL: %{git0} -# Source0 generated using `make dist` in upstream repo -Source0: %{name}-%{version}.tar.xz +Version: 1.6 +URL: https://github.com/containers/%{name} +Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz +%if "%{_vendor}" == "debbuild" +Packager: Lokesh Mandvekar +License: GPL-2.0+ +Release: 0%{?dist} +%else License: GPLv2+ - -# We always run autogen.sh +Release: %autorelease +%endif BuildRequires: autoconf BuildRequires: automake -BuildRequires: gcc -BuildRequires: python +BuildRequires: go-md2man +BuildRequires: libtool +%if "%{_vendor}" == "debbuild" BuildRequires: git +BuildRequires: libcap-dev +BuildRequires: libseccomp-dev +BuildRequires: libsystemd-dev +BuildRequires: libyajl-dev +BuildRequires: pkg-config +%else +BuildRequires: gcc +BuildRequires: git-core +BuildRequires: python3 BuildRequires: libcap-devel BuildRequires: systemd-devel BuildRequires: yajl-devel +%if "%{krun_support}" == "enabled" +BuildRequires: libkrun-devel +Provides: krun +%endif BuildRequires: libseccomp-devel BuildRequires: libselinux-devel BuildRequires: python3-libmount -BuildRequires: libtool -BuildRequires: go-md2man BuildRequires: make BuildRequires: glibc-static +BuildRequires: protobuf-c-devel %ifnarch %ix86 -BuildRequires: criu-devel >= 3.15 +BuildRequires: criu-devel >= 3.17.1-2 %endif +%endif +Requires: criu >= 3.17.1-2 Provides: oci-runtime %description -crun is a runtime for running OCI containers +%{name} is a runtime for running OCI containers %prep -%autosetup -p1 -n %{name}-%{version} +%autosetup -Sgit %build ./autogen.sh + +%if "%{krun_support}" == "enabled" +%configure --disable-silent-rules --with-libkrun +%else %configure --disable-silent-rules +%endif %make_build @@ -51,234 +77,19 @@ crun is a runtime for running OCI containers %make_install rm -rf %{buildroot}%{_prefix}/lib* +%if "%{krun_support}" == "enabled" +ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun +%endif + %files %license COPYING %{_bindir}/%{name} +%if "%{krun_support}" == "enabled" +%{_bindir}/krun +%endif %{_mandir}/man1/* %changelog -* Thu Aug 05 2021 Lokesh Mandvekar - 0.21-1 -- bump to 0.21 - -* Wed Jul 21 2021 Fedora Release Engineering - 0.20.1.9-0.18.git60de767 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jun 23 2021 RH Container Bot - 0.20.1.9-0.17.git60de767 -- bump to 0.20.1.9 -- autobuilt 60de767 - -* Mon Jun 21 2021 RH Container Bot - 0.20.1.7-0.16.git7ef74c9 -- bump to 0.20.1.7 -- autobuilt 7ef74c9 - -* Sat Jun 19 2021 RH Container Bot - 0.19.1.13-0.15.git63400f2 -- bump to 0.19.1.13 -- autobuilt 63400f2 - -* Tue Jun 15 2021 RH Container Bot - 0.20.1.3-0.14.git9dec366 -- bump to 0.20.1.3 -- autobuilt 9dec366 - -* Thu Jun 10 2021 RH Container Bot - 0.20.1.1-0.13.git7adf4d0 -- bump to 0.20.1.1 -- autobuilt 7adf4d0 - -* Thu Jun 03 2021 RH Container Bot - 0.20.3-0.12.git8d6a8b5 -- bump to 0.20.3 -- autobuilt 8d6a8b5 - -* Wed Jun 02 2021 RH Container Bot - 0.20.1-0.11.gitffb75b2 -- bump to 0.20.1 -- autobuilt ffb75b2 - -* Tue May 25 2021 RH Container Bot - 0.19.1.50-0.10.git1942907 -- bump to 0.19.1.50 -- autobuilt 1942907 - -* Fri May 21 2021 RH Container Bot - 0.19.1.45-0.9.git4cc7fa1 -- bump to 0.19.1.45 -- autobuilt 4cc7fa1 - -* Sat May 15 2021 RH Container Bot - 0.19.1.41-0.8.gitf9c405d -- bump to 0.19.1.41 -- autobuilt f9c405d - -* Fri May 14 2021 RH Container Bot - 0.19.1.36-0.7.git2badd69 -- bump to 0.19.1.36 -- autobuilt 2badd69 - -* Thu May 13 2021 RH Container Bot - 0.19.1.31-0.6.gitb83eda7 -- bump to 0.19.1.31 -- autobuilt b83eda7 - -* Tue May 11 2021 RH Container Bot - 0.19.1.26-0.5.git029e0ed -- bump to 0.19.1.26 -- autobuilt 029e0ed - -* Mon May 10 2021 RH Container Bot - 0.19.1.22-0.4.git4e968c9 -- bump to 0.19.1.22 -- autobuilt 4e968c9 - -* Sat May 08 2021 RH Container Bot - 0.19.1.19-0.3.gitb6c3139 -- bump to 0.19.1.19 -- autobuilt b6c3139 - -* Fri May 07 2021 RH Container Bot - 0.19.1.17-0.2.git3f6a944 -- bump to 0.19.1.17 -- autobuilt 3f6a944 - -* Mon May 03 2021 Lokesh Mandvekar - 0.19.1.11-0.1.git1dead7e -- built 1dead7e - -* Wed Apr 28 2021 Lokesh Mandvekar - 0.19.1.7-0.1.git3886321 -- built 3886321 - -* Thu Apr 22 2021 Lokesh Mandvekar - 0.19.1-2 -- rebuild for new bodhi - -* Thu Apr 22 2021 Giuseppe Scrivano - 0.19.1-1 -- built version 0.19.1 - -* Tue Apr 13 2021 Lokesh Mandvekar - 0.19-2 -- unversioned Provides: oci-runtime -- runc package will also provide an unversioned Provides: oci-runtime. -- user should pull in runc separately or else it will install crun by default - (alphabetical order) -- similar situation as caddy, httpd, lighttpd and nginx having Provides: -webserver - -* Tue Apr 06 2021 Giuseppe Scrivano - 0.19-1 -- built version 0.19 - -* Wed Mar 31 2021 Lokesh Mandvekar - 0.18-5 -- linux: always remount bind mounts ghpr#640 - -* Thu Mar 25 2021 Lokesh Mandvekar - 0.18-4 -- bump release tag to stay ahead of older fedora - -* Thu Mar 25 2021 Lokesh Mandvekar - 0.18-2 -- Requires: libcap >= 2.48 - -* Fri Feb 19 2021 Giuseppe Scrivano - 0.18-1 -- built version 0.18 - -* Tue Jan 26 2021 Fedora Release Engineering - 0.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 21 2021 Giuseppe Scrivano - 0.17-1 -- built version 0.17 - -* Thu Dec 17 2020 Giuseppe Scrivano - 0.16-3 -- build with CRIU - -* Wed Nov 25 2020 Jindrich Novy - 0.16-2 -- fix license - -* Tue Nov 24 2020 Giuseppe Scrivano - 0.16-1 -- built version 0.16 - -* Wed Nov 04 2020 Giuseppe Scrivano - 0.15.1-1 -- built version 0.15.1 - -* Wed Sep 30 2020 Lokesh Mandvekar - 0.15-5 -- rebuild to bump release tag ahead of older fedoras - -* Wed Sep 30 2020 Giuseppe Scrivano - 0.15-3 -- backport "exec: check read bytes from sync" - -* Wed Sep 23 2020 Giuseppe Scrivano - 0.15-2 -- rebuild - -* Wed Sep 23 2020 Giuseppe Scrivano - 0.15-1 -- build version 0.15 - -* Mon Sep 14 2020 Giuseppe Scrivano - 0.14.1-5 -- backport 4453af4c060e380051552ee589af5cad37f2ae82 - -* Mon Aug 31 2020 Lokesh Mandvekar - 0.14.1-4 -- rebuild - -* Thu Aug 27 2020 Giuseppe Scrivano - 0.14.1-3 -- backport ed9c3e6f466dfb6d2e79802060fabd5f4b66f78e - -* Mon Jul 27 2020 Fedora Release Engineering - 0.14.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 08 2020 Giuseppe Scrivano - 0.14.1-1 -- built version 0.14.1 - -* Thu Jul 02 2020 Giuseppe Scrivano - 0.14-1 -- built version 0.14 - -* Wed Apr 15 2020 Lokesh Mandvekar - 0.13-2 -- release bump for correct upgrade path - -* Thu Mar 05 2020 Giuseppe Scrivano - 0.13-1 -- built version 0.13 - -* Mon Feb 17 2020 Giuseppe Scrivano - 0.12.2.1-1 -- built version 0.12.2.1 - -* Mon Feb 17 2020 Giuseppe Scrivano - 0.12.2-1 -- built version 0.12.2 - -* Thu Feb 6 2020 Giuseppe Scrivano - 0.12.1-1 -- built version 0.12.1 - -* Mon Feb 3 2020 Giuseppe Scrivano - 0.12-1 -- built version 0.12 - -* Tue Jan 28 2020 Fedora Release Engineering - 0.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Dec 23 2019 Giuseppe Scrivano - 0.11-1 -- built version 0.11 - -* Mon Nov 18 2019 Giuseppe Scrivano - 0.10.6-1 -- built version 0.10.6 - -* Sun Nov 10 2019 Giuseppe Scrivano - 0.10.5-2 -- built version 0.10.5 -- fix CVE-2019-18837 - -* Sun Nov 10 2019 Giuseppe Scrivano - 0.10.5-1 -- built version 0.10.5 - -* Thu Oct 31 2019 Giuseppe Scrivano - 0.10.4-1 -- built version 0.10.4 - -* Tue Oct 29 2019 Giuseppe Scrivano - 0.10.3-1 -- built version 0.10.3 - -* Mon Oct 7 2019 Giuseppe Scrivano - 0.10.2-1 -- built version 0.10.2 - -* Fri Oct 4 2019 Giuseppe Scrivano - 0.10.1-1 -- built version 0.10.1 - -* Tue Oct 1 2019 Giuseppe Scrivano - 0.10-1 -- built version 0.10 - -* Fri Sep 13 2019 Giuseppe Scrivano - 0.9.1-1 -- built version 0.9.1 - -* Wed Sep 11 2019 Giuseppe Scrivano - 0.9-1 -- built version 0.9 - -* Tue Sep 10 2019 Jindrich Novy - 0.8-3 -- Add versioned oci-runtime provide. - -* Mon Sep 9 2019 Dan Walsh - 0.8-2 -- Add provides oci-runtime - -* Mon Aug 19 2019 Giuseppe Scrivano - 0.8-1 -- built version 0.8 - -* Wed Jul 24 2019 Fedora Release Engineering - 0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jul 18 2019 Giuseppe Scrivano - 0.7-1 -- built version 0.7 - -* Tue Jun 18 2019 Giuseppe Scrivano - 0.6-1 -- built version 0.6 +%if "%{_vendor}" != "debbuild" +%autochangelog +%endif diff --git a/sources b/sources index 7de76a7..223c0de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.21-dirty.tar.xz) = 5177cc5a98ad77d5a70b9854bf87403f6f424a04cb462e80e899af6849ef0b89897fc96cbd105536925c461a8bd9d7a9eee5abf1adcce482d91f4d61da6a1b0a +SHA512 (crun-1.6.tar.xz) = cb0464792df6167719fd21c3e1117dc0d89cf91c60d02b478774d14b73bdf49b0d138578b48803ff5af28f50740f5022b043fdf3198833d4a9b69e40974ced00