From 893c967b890aa654ce72116ec4b80e2914e741cf Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 13 2021 16:17:09 +0000
Subject: import podman-1.0.0-5.git921f98f.module+el8.4.0+9388+33f27368


---

diff --git a/SOURCES/podman-1882267.patch b/SOURCES/podman-1882267.patch
deleted file mode 100644
index f0fd7b0..0000000
--- a/SOURCES/podman-1882267.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From bc5be3ca10cd4c147955fadd2586b5dd8ad0eeea Mon Sep 17 00:00:00 2001
-From: Matthew Heon <mheon@redhat.com>
-Date: Thu, 24 Sep 2020 10:42:13 -0400
-Subject: [PATCH] Fix https://bugzilla.redhat.com/show_bug.cgi?id=1882267
-
-Signed-off-by: Matthew Heon <mheon@redhat.com>
----
- cmd/podman/sigproxy.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmd/podman/sigproxy.go b/cmd/podman/sigproxy.go
-index 16861bad04..92d7f4e4a9 100644
---- a/cmd/podman/sigproxy.go
-+++ b/cmd/podman/sigproxy.go
-@@ -19,7 +19,7 @@ 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 {
-+			if s == syscall.SIGCHLD || s == syscall.SIGPIPE || s == syscall.SIGURG {
- 				continue
- 			}
- 
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index e5d2d43..989e590 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -36,7 +36,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL
 
 Name: podman
 Version: 1.0.0
-Release: 6.git%{shortcommit}%{?dist}
+Release: 5.git%{shortcommit}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: %{git_podman}
@@ -45,9 +45,6 @@ Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.
 # tracker bug: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2020-10696
 # backported:  https://github.com/containers/buildah/commit/c61925b8936e93a5e900f91b653a846f7ea3a9ed.patch
 Patch0: podman-CVE-2020-10696.patch
-# related bug: https://bugzilla.redhat.com/show_bug.cgi?id=1882267
-# patch:       https://github.com/mheon/libpod/commit/bc5be3ca10cd4c147955fadd2586b5dd8ad0eeea.patch
-Patch1: podman-1882267.patch
 
 # 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}}
@@ -286,10 +283,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_mandir}/man1/docker*.1*
 
 %changelog
-* Thu Sep 24 2020 Jindrich Novy <jnovy@redhat.com> - 1.0.0-6.git921f98f
-- fix "podman run errors out/segfaults in container-tools-1.0-8.3.0"
-- Resolves: #1882267
-
 * Fri Jun 26 2020 Jindrich Novy <jnovy@redhat.com> - 1.0.0-5.git921f98f
 - bump release to preserve upgrade path
 - Resolves: #1821193