packages/podman
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!36 Eat signal 23 in signal proxy

Browse Source 
From: @maminjie
Reviewed-by: @small_leek,@wang_yue111,@yangzhao_kl
Signed-off-by: @yangzhao_kl
This commit is contained in:
openeuler-ci-bot 2021-04-01 20:37:24 +08:00 committed by Gitee
commit 4d58bf967e
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0003-eat-signal-23-in-signal-proxy.patch Normal file
View File

@ -0,0 +1,29 @@
From 7bb9c6b9d1f195391f50047447b8caec404b5c2a Mon Sep 17 00:00:00 2001
From: maminjie <maminjie1@huawei.com>
Date: Wed, 31 Mar 2021 11:22:39 +0800
Subject: [PATCH] eat signal 23 in signal proxy
reference to: https://github.com/containers/podman/pull/5496
---
cmd/podman/sigproxy.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/cmd/podman/sigproxy.go b/cmd/podman/sigproxy.go
index 16861ba..9bb104d 100644
--- a/cmd/podman/sigproxy.go
+++ b/cmd/podman/sigproxy.go
@@ -19,7 +19,10 @@ func ProxySignals(ctr *libpod.Container) {
for s := range sigBuffer {
// Ignore SIGCHLD and SIGPIPE - these are mostly likely
// intended for the podman command itself.
- if s == signal.SIGCHLD || s == signal.SIGPIPE {
+ // SIGURG was added because of golang 1.14 and its preemptive changes
+ // causing more signals to "show up".
+ // https://github.com/containers/libpod/issues/5483
+ if s == syscall.SIGCHLD || s == syscall.SIGPIPE || s == syscall.SIGURG {
continue
}
--
2.23.0

10
podman.spec
View File

@ -1,6 +1,6 @@
Name: podman
Version: 0.10.1
Release: 9
Release: 10
Summary: A daemonless container engine for managing Containers
Epoch: 1
License: ASL 2.0
@ -11,7 +11,8 @@ BuildRequires: golang btrfs-progs-devel glib2-devel glibc-devel glibc-static
BuildRequires: git gpgme-devel libassuan-devel libgpg-error-devel libseccomp-devel
BuildRequires: libselinux-devel ostree-devel pkgconfig make
Requires: docker-runc containers-common containernetworking-plugins >= 0.7.3-2 iptables nftables conmon
Recommends: container-selinux >= 2:2.71 slirp4netns
Requires: (container-selinux if selinux-policy)
Recommends: slirp4netns
Provides: bundled(golang(github.com/Azure/go-ansiterm)) = 19f72df4d05d31cbe1c56bfc8045c96babff6c7e
Provides: bundled(golang(github.com/blang/semver)) = v3.5.0
@ -115,6 +116,7 @@ Patch3: CVE-2021-20188-PRE2.patch
Patch4: CVE-2021-20188-PRE3.patch
Patch5: CVE-2021-20188.patch
Patch6: 0002-Fix-the-invalid-memory-address-reference.patch
Patch7: 0003-eat-signal-23-in-signal-proxy.patch
%description
Podman manages the entire container ecosystem which includes pods,
@ -223,6 +225,10 @@ install -Dp -m644 libpod.conf %{buildroot}%{_datadir}/containers/libpod.conf
%{_mandir}/man5/*.5*
%changelog
* Wed Mar 31 2021 maminjie <maminjie1@huawei.com> - 1:0.10.1-10
- Eat signal 23 in signal proxy
- Require container-selinux only when selinux-policy is installed
* Sat Mar 13 2021 maminjie <maminjie1@huawei.com> - 1:0.10.1-9
- Fix the invalid memory address reference