From 8b6d7e49ff78648bbb7991d1f39e0a907b8325b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 14 Oct 2020 23:21:29 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/crun#2d611f8179de715143822e36d37d59d28d8c471b --- .gitignore | 23 ++++ 0001-exec-check-read-bytes-from-sync.patch | 35 +++++ crun.spec | 150 +++++++++++++++++++++ sources | 1 + 4 files changed, 209 insertions(+) create mode 100644 0001-exec-check-read-bytes-from-sync.patch create mode 100644 crun.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..515f617 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,23 @@ +crun-0.1.1.tar.gz +/crun-0.6.tar.gz +/crun-0.7.tar.gz +/crun-0.8.tar.gz +/crun-0.9.tar.gz +/crun-6a2c111.tar.gz +/crun-0.9.1.tar.gz +/crun-0.10.tar.gz +/crun-0.10.1.tar.gz +/crun-0.10.2.tar.gz +/crun-0.10.3.tar.gz +/crun-0.10.4.tar.gz +/crun-0.10.5.tar.gz +/crun-0.10.6.tar.gz +/crun-0.11.tar.gz +/crun-0.12.tar.gz +/crun-0.12.1.tar.gz +/crun-0.12.2.tar.gz +/crun-0.12.2.1.tar.gz +/crun-0.13.tar.gz +/crun-0.14.tar.gz +/crun-0.14.1.tar.gz +/crun-0.15.tar.gz diff --git a/0001-exec-check-read-bytes-from-sync.patch b/0001-exec-check-read-bytes-from-sync.patch new file mode 100644 index 0000000..fc41655 --- /dev/null +++ b/0001-exec-check-read-bytes-from-sync.patch @@ -0,0 +1,35 @@ +From 20c56beb3307b0ac07af0edbbbe49ec65819f559 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano +Date: Tue, 29 Sep 2020 16:52:02 +0200 +Subject: [PATCH] exec: check read bytes from sync + +when reading from the exec sync pipe, make sure it reads exactly one +byte otherwise return an error. + +Closes: https://github.com/containers/crun/issues/511 + +Signed-off-by: Giuseppe Scrivano +--- + src/libcrun/container.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libcrun/container.c b/src/libcrun/container.c +index 927986a..0308992 100644 +--- a/src/libcrun/container.c ++++ b/src/libcrun/container.c +@@ -2595,10 +2595,10 @@ libcrun_container_exec (libcrun_context_t *context, const char *id, runtime_spec + } + } + +- TEMP_FAILURE_RETRY (read (pipefd0, &b, sizeof (b))); ++ ret = TEMP_FAILURE_RETRY (read (pipefd0, &b, sizeof (b))); + TEMP_FAILURE_RETRY (close (pipefd0)); + pipefd0 = -1; +- if (b != '0') ++ if (ret != 1 || b != '0') + ret = -1; + else + { +-- +2.26.2 + diff --git a/crun.spec b/crun.spec new file mode 100644 index 0000000..cc8a778 --- /dev/null +++ b/crun.spec @@ -0,0 +1,150 @@ +Summary: OCI runtime written in C +Name: crun +Version: 0.15 +Release: 5%{?dist} +Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz +License: GPLv3+ +URL: https://github.com/containers/crun + +# We always run autogen.sh +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc +BuildRequires: python +BuildRequires: git +BuildRequires: libcap-devel +BuildRequires: systemd-devel +BuildRequires: yajl-devel +BuildRequires: libseccomp-devel +BuildRequires: libselinux-devel +BuildRequires: python3-libmount +BuildRequires: libtool +BuildRequires: go-md2man +Provides: oci-runtime = 2 + +Patch0: 0001-exec-check-read-bytes-from-sync.patch + +%description +crun is a runtime for running OCI containers + +%prep +%autosetup -p1 -n %{name}-%{version} + +%build +./autogen.sh +%configure --disable-silent-rules + +%make_build + +%install +%make_install +rm -rf $RPM_BUILD_ROOT/usr/lib* + +%files +%license COPYING +%{_bindir}/%{name} +%{_mandir}/man1/* + +%changelog +* 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 diff --git a/sources b/sources new file mode 100644 index 0000000..07332d6 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (crun-0.15.tar.gz) = f9a9e94b6a9c5cff01fe93b1c3d5876a0794e6288b802cf579556e11411ca5d6e63cae3859aaa4df4bb600e2d27aa131872a93a92784b9b48f7885411d86f325