From 1ae5c82c70e82ae8ccbf7483a129f85e8d539744 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 13 2021 16:17:25 +0000
Subject: import podman-1.6.4-22.module+el8.4.0+9390+9760d65b


---

diff --git a/.gitignore b/.gitignore
index 255ec91..fd14d3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/podman-90ef753.tar.gz
+SOURCES/v1.6.4-rhel.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 5218f3c..dae8d6a 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1 +1 @@
-d1569abddfa97ffee554298f4b83e5f260d613c3 SOURCES/podman-90ef753.tar.gz
+f6c2cb50684b5209bbef25562afbb55f50099a21 SOURCES/v1.6.4-rhel.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 1672ec4..607c6cf 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -14,8 +14,6 @@
 %if 0%{?rhel} > 7 && ! 0%{?fedora}
 %define gobuild(o:) \
 go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
-%else
-%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
 %endif
 
 %global provider github
@@ -26,18 +24,19 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 90ef753e901dff13d273b87524a336e3644f1f55
+%global commit0 9eb42f31e661dc4cca05746b005b2b91d17f550b
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name: podman
 Version: 1.6.4
-Release: 24%{?dist}
+Release: 22%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: https://%{name}.io/
 # Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686
 ExcludeArch: i686
-Source0: %{git0}/archive/%{commit0}/podman-%{shortcommit0}.tar.gz
+Source0: %{git0}/archive/%{commit0}/v1.6.4-rhel.tar.gz
+
 Provides: %{name}-manpages = %{version}-%{release}
 Obsoletes: %{name}-manpages < %{version}-%{release}
 BuildRequires: golang >= 1.12.12-4
@@ -337,14 +336,6 @@ exit 0
 %{_datadir}/%{name}/test
 
 %changelog
-* Fri Jan 08 2021 Jindrich Novy <jnovy@redhat.com> - 1.6.4-24
-- fix "podman exec is fragile in the presence of signals [rhel-8.3.0.z]"
-- Resolves: #1913294
-
-* Thu Sep 24 2020 Jindrich Novy <jnovy@redhat.com> - 1.6.4-23
-- fix "podman run with --rm errors out/segfaults in container-tools-2.0-8.3.0"
-- Resolves: #1875289
-
 * Fri Sep 18 2020 Jindrich Novy <jnovy@redhat.com> - 1.6.4-22
 - sync with 1.6.4-rhel branch to avoid regression
 - Resolves: #1879092