Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/crun.git#428de5e45ad66e1415b450adb054b9ad4d87e3d3
This commit is contained in:
parent
8b6d7e49ff
commit
f2355ca537
1
.gitignore
vendored
1
.gitignore
vendored
@ -21,3 +21,4 @@ crun-0.1.1.tar.gz
|
||||
/crun-0.14.tar.gz
|
||||
/crun-0.14.1.tar.gz
|
||||
/crun-0.15.tar.gz
|
||||
/crun-0.15.1.tar.gz
|
||||
|
@ -1,35 +0,0 @@
|
||||
From 20c56beb3307b0ac07af0edbbbe49ec65819f559 Mon Sep 17 00:00:00 2001
|
||||
From: Giuseppe Scrivano <gscrivan@redhat.com>
|
||||
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 <gscrivan@redhat.com>
|
||||
---
|
||||
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
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: OCI runtime written in C
|
||||
Name: crun
|
||||
Version: 0.15
|
||||
Release: 5%{?dist}
|
||||
Version: 0.15.1
|
||||
Release: 1%{?dist}
|
||||
Source0: https://github.com/containers/crun/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||
License: GPLv3+
|
||||
URL: https://github.com/containers/crun
|
||||
@ -22,8 +22,6 @@ 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
|
||||
|
||||
@ -46,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib*
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Wed Nov 04 2020 Giuseppe Scrivano <gscrivan@redhat.com> - 0.15.1-1
|
||||
- built version 0.15.1
|
||||
|
||||
* Wed Sep 30 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.15-5
|
||||
- rebuild to bump release tag ahead of older fedoras
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (crun-0.15.tar.gz) = f9a9e94b6a9c5cff01fe93b1c3d5876a0794e6288b802cf579556e11411ca5d6e63cae3859aaa4df4bb600e2d27aa131872a93a92784b9b48f7885411d86f325
|
||||
SHA512 (crun-0.15.1.tar.gz) = 470d69c6be809ac20bcbe33c9225aa4b6193fd95f0c469fc87b0d3bdccc4fb92ff31b60915fa93617fd2f89adee799818c85617ddd9f9dc20af00edb6482724e
|
||||
|
Loading…
Reference in New Issue
Block a user